Changeset 22856 for issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

Timestamp:

06/21/18 05:59:32 (7 years ago)

Author:

bdef

Message:

CHG: modifying naming related to hydrology sub-step

File:

• issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (modified) (6 diffs)

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

@@ -98 +98 @@
         iomodel->FetchDataToInput(elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
         iomodel->FetchDataToInput(elements,"md.hydrology.basal_moulin_input",HydrologydcBasalMoulinInputEnum);
-        iomodel->FetchDataToInput(elements,"md.initialization.sediment_head",SedimentHeadEnum);
+        iomodel->FetchDataToInput(elements,"md.initialization.sediment_head",SedimentHeadHydrostepEnum);
         iomodel->FetchDataToInput(elements,"md.hydrology.sediment_transmitivity",HydrologydcSedimentTransmitivityEnum);
         if(iomodel->domaintype!=Domain2DhorizontalEnum){
@@ -107 +107 @@
         if(isefficientlayer){
                 iomodel->FetchDataToInput(elements,"md.hydrology.mask_eplactive_node",HydrologydcMaskEplactiveNodeEnum);
-                iomodel->FetchDataToInput(elements,"md.initialization.epl_head",EplHeadEnum);
+                iomodel->FetchDataToInput(elements,"md.initialization.epl_head",EplHeadHydrostepEnum);
         }
 }/*}}}*/
@@ -225 +225 @@
         basalelement ->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
         Input* SedTrans_input = basalelement->GetInput(HydrologydcSedimentTransmitivityEnum); _assert_(SedTrans_input);
-        Input* sed_head_input = basalelement->GetInput(SedimentHeadEnum);
+        Input* sed_head_input = basalelement->GetInput(SedimentHeadHydrostepEnum);
         Input* base_input     = basalelement->GetInput(BaseEnum);
         Input* old_wh_input = basalelement->GetInput(SedimentHeadOldEnum);                  _assert_(old_wh_input);
@@ -337 +337 @@
         basalelement->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
 
-        Input* sed_head_input = basalelement->GetInput(SedimentHeadEnum);
-        Input* epl_head_input = basalelement->GetInput(EplHeadEnum);
+        Input* sed_head_input = basalelement->GetInput(SedimentHeadHydrostepEnum);
+        Input* epl_head_input = basalelement->GetInput(EplHeadHydrostepEnum);
         Input* base_input                 = basalelement->GetInput(BaseEnum);
         Input* water_input        = basalelement->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(water_input);
@@ -447 +447 @@
 
 void HydrologyDCInefficientAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
-        element->GetSolutionFromInputsOneDof(solution,SedimentHeadEnum);
+        element->GetSolutionFromInputsOneDof(solution,SedimentHeadHydrostepEnum);
 }/*}}}*/
 
@@ -532 +532 @@
 
         /*Add input to the element: */
-        element->AddBasalInput(SedimentHeadEnum,values,P1Enum);
-        element->AddBasalInput(EffectivePressureEnum,pressure,P1Enum);
+        element->AddBasalInput(SedimentHeadHydrostepEnum,values,P1Enum);
+        element->AddBasalInput(EffectivePressureHydrostepEnum,pressure,P1Enum);
         element->AddBasalInput(SedimentHeadResidualEnum,residual,P1Enum);