Changeset 27314

Timestamp:

10/17/22 13:00:28 (2 years ago)

Author:

Mathieu Morlighem

Message:

BUG: call UpdateVertexPosition AFTER grounding line migration

File:

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

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

@@ -159 +159 @@
         femmodel->parameters->FindParam(&isstochasticforcing,StochasticForcingIsStochasticForcingEnum);
 
-#if defined(_HAVE_OCEAN_ )
+#if defined(_HAVE_OCEAN_)
         if(isoceancoupling) OceanExchangeDatax(femmodel,false);
 #endif
 
-        if(isstochasticforcing){
-                StochasticForcingx(femmodel);
-        }
+        if(isstochasticforcing) StochasticForcingx(femmodel);
 
         if(isthermal && domaintype==Domain3DEnum){
@@ -190 +188 @@
 
         /* Using Hydrology dc  coupled we need to compute smb in the hydrology inner time loop*/
-        if(issmb) {
-                smb_core(femmodel);
-        }
-
-        if(ishydrology){
-                hydrology_core(femmodel);
-        }
-
-        if(isstressbalance && (step%sb_coupling_frequency==0 || step==1) ) {
-                stressbalance_core(femmodel);
-        }
-
-        if(isdamageevolution) {
-                damage_core(femmodel);
-        }
-
-        if(ismovingfront)       {
-                movingfront_core(femmodel);
-        }
-
-        if(isdebris){
-                debris_core(femmodel);
-        }
+        if(issmb) smb_core(femmodel);
+
+        if(ishydrology) hydrology_core(femmodel);
+
+        if(isstressbalance && (step%sb_coupling_frequency==0 || step==1)) stressbalance_core(femmodel);
+
+        if(isdamageevolution) damage_core(femmodel);
+
+        if(ismovingfront)       movingfront_core(femmodel);
+
+        if(isdebris) debris_core(femmodel);
 
         /* from here on, prepare geometry for next time step*/
@@ -219 +205 @@
                 bmb_core(femmodel);
                 masstransport_core(femmodel);
-                femmodel->UpdateVertexPositionsx();
-        }
-
-        if(isoceantransport){
-                oceantransport_core(femmodel);
-        }
-
-        if(isgroundingline){
-                groundingline_core(femmodel);
-        }
-
-        /*esa: */
+        }
+
+        if(isoceantransport) oceantransport_core(femmodel);
+
+        if(isgroundingline) groundingline_core(femmodel);
+
+        /*Update mesh vertices now that we have changed the geometry*/
+        if(ismasstransport || isgroundingline) femmodel->UpdateVertexPositionsx();
+
         if(isesa) esa_core(femmodel);
 
@@ -243 +226 @@
 
         /*Sampling: */
-        if(issampling){
-                if(VerboseSolution()) _printf0_("   computing Gaussian random field\n");
-                sampling_core(femmodel);
-        }
+        if(issampling) sampling_core(femmodel);
 
         /*Any requested output that needs to be saved?*/