Changeset 23335

Timestamp:

09/25/18 09:47:47 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: specialization for SpatialLinearFloatingMeltRateEnum at the wrong place

File:

• issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (modified) (4 diffs)

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

@@ -124 +124 @@
         bool   isoceancoupling;
         bool   issmb;
-        int    basalforcingsmodel;
 
         /*Fetch data needed: */
@@ -133 +132 @@
         iomodel->FindConstant(&isoceancoupling,"md.transient.isoceancoupling");
         iomodel->FindConstant(&issmb,"md.transient.issmb");
-        iomodel->FindConstant(&basalforcingsmodel,"md.basalforcings.model");
 
         /*Finite element type*/
@@ -158 +156 @@
         iomodel->FetchDataToInput(elements,"md.mask.groundedice_levelset",MaskGroundediceLevelsetEnum);
         iomodel->FetchDataToInput(elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
-        if (basalforcingsmodel==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);
-        }
         iomodel->FetchDataToInput(elements,"md.initialization.vx",VxEnum);
         iomodel->FetchDataToInput(elements,"md.initialization.vy",VyEnum);
@@ -181 +174 @@
                         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: