Changeset 21341 for issm/trunk/src/c/classes/Loads/Numericalflux.h

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Loads/Numericalflux.h (modified) (2 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr

issm/trunk/src/c/classes/Loads/Numericalflux.h

@@ -44 +44 @@
                 void    Echo();
                 int     Id();
+                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
                 int     ObjectEnum();
-                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
                 /*}}}*/
                 /*Update virtual functions resolution: {{{*/
@@ -70 +70 @@
                 void PenaltyCreatePVector(Vector<IssmDouble>* pf, IssmDouble kmax);
                 void ResetHooks();
+                void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
                 void SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum);
-                void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
                 /*}}}*/
                 /*Numericalflux management:{{{*/

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr