Changeset 21341 for issm/trunk/src/c/cores/cores.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/cores/cores.h (modified) (1 diff)

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/cores/cores.h

@@ -47 +47 @@
 void dummy_core(FemModel* femmodel);
 void gia_core(FemModel* femmodel);
+void esa_core(FemModel* femmodel);
 void smb_core(FemModel* femmodel);
 void damage_core(FemModel* femmodel);

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