Changeset 18068 for issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

Timestamp:

05/28/14 16:26:33 (11 years ago)

Author:

seroussi

Message:

NEW: reorganizing basal melting

File:

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

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp ¶

@@ -71 +71 @@
         iomodel->FetchDataToInput(elements,BasalforcingsGeothermalfluxEnum);
         iomodel->FetchDataToInput(elements,WatercolumnEnum);
-        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
+        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
         iomodel->FetchDataToInput(elements,VxEnum);
         iomodel->FetchDataToInput(elements,VyEnum);
@@ -80 +80 @@
         if(dakota_analysis){
                 elements->InputDuplicate(TemperatureEnum,QmuTemperatureEnum);
-                elements->InputDuplicate(BasalforcingsMeltingRateEnum,QmuMeltingEnum);
+                elements->InputDuplicate(BasalforcingsGroundediceMeltingRateEnum,QmuMeltingEnum);
                 elements->InputDuplicate(VxMeshEnum,QmuVxMeshEnum);
                 elements->InputDuplicate(VxMeshEnum,QmuVyMeshEnum);
@@ -965 +965 @@
         element->GetInputListOnVertices(pressure,PressureEnum);
         element->GetInputListOnVertices(watercolumn,WatercolumnEnum);
-        element->GetInputListOnVertices(basalmeltingrate,BasalforcingsMeltingRateEnum);
+        element->GetInputListOnVertices(basalmeltingrate,BasalforcingsGroundediceMeltingRateEnum);
 
         Gauss* gauss=element->NewGauss();
@@ -1045 +1045 @@
         element->AddInput(EnthalpyEnum,enthalpy,P1Enum);
         element->AddInput(WatercolumnEnum,watercolumn,P1Enum);
-        element->AddInput(BasalforcingsMeltingRateEnum,basalmeltingrate,P1Enum);
+        element->AddInput(BasalforcingsGroundediceMeltingRateEnum,basalmeltingrate,P1Enum);
 
         /*Clean up and return*/