Changeset 16775

Timestamp:

11/15/13 07:54:52 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixinf HOFS coupling

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (3 diffs)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Seg.h (modified) (1 diff)
• classes/Elements/Tria.h (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -1172 +1172 @@
 
         /*Transform solution in Cartesian Space*/
-        element->TransformSolutionCoord(FSvalues,cs_list);
-        element->TransformSolutionCoord(HOvalues,XYEnum);
+        element->TransformSolutionCoord(FSvalues,2*numnodes,cs_list);
+        element->TransformSolutionCoord(HOvalues,numnodes,XYEnum);
 
         /*Ok, we have vx and vy in values, fill in vx and vy arrays: */

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -53 +53 @@
                 virtual void   TransformSolutionCoord(IssmDouble* values,int transformenum)=0;
                 virtual void   TransformSolutionCoord(IssmDouble* values,int* transformenum_list)=0;
+                virtual void   TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum)=0;
+                virtual void   TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list)=0;
                 virtual Element* GetBasalElement(void)=0;
                 virtual void    GetDofList(int** pdoflist,int approximation_enum,int setenum)=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -2016 +2016 @@
                          total_integrated_input=new DoubleInput(average_enum_type,0.0);
                         else{
-                                printf("id %i \n",this->id);
-                                printf("enum %i \n",average_enum_type);
                          _error_("object " << EnumToStringx(original_input->ObjectEnum()) << " not supported yet");
                         }
@@ -3329 +3327 @@
         return dt;
 }/*}}}*/
-/*FUNCTION Penta::TransformSolutionCoord{{{*/
+/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int transformenum){{{*/
 void Penta::TransformSolutionCoord(IssmDouble* values,int transformenum){
 
@@ -3336 +3334 @@
 }
 /*}}}*/
-/*FUNCTION Penta::TransformSolutionCoord{{{*/
+/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){{{*/
 void Penta::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){
 
         ::TransformSolutionCoord(values,this->nodes,this->NumberofNodes(),transformenum_list);
+
+}
+/*}}}*/
+/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){{{*/
+void Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){
+
+        ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum);
+
+}
+/*}}}*/
+/*FUNCTION Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){{{*/
+void Penta::TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){
+
+        ::TransformSolutionCoord(values,this->nodes,numnodes,transformenum_list);
 
 }

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -249 +249 @@
                 void           TransformSolutionCoord(IssmDouble* values,int transformenum);
                 void           TransformSolutionCoord(IssmDouble* values,int* transformenum_list);
+                void           TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum);      /*Tiling only*/
+                void           TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list);/*Tiling only*/
 
                 #ifdef _HAVE_STRESSBALANCE_

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -154 +154 @@
                 void        TransformSolutionCoord(IssmDouble* values,int transformenum){_error_("not implemented yet");};
                 void        TransformSolutionCoord(IssmDouble* values,int* transformenum_list){_error_("not implemented yet");};
+                void        TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){_error_("not implemented yet");};
+                void        TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){_error_("not implemented yet");};
                 void UpdateConstraintsExtrudeFromBase(){_error_("not implemented");};
                 void UpdateConstraintsExtrudeFromTop(){_error_("not implemented");};

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -273 +273 @@
                 void           TransformSolutionCoord(IssmDouble* values,int transformenum);
                 void           TransformSolutionCoord(IssmDouble* values,int* transformenum_list);
+                void           TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){_error_("not implemented yet");};
+                void           TransformSolutionCoord(IssmDouble* values,int numnodes,int* transformenum_list){_error_("not implemented yet");};
                 #ifdef _HAVE_STRESSBALANCE_
                 ElementMatrix* CreateKMatrixStressbalanceSSA(void);