Changeset 27817

Timestamp:

06/30/23 15:32:51 (21 months ago)

Author:

seroussi

Message:

NEW: ice-ocean coupling calculated dynamic thickness and rerun mass transport with ocean melt

File:

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

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

@@ -157 +157 @@
         femmodel->parameters->FindParam(&isstochasticforcing,StochasticForcingIsStochasticForcingEnum);
 
-#if defined(_HAVE_OCEAN_)
-        if(isoceancoupling) OceanExchangeDatax(femmodel,false);
-#endif
-
         if(isstochasticforcing) StochasticForcingx(femmodel);
 
@@ -198 +194 @@
         if(isdebris) debris_core(femmodel);
 
+#if defined(_HAVE_OCEAN_)
+        if(isoceancoupling) {
+                /*First calculate thickness change without melt (dynamic thinning) to send to ocean
+                 * then receive ocean melt 
+                 * then go back to the previous geometry to continue the transient with the melt received*/
+                InputUpdateFromConstantx(femmodel,0.,BasalforcingsFloatingiceMeltingRateEnum);
+                masstransport_core(femmodel);
+                OceanExchangeDatax(femmodel,false);
+                InputDuplicatex(femmodel,ThicknessOldEnum,ThicknessEnum);
+                InputDuplicatex(femmodel,BaseOldEnum,BaseEnum);
+                InputDuplicatex(femmodel,SurfaceOldEnum,SurfaceEnum);
+        }
+#endif
+
         /* from here on, prepare geometry for next time step*/