Changeset 27138 for issm/branches/trunk-larour-SLPS2022/src/c/modules/UpdateMmesx/UpdateMmesx.cpp

Timestamp:

07/01/22 17:35:05 (3 years ago)

Author:

Eric.Larour

Message:

CHG: ice and ocean levelsets were not being processed well, as L2projection was hijacking, and
mme mass transport analysis was not updating it well.

File:

• issm/branches/trunk-larour-SLPS2022/src/c/modules/UpdateMmesx/UpdateMmesx.cpp (modified) (2 diffs)

issm/branches/trunk-larour-SLPS2022/src/c/modules/UpdateMmesx/UpdateMmesx.cpp

@@ -25 +25 @@
 
         } /*}}}*/
-        /*Deal with ocean: {{{*/
+        /*Deal with dsl: {{{*/
         if (femmodel->inputs->Exist(OceantransportSpcbottompressureEnum) && femmodel->inputs->GetInputObjectEnum(OceantransportSpcbottompressureEnum)==DatasetInputEnum){
                 
@@ -51 +51 @@
                 MmeToInputx(femmodel,modelids,partition,nids,MmemasstransportThicknessEnum, P0Enum);
 
-                if (femmodel->inputs->GetInputObjectEnum(MaskIceLevelsetEnum)==DatasetInputEnum)
-                        MmeToInputx(femmodel,modelids,partition,nids,MaskIceLevelsetEnum, P1Enum);
+                if (femmodel->inputs->GetInputObjectEnum(MmemasstransportMaskIceLevelsetEnum)==DatasetInputEnum){
+                        MmeToInputx(femmodel,modelids,partition,nids,MmemasstransportMaskIceLevelsetEnum, P1Enum);
+                        /*delete MaskIceLevelsetEnum which will be replaced by MmemasstransportMaskIceLevelsetEnum for each time step: */
+                        femmodel->inputs->DeleteInput(MaskIceLevelsetEnum);
+                }
 
-                if (femmodel->inputs->GetInputObjectEnum(MaskOceanLevelsetEnum)==DatasetInputEnum)
-                        MmeToInputx(femmodel,modelids,partition,nids,MaskOceanLevelsetEnum, P1Enum);
+                if (femmodel->inputs->GetInputObjectEnum(MmemasstransportMaskOceanLevelsetEnum)==DatasetInputEnum){
+                        MmeToInputx(femmodel,modelids,partition,nids,MmemasstransportMaskOceanLevelsetEnum, P1Enum);
+                        /*delete MaskOceanLevelsetEnum which will be replaced by MmemasstransportMaskOceanLevelsetEnum for each time step: */
+                        femmodel->inputs->DeleteInput(MaskOceanLevelsetEnum);
+                }
 
                 /*free ressources:*/