source: issm/oecreview/Archive/27230-27343/ISSM-27313-27314.diff

Index: ../trunk-jpl/src/c/cores/transient_core.cpp
===================================================================
--- ../trunk-jpl/src/c/cores/transient_core.cpp (revision 27313)
+++ ../trunk-jpl/src/c/cores/transient_core.cpp (revision 27314)
@@ -158,13 +158,11 @@
        femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum);
        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){
                if(issmb){
@@ -189,29 +187,17 @@
        }
 
        /* Using Hydrology dc  coupled we need to compute smb in the hydrology inner time loop*/
-       if(issmb) {
-               smb_core(femmodel);
-       }
+       if(issmb) smb_core(femmodel);
 
-       if(ishydrology){
-               hydrology_core(femmodel);
-       }
+       if(ishydrology) hydrology_core(femmodel);
 
-       if(isstressbalance && (step%sb_coupling_frequency==0 || step==1) ) {
-               stressbalance_core(femmodel);
-       }
+       if(isstressbalance && (step%sb_coupling_frequency==0 || step==1)) stressbalance_core(femmodel);
 
-       if(isdamageevolution) {
-               damage_core(femmodel);
-       }
+       if(isdamageevolution) damage_core(femmodel);
 
-       if(ismovingfront)       {
-               movingfront_core(femmodel);
-       }
+       if(ismovingfront)       movingfront_core(femmodel);
 
-       if(isdebris){
-               debris_core(femmodel);
-       }
+       if(isdebris) debris_core(femmodel);
 
        /* from here on, prepare geometry for next time step*/
 
@@ -218,18 +204,15 @@
        if(ismasstransport){
                bmb_core(femmodel);
                masstransport_core(femmodel);
-               femmodel->UpdateVertexPositionsx();
        }
 
-       if(isoceantransport){
-               oceantransport_core(femmodel);
-       }
+       if(isoceantransport) oceantransport_core(femmodel);
 
-       if(isgroundingline){
-               groundingline_core(femmodel);
-       }
+       if(isgroundingline) groundingline_core(femmodel);
 
-       /*esa: */
+       /*Update mesh vertices now that we have changed the geometry*/
+       if(ismasstransport || isgroundingline) femmodel->UpdateVertexPositionsx();
+
        if(isesa) esa_core(femmodel);
 
        /*Sea level change: */
@@ -242,10 +225,7 @@
        }
 
        /*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?*/
        if(numoutputs){