Changeset 7326

Timestamp:

02/04/11 07:41:30 (14 years ago)

Author:

seroussi

Message:

gl_migration is an Enum

File:

• issm/trunk/src/c/solutions/transient2d_core.cpp (modified) (3 diffs)

issm/trunk/src/c/solutions/transient2d_core.cpp

@@ -22 +22 @@
         bool   time_adapt=false;
         int    output_frequency;
-        bool   gl_migration;
+        int    gl_migration;
 
         /*intermediary: */
@@ -61 +61 @@
                 prognostic_core(femmodel);
 
-                if (gl_migration){
+                if (gl_migration!=NoneEnum){
                         _printf_(VerboseSolution(),"%s\n","   computing new grounding line position");
                         GroundingLineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
@@ -75 +75 @@
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time);
-                        if(gl_migration)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time);
+                        if(gl_migration!=NoneEnum)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time);
 
                         /*unload results*/