Changeset 22506

Timestamp:

03/07/18 10:19:07 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not compute melt before marshalling

Location:

issm/trunk-jpl/src/c/analyses

Files:

• FreeSurfaceBaseAnalysis.cpp (modified) (1 diff)
• MasstransportAnalysis.cpp (modified) (2 diffs)
• StressbalanceVerticalAnalysis.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

@@ -79 +79 @@
         iomodel->FetchDataToInput(elements,"md.slr.sealevel",SealevelEnum,0);
         iomodel->FetchDataToInput(elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
-        iomodel->FetchDataToInput(elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
+        iomodel->FetchDataToInput(elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum,0.);
         iomodel->FetchDataToInput(elements,"md.basalforcings.floatingice_melting_rate",BasalforcingsFloatingiceMeltingRateEnum);
         iomodel->FetchDataToInput(elements,"md.initialization.vx",VxEnum);

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

@@ -156 +156 @@
         iomodel->FetchDataToInput(elements,"md.mask.groundedice_levelset",MaskGroundediceLevelsetEnum);
         iomodel->FetchDataToInput(elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
-        iomodel->FetchDataToInput(elements,"md.basalforcings.floatingice_melting_rate",BasalforcingsFloatingiceMeltingRateEnum);
         iomodel->FetchDataToInput(elements,"md.initialization.vx",VxEnum);
         iomodel->FetchDataToInput(elements,"md.initialization.vy",VyEnum);
+
+        /*Get what we need for ocean-induced basal melting*/
+        int basalforcing_model;
+        iomodel->FindConstant(&basalforcing_model,"md.basalforcings.model");
+        switch(basalforcing_model){
+                case FloatingMeltRateEnum:
+                        iomodel->FetchDataToInput(elements,"md.basalforcings.floatingice_melting_rate",BasalforcingsFloatingiceMeltingRateEnum);
+                        break;
+                case LinearFloatingMeltRateEnum:
+                        break;
+                case MismipFloatingMeltRateEnum:
+                        break;
+                case MantlePlumeGeothermalFluxEnum:
+                        break;
+                case BasalforcingsPicoEnum:
+                        iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsPicoBasinIdEnum);
+                        break;
+                default:
+                        _error_("Basal forcing model "<<EnumToStringx(basalforcing_model)<<" not supported yet");
+        }
 
         if(isoceancoupling){
@@ -177 +196 @@
                 iomodel->FetchDataToInput(elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum);
                 iomodel->FetchDataToInput(elements,"md.mesh.vertexonsurface",MeshVertexonsurfaceEnum);
-        }
-
-        int basalforcing_model;
-        iomodel->FindConstant(&basalforcing_model,"md.basalforcings.model");
-        switch(basalforcing_model){
-                case BasalforcingsPicoEnum:
-                        iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsPicoBasinIdEnum);
-                        break;
-                default: // Do nothing
-                        break;
         }
         

issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp

@@ -112 +112 @@
         }
         iomodel->FetchDataToInput(elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
-        iomodel->FetchDataToInput(elements,"md.basalforcings.floatingice_melting_rate",BasalforcingsFloatingiceMeltingRateEnum);
+        iomodel->FetchDataToInput(elements,"md.basalforcings.floatingice_melting_rate",BasalforcingsFloatingiceMeltingRateEnum,0.);
         //iomodel->FetchDataToInput(elements,"md.smb.mass_balance",SmbMassBalanceEnum);
         iomodel->FetchDataToInput(elements,"md.initialization.vx",VxEnum,0.);