Changeset 19395

Timestamp:

06/10/15 15:18:01 (10 years ago)

Author:

schlegel

Message:

CHG: change element Marshall to MarshallElement

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.cpp (modified) (1 diff)
• Element.h (modified) (2 diffs)
• Penta.cpp (modified) (1 diff)
• Seg.cpp (modified) (1 diff)
• Tetra.cpp (modified) (1 diff)
• Tria.cpp (modified) (1 diff)

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

@@ -1540 +1540 @@
 
 }/*}}}*/
-void       Element::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction,int numanalyses){/*{{{*/
+void       Element::MarshallElement(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction,int numanalyses){/*{{{*/
         
         _assert_(this);

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

@@ -121 +121 @@
                 bool                 IsInput(int name);
                 void               LinearFloatingiceMeltingRate(); 
+                void               MarshallElement(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction,int numanalyses);
                 void               MigrateGroundingLine(IssmDouble* sheet_ungrounding);
                 ElementMatrix*     NewElementMatrix(int approximation_enum=NoneApproximationEnum);
@@ -227 +228 @@
                 virtual void       JacobianDeterminantSurface(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss)=0;
                 virtual void       JacobianDeterminantTop(IssmDouble* Jdet,IssmDouble* xyz_list_base,Gauss* gauss)=0;
-                virtual void       Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction,int numanalyses);
+                virtual void       Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction)=0;
                 virtual IssmDouble Masscon(IssmDouble* levelset)=0;
                 virtual IssmDouble MassFlux(IssmDouble* segment)=0;

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

@@ -129 +129 @@
         /*Call parent classes: */
         ElementHook::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-        Element::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction,this->numanalyses);
+        Element::MarshallElement(pmarshalled_data,pmarshalled_data_size,marshall_direction,this->numanalyses);
         PentaRef::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
 

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

@@ -113 +113 @@
         /*Call parent classes: */
         ElementHook::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-        Element::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction,this->numanalyses);
+        Element::MarshallElement(pmarshalled_data,pmarshalled_data_size,marshall_direction,this->numanalyses);
         SegRef::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
 

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

@@ -109 +109 @@
         /*Call parent classes: */
         ElementHook::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-        Element::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction,this->numanalyses);
+        Element::MarshallElement(pmarshalled_data,pmarshalled_data_size,marshall_direction,this->numanalyses);
         TetraRef::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
 

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

@@ -120 +120 @@
         /*Call parent classes: */
         ElementHook::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-        Element::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction,this->numanalyses);
+        Element::MarshallElement(pmarshalled_data,pmarshalled_data_size,marshall_direction,this->numanalyses);
         TriaRef::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);