Changeset 25836 for issm/trunk/src/c/classes/Elements/PentaRef.h

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Elements/PentaRef.h (modified) (1 diff)

issm/trunk/src/c

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

issm/trunk/src/c/classes/Elements/PentaRef.h

@@ -29 +29 @@
                 void GetTriaJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,Gauss* gauss);
                 void VerticalSegmentIndicesBase(int** pindices,int* pnumseg,int finiteelement);
-                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*do nothing */};
+                void Marshall(MarshallHandle* marshallhandle){ /*do nothing */};
                 int  NumberofNodes(int finiteelement);
                 int  PressureInterpolation(int fe_stokes);

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post