Changeset 23394 for issm/trunk/src/c/analyses/StressbalanceVerticalAnalysis.cpp

Timestamp:

10/05/18 10:42:45 (6 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 23392

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/analyses/StressbalanceVerticalAnalysis.cpp (modified) (1 diff)

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

@@ -111 +111 @@
         }
         iomodel->FetchDataToInput(elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
-        iomodel->FetchDataToInput(elements,"md.basalforcings.floatingice_melting_rate",BasalforcingsFloatingiceMeltingRateEnum,0.);
         //iomodel->FetchDataToInput(elements,"md.smb.mass_balance",SmbMassBalanceEnum);
+
+
+        /*Add basal forcings to compute melt rate*/
+        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");
+        }
         iomodel->FetchDataToInput(elements,"md.initialization.vx",VxEnum,0.);
         iomodel->FetchDataToInput(elements,"md.initialization.vy",VyEnum,0.);