Changeset 21341 for issm/trunk/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

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/solutionsequences/solutionsequence_hydro_nonlinear.cpp (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/solutionsequences/solutionsequence_hydro_nonlinear.cpp

@@ -216 +216 @@
                                 //If there is some colapse go through sediment again
                                 /* if(ThickCount<L2Count)eplconverged=true; */
-                                /* eplcount++; */
+                                eplcount++;
                                 
                                 delete ug_epl_sub_iter;

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