Changeset 17270

Timestamp:

02/12/14 15:57:04 (11 years ago)

Author:

jbondzio

Message:

CHG: restoring order stressbalance - levelset - masstransport - groundingline - gia in transient_core.cpp

File:

• issm/trunk-jpl/src/c/cores/transient_core.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -123 +123 @@
                 }
                 
-                if(isgroundingline){
-                        if(VerboseSolution()) _printf0_("   computing new grounding line position\n");
-                        GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                        if(save_results){
-                                int outputs[3] = {SurfaceEnum,BedEnum,MaskGroundediceLevelsetEnum};
-                                femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3);
-                        }
-                }
-                if(isgia){
-                        if(VerboseSolution()) _printf0_("   computing glacial isostatic adjustment\n");
-                        #ifdef _HAVE_GIA_
-                        gia_core(femmodel);
-                        #else
-                        _error_("ISSM was not compiled with gia capabilities. Exiting");
-                        #endif
-
-                }
-
                 if(islevelset){
                         if(VerboseSolution()) _printf0_("   computing movement of ice boundaries\n");
@@ -173 +155 @@
                         femmodel->UpdateVertexPositionsx();
                 }
+                
+                if(isgroundingline){
+                        if(VerboseSolution()) _printf0_("   computing new grounding line position\n");
+                        GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+                        if(save_results){
+                                int outputs[3] = {SurfaceEnum,BedEnum,MaskGroundediceLevelsetEnum};
+                                femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3);
+                        }
+                }
+                if(isgia){
+                        if(VerboseSolution()) _printf0_("   computing glacial isostatic adjustment\n");
+                        #ifdef _HAVE_GIA_
+                        gia_core(femmodel);
+                        #else
+                        _error_("ISSM was not compiled with gia capabilities. Exiting");
+                        #endif
+                }
 
                 /*unload results*/