Changeset 23336 for issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

Timestamp:

09/25/18 09:51:22 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: allow FS with other melt parameterizations

File:

• issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (modified) (2 diffs)

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

@@ -80 +80 @@
         iomodel->FetchDataToInput(elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
         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);
         iomodel->FetchDataToInput(elements,"md.initialization.vy",VyEnum);
@@ -89 +88 @@
                 iomodel->FetchDataToInput(elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum);
                 iomodel->FetchDataToInput(elements,"md.mesh.vertexonsurface",MeshVertexonsurfaceEnum);
+        }
+
+        /*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 SpatialLinearFloatingMeltRateEnum:
+                        iomodel->FetchDataToInput(elements,"md.basalforcings.deepwater_melting_rate",BasalforcingsDeepwaterMeltingRateEnum);
+                        iomodel->FetchDataToInput(elements,"md.basalforcings.deepwater_elevation",BasalforcingsDeepwaterElevationEnum);
+                        iomodel->FetchDataToInput(elements,"md.basalforcings.upperwater_elevation",BasalforcingsUpperwaterElevationEnum);
+                        break;
+                case BasalforcingsPicoEnum:
+                        iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsPicoBasinIdEnum);
+                        break;
+                default:
+                        _error_("Basal forcing model "<<EnumToStringx(basalforcing_model)<<" not supported yet");
         }
 }/*}}}*/