Changeset 22856

Timestamp:

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

Author:

bdef

Message:

CHG: modifying naming related to hydrology sub-step

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (27 diffs)
• analyses/HydrologyDCInefficientAnalysis.cpp (modified) (6 diffs)
• analyses/L2ProjectionEPLAnalysis.cpp (modified) (4 diffs)
• classes/Elements/Element.cpp (modified) (44 diffs)
• classes/Loads/Friction.cpp (modified) (1 diff)
• classes/Loads/Pengrid.cpp (modified) (6 diffs)
• cores/hydrology_core.cpp (modified) (3 diffs)
• shared/Enum/EnumDefinitions.h (modified) (7 diffs)
• shared/Enum/EnumToStringx.cpp (modified) (7 diffs)
• shared/Enum/StringToEnumx.cpp (modified) (7 diffs)

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

@@ -61 +61 @@
         iomodel->FetchDataToInput(elements,"md.geometry.base",BaseEnum);
         iomodel->FetchDataToInput(elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
-        iomodel->FetchDataToInput(elements,"md.initialization.epl_head",EplHeadEnum);
-        iomodel->FetchDataToInput(elements,"md.initialization.sediment_head",SedimentHeadEnum);
-        iomodel->FetchDataToInput(elements,"md.initialization.epl_thickness",HydrologydcEplThicknessEnum);
+        iomodel->FetchDataToInput(elements,"md.initialization.epl_head",EplHeadHydrostepEnum);
+        iomodel->FetchDataToInput(elements,"md.initialization.sediment_head",SedimentHeadHydrostepEnum);
+        iomodel->FetchDataToInput(elements,"md.initialization.epl_thickness",HydrologydcEplThicknessHydrostepEnum);
         iomodel->FetchDataToInput(elements,"md.hydrology.basal_moulin_input",HydrologydcBasalMoulinInputEnum);
         if(iomodel->domaintype!=Domain2DhorizontalEnum){
@@ -134 +134 @@
                         if(iomodel->my_vertices[i]){
                                 loads->AddObject(new Moulin(iomodel->loadcounter+i+1,i,iomodel,HydrologyDCEfficientAnalysisEnum));
-                        }       
+                        }
                 }
         }
@@ -199 +199 @@
         if(!active_element) {
         if(domaintype!=Domain2DhorizontalEnum){
-                        basalelement->DeleteMaterials(); 
+                        basalelement->DeleteMaterials();
                         delete basalelement;
                 }
@@ -226 +226 @@
         basalelement ->FindParam(&dt,HydrologydtEnum);
 
-        Input* epl_thick_input = basalelement->GetInput(HydrologydcEplThicknessEnum); _assert_(epl_thick_input);
-        Input* epl_head_input   = basalelement->GetInput(EplHeadEnum);  _assert_(epl_head_input);
+        Input* epl_thick_input = basalelement->GetInput(HydrologydcEplThicknessHydrostepEnum); _assert_(epl_thick_input);
+        Input* epl_head_input   = basalelement->GetInput(EplHeadHydrostepEnum);  _assert_(epl_head_input);
         Input* base_input                       = basalelement->GetInput(BaseEnum); _assert_(base_input);
 
@@ -235 +235 @@
                 gauss           ->GaussPoint(ig);
                 basalelement    ->JacobianDeterminant(&Jdet,xyz_list,gauss);
-                
+
                 epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
                 epl_storing                             = EplStoring(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
@@ -245 +245 @@
                 D[0][0]=D_scalar;
                 D[1][1]=D_scalar;
-                GetB(B,basalelement,xyz_list,gauss); 
+                GetB(B,basalelement,xyz_list,gauss);
                 TripleMultiply(B,2,numnodes,1,
                                         &D[0][0],2,2,0,
@@ -260 +260 @@
                                                 basis,1,numnodes,0,
                                                 &Ke->values[0],1);
-                        
-                        
+
+
                         /*Transfer EPL part*/
                         transfer=GetHydrologyKMatrixTransfer(basalelement);
@@ -308 +308 @@
         if(!active_element) {
                 if(domaintype!=Domain2DhorizontalEnum){
-                        basalelement->DeleteMaterials(); 
+                        basalelement->DeleteMaterials();
                         delete basalelement;
                 }
@@ -333 +333 @@
         /*Retrieve all inputs and parameters*/
         basalelement->GetVerticesCoordinates(&xyz_list);
-        //basalelement->FindParam(&dt,TimesteppingTimeStepEnum);        
+        //basalelement->FindParam(&dt,TimesteppingTimeStepEnum);
         basalelement ->FindParam(&dt,HydrologydtEnum);
 
-        Input* epl_thick_input = basalelement->GetInput(HydrologydcEplThicknessEnum); _assert_(epl_thick_input);
-        Input* sed_head_input  = basalelement->GetInput(SedimentHeadEnum); _assert_(sed_head_input);
-        Input* epl_head_input    = basalelement->GetInput(EplHeadEnum); _assert_(epl_head_input);
+        Input* epl_thick_input = basalelement->GetInput(HydrologydcEplThicknessHydrostepEnum); _assert_(epl_thick_input);
+        Input* sed_head_input  = basalelement->GetInput(SedimentHeadHydrostepEnum); _assert_(sed_head_input);
+        Input* epl_head_input    = basalelement->GetInput(EplHeadHydrostepEnum); _assert_(epl_head_input);
         Input* water_input               = basalelement->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(water_input);
         Input* residual_input  = basalelement->GetInput(SedimentHeadResidualEnum); _assert_(residual_input);
@@ -361 +361 @@
                 if(dt!=0.) scalar = scalar*dt;
                 for(int i=0;i<numnodes;i++)pe->values[i]+=scalar*basis[i];
-                
+
                 /*Transient and transfer terms*/
                 if(dt!=0.){
@@ -393 +393 @@
 
 void HydrologyDCEfficientAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
-        element->GetSolutionFromInputsOneDof(solution,EplHeadEnum);
+        element->GetSolutionFromInputsOneDof(solution,EplHeadHydrostepEnum);
 }/*}}}*/
 
@@ -446 +446 @@
                 //tradeof between keeping initial condition and not getting to far from head at deactivation
                 basalelement->GetInputListOnVertices(&basevalue[0],BaseEnum);
-                basalelement->GetInputListOnVertices(&initvalue[0],EplHeadEnum);
+                basalelement->GetInputListOnVertices(&initvalue[0],EplHeadHydrostepEnum);
                 for(int i=0;i<numnodes;i++){
                         eplHeads[i]=max(basevalue[i],initvalue[i]);
@@ -454 +454 @@
         }
         /*Add input to the element: */
-        element->AddBasalInput(EplHeadEnum,eplHeads,P1Enum);
+        element->AddBasalInput(EplHeadHydrostepEnum,eplHeads,P1Enum);
         /*Free ressources:*/
         xDelete<IssmDouble>(eplHeads);
@@ -525 +525 @@
         IssmDouble  EPLgrad2;
         IssmDouble  EPL_N;
-        
+
         femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
         femmodel->parameters->FindParam(&iseplthickcomp,HydrologydcEplThickCompEnum);
@@ -531 +531 @@
 
         for(int j=0;j<femmodel->elements->Size();j++){
-                
+
                 Element* element=(Element*)femmodel->elements->GetObjectByOffset(j);
-                
+
                 /*skip element if 3d and not on base*/
                 if(domaintype==Domain3DEnum && !element->IsOnBase()) continue;
-                
+
                 int         numnodes      = element->GetNumberOfNodes();
                 IssmDouble* thickness     = xNew<IssmDouble>(numnodes);
@@ -547 +547 @@
                 IssmDouble* bed           = xNew<IssmDouble>(numnodes);
 
-                Input*  active_element_input=element->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);                
+                Input*  active_element_input=element->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
                 active_element_input->GetInputValue(&active_element);
                 //element->FindParam(&dt,TimesteppingTimeStepEnum);
                 element ->FindParam(&dt,HydrologydtEnum);
-        
+
                 /*For now, assuming just one way to compute EPL thickness*/
                 IssmDouble gravity          = element->GetMaterialParameter(ConstantsGEnum);
@@ -567 +567 @@
                         default: _error_("not Implemented Yet");
                 }
-                
-                element->GetInputListOnVertices(&eplhead[0],EplHeadEnum);
-                element->GetInputListOnVertices(&epl_slopeX[0],EplHeadSlopeXEnum); 
+
+                element->GetInputListOnVertices(&eplhead[0],EplHeadHydrostepEnum);
+                element->GetInputListOnVertices(&epl_slopeX[0],EplHeadSlopeXEnum);
                 element->GetInputListOnVertices(&epl_slopeY[0],EplHeadSlopeYEnum);
                 element->GetInputListOnVertices(&old_thickness[0],HydrologydcEplThicknessOldEnum);
@@ -599 +599 @@
                         }
                 }
-                element->AddInput(HydrologydcEplThicknessEnum,thickness,element->GetElementType());
+                element->AddInput(HydrologydcEplThicknessHydrostepEnum,thickness,element->GetElementType());
                 xDelete<IssmDouble>(thickness);
                 xDelete<IssmDouble>(eplhead);
@@ -612 +612 @@
 
 void HydrologyDCEfficientAnalysis::GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
-        /*Compute B  matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. 
+        /*Compute B  matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2.
          * For node i, Bi can be expressed in the actual coordinate system
-         * by: 
+         * by:
          *       Bi=[ dN/dx ]
          *          [ dN/dy ]
@@ -667 +667 @@
         IssmDouble* residual      =xNew<IssmDouble>(numnodes);
         IssmDouble* base          =xNew<IssmDouble>(numnodes);
-        
+
         IssmDouble init_thick    =basalelement->GetMaterialParameter(HydrologydcEplInitialThicknessEnum);
         IssmDouble colapse_thick =basalelement->GetMaterialParameter(HydrologydcEplColapseThicknessEnum);
@@ -674 +674 @@
         active_element_input->GetInputValue(&active_element);
 
-        basalelement-> GetInputListOnVertices(&old_active[0],HydrologydcMaskEplactiveNodeEnum); 
-        basalelement-> GetInputListOnVertices(&epl_thickness[0],HydrologydcEplThicknessEnum);   
-        basalelement-> GetInputListOnVertices(&sedhead[0],SedimentHeadEnum);
-        basalelement-> GetInputListOnVertices(&eplhead[0],EplHeadEnum);
+        basalelement-> GetInputListOnVertices(&old_active[0],HydrologydcMaskEplactiveNodeEnum);
+        basalelement-> GetInputListOnVertices(&epl_thickness[0],HydrologydcEplThicknessHydrostepEnum);
+        basalelement-> GetInputListOnVertices(&sedhead[0],SedimentHeadHydrostepEnum);
+        basalelement-> GetInputListOnVertices(&eplhead[0],EplHeadHydrostepEnum);
         basalelement-> GetInputListOnVertices(&residual[0],SedimentHeadResidualEnum);
         basalelement-> GetInputListOnVertices(&base[0],BaseEnum);
@@ -724 +724 @@
                 }
         }
-        basalelement->AddInput(HydrologydcEplThicknessEnum,epl_thickness,basalelement->GetElementType());
+        basalelement->AddInput(HydrologydcEplThicknessHydrostepEnum,epl_thickness,basalelement->GetElementType());
 
         if(domaintype!=Domain2DhorizontalEnum){
-                basalelement->DeleteMaterials(); 
+                basalelement->DeleteMaterials();
                 delete basalelement;
         }
@@ -802 +802 @@
                 default: _error_("mesh "<<EnumToStringx(domaintype)<<" not supported yet");
         }
-        
+
         const int   numnodes = basalelement->GetNumberOfNodes();
         IssmDouble  flag     = 0.;
@@ -810 +810 @@
         /*Pass the activity mask from elements to nodes*/
         basalelement->GetInputListOnVertices(&active[0],HydrologydcMaskEplactiveNodeEnum);
-        Input*  active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);           
+        Input*  active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
         active_element_input->GetInputValue(&active_element);
-        
+
         for(int i=0;i<numnodes;i++) flag+=active[i];
 
@@ -825 +825 @@
                 for(int i=0;i<numnodes;i++){
                         active_vec->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL);
-                }               
+                }
         }
         else{
@@ -836 +836 @@
 
 void HydrologyDCEfficientAnalysis::GetHydrologyDCInefficientHmax(IssmDouble* ph_max,Element* element, Node* innode){/*{{{*/
-        
+
         int        hmax_flag;
         IssmDouble h_max;
@@ -843 +843 @@
         /*Get the flag to the limitation method*/
         element->FindParam(&hmax_flag,HydrologydcSedimentlimitFlagEnum);
-        
+
         /*Switch between the different cases*/
         switch(hmax_flag){

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);
 

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

@@ -60 +60 @@
         }
 
-        iomodel->FetchDataToInput(elements,"md.initialization.epl_head",EplHeadEnum);
+        iomodel->FetchDataToInput(elements,"md.initialization.epl_head",EplHeadHydrostepEnum);
         iomodel->FetchDataToInput(elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
         if(iomodel->domaintype!=Domain2DhorizontalEnum){
@@ -184 +184 @@
                 return NULL;
         }
-        
+
         /*Intermediaries */
         int         input_enum,index;
@@ -202 +202 @@
         basalelement->FindParam(&input_enum,InputToL2ProjectEnum);
         switch(input_enum){
-                case EplHeadSlopeXEnum: input = basalelement->GetInput(EplHeadEnum); index = 0; _assert_(input); break;
-                case EplHeadSlopeYEnum: input = basalelement->GetInput(EplHeadEnum); index = 1; _assert_(input); break;
+                case EplHeadSlopeXEnum: input = basalelement->GetInput(EplHeadHydrostepEnum); index = 0; _assert_(input); break;
+                case EplHeadSlopeYEnum: input = basalelement->GetInput(EplHeadHydrostepEnum); index = 1; _assert_(input); break;
                 default: _error_("not implemented");
         }
@@ -254 +254 @@
         return;
 }/*}}}*/
-

issm/trunk-jpl/src/c/classes/Elements/Element.cpp ¶

@@ -117 +117 @@
         /*Add Stress tensor components into inputs*/
         this->AddInput(LambdaSEnum,lambdas,P1Enum);
-        
+
         /*Clean up and return*/
         delete gauss;
@@ -172 +172 @@
       B_input=this->GetInput(MaterialsRheologyBEnum); _assert_(B_input);
    }
-        
+
         /* Start looping on the number of nodes: */
         Gauss* gauss=this->NewGauss();
@@ -196 +196 @@
 
                 /* Compute threshold strain rate from threshold stress */
-                eps_0=pow(sigma_0/B,n); 
+                eps_0=pow(sigma_0/B,n);
 
                 if(eps_eff>eps_0){
@@ -262 +262 @@
                 if(dim==2){
                          /* epsilon=[exx,eyy,exy];*/
-                        eps_xx[iv]=epsilon[0]; 
+                        eps_xx[iv]=epsilon[0];
                         eps_yy[iv]=epsilon[1];
                         eps_xy[iv]=epsilon[2];
@@ -270 +270 @@
                 else{
                         /*epsilon=[exx eyy ezz exy exz eyz]*/
-                        eps_xx[iv]=epsilon[0]; 
+                        eps_xx[iv]=epsilon[0];
                         eps_yy[iv]=epsilon[1];
                         eps_zz[iv]=epsilon[2];
-                        eps_xy[iv]=epsilon[3]; 
+                        eps_xy[iv]=epsilon[3];
                         eps_xz[iv]=epsilon[4];
                         eps_yz[iv]=epsilon[5];
@@ -659 +659 @@
         xDelete<IssmDouble>(PrecipitationsReconstructed);
         xDelete<IssmDouble>(tmp);
-        
+
 }
 /*}}}*/
@@ -856 +856 @@
                 int numnodes = this->GetNumberOfNodes();
                 for(int i=0;i<numnodes;i++) {
-                        _printf_("nodes[" << i << "] = " << nodes[i]);  
+                        _printf_("nodes[" << i << "] = " << nodes[i]);
                         nodes[i]->Echo();
                 }
@@ -1230 +1230 @@
         epsilon_eff=1/sqrt(2.)*sqrt(epsilon_sqr[0][0]+epsilon_sqr[0][1]+ epsilon_sqr[0][2]+ epsilon_sqr[1][0]+ epsilon_sqr[1][1]+ epsilon_sqr[1][2]+ epsilon_sqr[2][0]+ epsilon_sqr[2][1]+ epsilon_sqr[2][2]);
 
-        /*Phi = Tr(sigma * eps) 
+        /*Phi = Tr(sigma * eps)
          *    = Tr(sigma'* eps)
          *    = 2 * eps_eff * sigma'_eff
@@ -1538 +1538 @@
 /*}}}*/
 void       Element::InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){/*{{{*/
-    
+
     /*Intermediaries*/
     int i,t;
-    
+
     /*Branch on type of vector: nodal or elementary: */
     if(vector_type==1){ //nodal vector
-        
+
         int         numvertices = this->GetNumberOfVertices();
         int        *vertexids   = xNew<int>(numvertices);
         IssmDouble *values      = xNew<IssmDouble>(numvertices);
-        
+
         /*Recover vertices ids needed to initialize inputs*/
         _assert_(iomodel->elements);
@@ -1554 +1554 @@
             vertexids[i]=reCast<int>(iomodel->elements[numvertices*this->Sid()+i]); //ids for vertices are in the elements array from Matlab
         }
-        
+
         /*Are we in transient or static? */
                   if(M==1){
@@ -1598 +1598 @@
                           _error_("nodal vector is either numberofvertices or numberofvertices+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long");
                   }
-        
+
         xDelete<IssmDouble>(values);
         xDelete<int>(vertexids);
     }
     else if(vector_type==2){ //element vector
-        
+
         IssmDouble value;
-        
+
         /*Are we in transient or static? */
         if(M==iomodel->numberofelements){
@@ -1640 +1640 @@
     }
     else if(vector_type==3){ //element vector
-        
+
         /*For right now we are static */
         if(M==iomodel->numberofelements){
@@ -1665 +1665 @@
 
         /*Some sanity checks*/
-        _assert_(vector); 
-        _assert_(min_vector); 
-        _assert_(max_vector); 
+        _assert_(vector);
+        _assert_(min_vector);
+        _assert_(max_vector);
 
         /*For now we only support nodal vectors*/
@@ -1699 +1699 @@
                            TransientInput* grad_input = new TransientInput(ControlInputGradEnum);
                                 for(int t=0;t<N;t++){
-                for(int i=0;i<numvertices;i++){ 
+                for(int i=0;i<numvertices;i++){
                                                 values[i]=vector[N*(vertexids[i]-1)+t];
                                                 values_min[i] = min_vector[N*(vertexids[i]-1)+t];
@@ -1706 +1706 @@
                                         switch(this->ObjectEnum()){
                     case TriaEnum:
-                                                                        values_input->AddTimeInput(new TriaInput(input_enum,values,P1Enum)); 
-                                                                        mins_input->AddTimeInput(new TriaInput(ControlInputMinsEnum,values_min,P1Enum)); 
+                                                                        values_input->AddTimeInput(new TriaInput(input_enum,values,P1Enum));
+                                                                        mins_input->AddTimeInput(new TriaInput(ControlInputMinsEnum,values_min,P1Enum));
                                                                         maxs_input->AddTimeInput(new TriaInput(ControlInputMaxsEnum,values_max,P1Enum));
                                                                 break;
                     case PentaEnum:
-                                                                        values_input->AddTimeInput(new PentaInput(input_enum,values,P1Enum)); 
-                                                                        mins_input->AddTimeInput(new PentaInput(ControlInputMinsEnum,values_min,P1Enum)); 
-                                                                        maxs_input->AddTimeInput(new PentaInput(ControlInputMaxsEnum,values_max,P1Enum)); 
+                                                                        values_input->AddTimeInput(new PentaInput(input_enum,values,P1Enum));
+                                                                        mins_input->AddTimeInput(new PentaInput(ControlInputMinsEnum,values_min,P1Enum));
+                                                                        maxs_input->AddTimeInput(new PentaInput(ControlInputMaxsEnum,values_max,P1Enum));
                                                                         break;
                     case TetraEnum:
-                                                                        values_input->AddTimeInput(new TetraInput(input_enum,values,P1Enum)); 
-                                                                        mins_input->AddTimeInput(new TetraInput(ControlInputMinsEnum,values_min,P1Enum)); 
-                                                                        maxs_input->AddTimeInput(new TetraInput(ControlInputMaxsEnum,values_max,P1Enum)); 
+                                                                        values_input->AddTimeInput(new TetraInput(input_enum,values,P1Enum));
+                                                                        mins_input->AddTimeInput(new TetraInput(ControlInputMinsEnum,values_min,P1Enum));
+                                                                        maxs_input->AddTimeInput(new TetraInput(ControlInputMaxsEnum,values_max,P1Enum));
                                                                         break;
                     default: _error_("Not implemented yet");
@@ -1740 +1740 @@
           * code: what type of data is in the vector (booleans, ints, doubles)
           */
-    
+
          /*Intermediaries*/
     int                                 i,t;
@@ -1760 +1760 @@
     /*Branch on type of vector: nodal or elementary: */
     if(vector_type==1){ //nodal vector
-        
+
         int         numvertices = this->GetNumberOfVertices();
         int        *vertexids   = xNew<int>(numvertices);
         IssmDouble *values      = xNew<IssmDouble>(numvertices);
-        
+
         /*Recover vertices ids needed to initialize inputs*/
         _assert_(iomodel->elements);
@@ -1770 +1770 @@
             vertexids[i]=reCast<int>(iomodel->elements[numvertices*this->Sid()+i]); //ids for vertices are in the elements array from Matlab
         }
-        
+
         /*Are we in transient or static? */
                   if(M==1){
@@ -1779 +1779 @@
                     case TetraEnum: datasetinput->AddInput(new TetraInput(vector_enum,values,P0Enum),input_enum); break;
                     default: _error_("Not implemented yet");
-                                } 
+                                }
                   }
                   else if(M==iomodel->numberofvertices){
@@ -1827 +1827 @@
                                           case TetraEnum: datasetinput->AddInput(new TetraInput(vector_enum,values,P0Enum),input_enum); break;
                                           default: _error_("Not implemented yet");
-                                  }       
+                                  }
                           }
                           else if(N==this->GetNumberOfNodes(P1xP2Enum)){
@@ -1851 +1851 @@
                           _error_("nodal vector is either numberofvertices or numberofvertices+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long");
                   }
-        
+
         xDelete<IssmDouble>(values);
         xDelete<int>(vertexids);
     }
     else if(vector_type==2){ //element vector
-        
+
         IssmDouble value;
-        
+
         /*Are we in transient or static? */
         if(M==iomodel->numberofelements){
@@ -1893 +1893 @@
     }
     else if(vector_type==3){ //element vector
-        
+
         /*For right now we are static */
         if(M==iomodel->numberofelements){
@@ -2021 +2021 @@
                                 name==EnthalpyPicardEnum ||
                                 name==WaterfractionEnum||
-                                name==WatercolumnEnum || 
+                                name==WatercolumnEnum ||
                                 name==FrictionCoefficientEnum ||
                                 name==FrictionAsEnum ||
@@ -2035 +2035 @@
                                 name==GradientEnum ||
                                 name==OldGradientEnum  ||
-                                name==ConvergedEnum || 
+                                name==ConvergedEnum ||
                                 name==MaterialsRheologyEEnum ||
                                 name==MaterialsRheologyEbarEnum ||
@@ -2045 +2045 @@
                                 name==MaterialsRheologyEsEnum ||
                                 name==MaterialsRheologyEsbarEnum ||
-                                name==SealevelEnum || 
-                                name==SealevelUmotionEnum || 
-                                name==SealevelNmotionEnum || 
-                                name==SealevelEmotionEnum || 
-                                name==SealevelAbsoluteEnum || 
-                                name==SealevelEustaticEnum || 
-                                name==SealevelriseDeltathicknessEnum || 
-                                name==EsaUmotionEnum || 
-                                name==EsaNmotionEnum || 
-                                name==EsaEmotionEnum || 
-                                name==EsaXmotionEnum || 
-                                name==EsaYmotionEnum || 
+                                name==SealevelEnum ||
+                                name==SealevelUmotionEnum ||
+                                name==SealevelNmotionEnum ||
+                                name==SealevelEmotionEnum ||
+                                name==SealevelAbsoluteEnum ||
+                                name==SealevelEustaticEnum ||
+                                name==SealevelriseDeltathicknessEnum ||
+                                name==EsaUmotionEnum ||
+                                name==EsaNmotionEnum ||
+                                name==EsaEmotionEnum ||
+                                name==EsaXmotionEnum ||
+                                name==EsaYmotionEnum ||
                                 name==EsaStrainratexxEnum ||
-                                name==EsaStrainratexyEnum || 
+                                name==EsaStrainratexyEnum ||
                                 name==EsaStrainrateyyEnum ||
                                 name==EsaRotationrateEnum ||
-                                name==EsaDeltathicknessEnum || 
-                                name==GiaWEnum || 
+                                name==EsaDeltathicknessEnum ||
+                                name==GiaWEnum ||
                                 name==GiadWdtEnum ||
-                                name==SedimentHeadEnum ||
-                                name==EplHeadEnum ||
+                                name==SedimentHeadHydrostepEnum ||
+                                name==EplHeadHydrostepEnum ||
                                 name==SedimentHeadOldEnum ||
                                 name==EplHeadOldEnum ||
@@ -2073 +2073 @@
                                 name==HydrologydcEplThicknessOldEnum ||
                                 name==HydrologydcEplInitialThicknessEnum ||
-                                name==HydrologydcEplThicknessEnum ||
+                                name==HydrologydcEplThicknessHydrostepEnum ||
                                 name==HydrologydcMaskEplactiveNodeEnum ||
                                 name==HydrologyHeadEnum ||
-                                name==HydrologyHeadOldEnum ||           
-                                name==StressbalanceConvergenceNumStepsEnum || 
-                                name==MeshVertexonbaseEnum || 
+                                name==HydrologyHeadOldEnum ||
+                                name==StressbalanceConvergenceNumStepsEnum ||
+                                name==MeshVertexonbaseEnum ||
                                 name==FrictionPEnum ||
                                 name==FrictionQEnum ||
@@ -2181 +2181 @@
 }/*}}}*/
 void       Element::MarshallElement(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction,int numanalyses){/*{{{*/
-        
+
         _assert_(this);
         if(marshall_direction==MARSHALLING_BACKWARD){
@@ -2189 +2189 @@
 
         MARSHALLING_ENUM(ElementEnum);
-        
+
         MARSHALLING(id);
         MARSHALLING(sid);
@@ -2229 +2229 @@
                 /* Contact FS*/
                 if(migration_style == ContactEnum && phi_ungrounding[vertices[i]->Pid()]<10){
-                        phi[i]=phi_ungrounding[vertices[i]->Pid()]; 
+                        phi[i]=phi_ungrounding[vertices[i]->Pid()];
                         if(phi[i]>=0.) b[i]=r[i];
                 }
@@ -2235 +2235 @@
                 /*Ice shelf: if bed below bathymetry, impose it at the bathymetry and update surface, elso do nothing */
                 else if(phi[i]<=0.){
-                        if(b[i]<=r[i]){ 
+                        if(b[i]<=r[i]){
                                 b[i]        = r[i];
                                 s[i]        = b[i]+h[i];
@@ -2495 +2495 @@
         }
 
-        /*Recover pdd factors at time t. 
-         *     This parameter is set, if the user wants to define the 
+        /*Recover pdd factors at time t.
+         *     This parameter is set, if the user wants to define the
          *     pdd factors regionally, if issetpddfac==1 in the d18opdd method */
         if (issetpddfac==1){
@@ -2542 +2542 @@
 
         switch(this->ObjectEnum()){
-                case TriaEnum:  
+                case TriaEnum:
                         // this->inputs->AddInput(new TriaInput(TemperatureEnum,&yearlytemperatures[0],P1Enum));
                         this->inputs->AddInput(new TriaInput(TemperaturePDDEnum,&yearlytemperatures[0],P1Enum));
@@ -2577 +2577 @@
                         this->InputExtrude(SmbMassBalanceEnum,-1);
                         break;
-                case TetraEnum: 
+                case TetraEnum:
                         if(IsOnSurface()){
                                 GetInputListOnVertices(&s[0],TemperatureEnum);
@@ -2625 +2625 @@
                 case ViscousHeatingEnum: this->ViscousHeatingCreateInput(); break;
                 case StressMaxPrincipalEnum: this->StressMaxPrincipalCreateInput(); break;
-                case StressTensorxxEnum: 
-                case StressTensorxyEnum: 
-                case StressTensorxzEnum: 
-                case StressTensoryyEnum: 
-                case StressTensoryzEnum: 
+                case StressTensorxxEnum:
+                case StressTensorxyEnum:
+                case StressTensorxzEnum:
+                case StressTensoryyEnum:
+                case StressTensoryzEnum:
                 case StressTensorzzEnum: this->ComputeStressTensor(); break;
                 case StrainRatexxEnum:
@@ -2638 +2638 @@
                 case StrainRatezzEnum:
                 case StrainRateeffectiveEnum: this->ComputeStrainRate(); break;
-                case DeviatoricStressxxEnum: 
-                case DeviatoricStressxyEnum: 
-                case DeviatoricStressxzEnum: 
-                case DeviatoricStressyyEnum: 
-                case DeviatoricStressyzEnum: 
-                case DeviatoricStresszzEnum: 
+                case DeviatoricStressxxEnum:
+                case DeviatoricStressxyEnum:
+                case DeviatoricStressxzEnum:
+                case DeviatoricStressyyEnum:
+                case DeviatoricStressyzEnum:
+                case DeviatoricStresszzEnum:
                 case DeviatoricStresseffectiveEnum: this->ComputeDeviatoricStressTensor(); break;
                 case EsaStrainratexxEnum:
-                case EsaStrainratexyEnum: 
-                case EsaStrainrateyyEnum: 
+                case EsaStrainratexyEnum:
+                case EsaStrainrateyyEnum:
                 case EsaRotationrateEnum: this->ComputeEsaStrainAndVorticity(); break;
                 case SigmaNNEnum: this->ComputeSigmaNN(); break;
@@ -2952 +2952 @@
         /*}}}*/
         /*Retrieve inputs: {{{*/
-        Input* zTop_input=this->GetInput(SmbZTopEnum); _assert_(zTop_input); 
-        Input* dzTop_input=this->GetInput(SmbDzTopEnum); _assert_(dzTop_input); 
-        Input* dzMin_input=this->GetInput(SmbDzMinEnum); _assert_(dzMin_input); 
-        Input* zMax_input=this->GetInput(SmbZMaxEnum); _assert_(zMax_input); 
-        Input* zMin_input=this->GetInput(SmbZMinEnum); _assert_(zMin_input); 
-        Input* zY_input=this->GetInput(SmbZYEnum); _assert_(zY_input); 
+        Input* zTop_input=this->GetInput(SmbZTopEnum); _assert_(zTop_input);
+        Input* dzTop_input=this->GetInput(SmbDzTopEnum); _assert_(dzTop_input);
+        Input* dzMin_input=this->GetInput(SmbDzMinEnum); _assert_(dzMin_input);
+        Input* zMax_input=this->GetInput(SmbZMaxEnum); _assert_(zMax_input);
+        Input* zMin_input=this->GetInput(SmbZMinEnum); _assert_(zMin_input);
+        Input* zY_input=this->GetInput(SmbZYEnum); _assert_(zY_input);
         Input* Tmean_input=this->GetInput(SmbTmeanEnum); _assert_(Tmean_input);
         Input* C_input=this->GetInput(SmbCEnum); _assert_(C_input);
@@ -2978 +2978 @@
         dzTop_input->GetInputValue(&dzTop,gauss);
         dzMin_input->GetInputValue(&dzMin,gauss);
-        zMax_input->GetInputValue(&zMax,gauss); 
-        zMin_input->GetInputValue(&zMin,gauss); 
+        zMax_input->GetInputValue(&zMax,gauss);
+        zMin_input->GetInputValue(&zMin,gauss);
         zY_input->GetInputValue(&zY,gauss);
         Tmean_input->GetInputValue(&Tmean,gauss);
@@ -3033 +3033 @@
                         a = xNewZeroInit<IssmDouble>(m); for(int i=0;i<m;i++)a[i]=aini[0];         //set albedo equal to fresh snow [fraction]
                         T = xNewZeroInit<IssmDouble>(m); for(int i=0;i<m;i++)T[i]=Tmean;         //set initial grid cell temperature to the annual mean temperature [K]
-                        /*/!\ Default value of T can not be retrived from SMBgemb.m (like other snow properties) 
+                        /*/!\ Default value of T can not be retrived from SMBgemb.m (like other snow properties)
                          *    because don't know Tmean yet when set default values.
                          *    Default value of 0C given in SMBgemb.m is overwritten here with value of Tmean*/
@@ -3094 +3094 @@
         sumdz_add=0;
 
-        //before starting loop, realize that the transient core runs this smb_core at time = time +deltaT. 
-        //go back to time - deltaT: 
+        //before starting loop, realize that the transient core runs this smb_core at time = time +deltaT.
+        //go back to time - deltaT:
         time-=dt;
 
@@ -3133 +3133 @@
                 if(isthermal)thermo(&EC, &T, dz, d, swf, dlw, Ta, V, eAir, pAir, teValue, W[0], smb_dt, m, Vz, Tz, thermo_scaling,rho_ice,this->Sid());
 
-                /*Change in thickness of top cell due to evaporation/condensation  assuming same density as top cell. 
+                /*Change in thickness of top cell due to evaporation/condensation  assuming same density as top cell.
                  * need to fix this in case all or more of cell evaporates */
                 dz[0] = dz[0] + EC / d[0];
@@ -3147 +3147 @@
                 if(isdensification)densification(&d,&dz, T, re, denIdx, C, smb_dt, Tmean,rho_ice,m,this->Sid());
 
-                /*Calculate upward longwave radiation flux [W m-2] not used in energy balance. Calculated for every 
+                /*Calculate upward longwave radiation flux [W m-2] not used in energy balance. Calculated for every
                  * sub-time step in thermo equations*/
                 ulw = 5.67E-8 * pow(T[0],4.0) * teValue;
@@ -3158 +3158 @@
 
                 /*Verbose some results in debug mode: {{{*/
-                if(VerboseSmb() && 0){ 
-                        _printf_("smb log: count[" << count << "] m[" << m << "] " 
-                                                << setprecision(16)   << "T[" << cellsum(T,m)  << "] " 
+                if(VerboseSmb() && 0){
+                        _printf_("smb log: count[" << count << "] m[" << m << "] "
+                                                << setprecision(16)   << "T[" << cellsum(T,m)  << "] "
                                                 << "d[" << cellsum(d,m)  << "] "
                                                 << "dz[" << cellsum(dz,m)  << "] "
@@ -3183 +3183 @@
 
                 /*Calculate total system mass:*/
-                sumMass=0; 
+                sumMass=0;
                 fac=0;
                 for(int i=0;i<m;i++){
@@ -3262 +3262 @@
         vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss);
         vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss);
-        epsilon[0] = dvx[0];    // normal strain rate x-direction  
-        epsilon[1] = dvy[1]; // normal strain rate y-direction 
-        epsilon[2] = 0.5*(dvx[1] + dvy[0]); // shear strain rate 
-        epsilon[3] = 0.5*(dvx[1] - dvy[0]); // rotation rate 
+        epsilon[0] = dvx[0];    // normal strain rate x-direction
+        epsilon[1] = dvy[1]; // normal strain rate y-direction
+        epsilon[2] = 0.5*(dvx[1] + dvy[0]); // shear strain rate
+        epsilon[3] = 0.5*(dvx[1] - dvy[0]); // rotation rate
 
 }/*}}}*/

issm/trunk-jpl/src/c/classes/Loads/Friction.cpp ¶

@@ -722 +722 @@
                         break;
                 case 4:
-                        element->GetInputValue(&Neff,gauss,EffectivePressureTimeAverageEnum);
+                        element->GetInputValue(&Neff,gauss,EffectivePressureEnum);
                         break;
                 default:

issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp ¶

@@ -170 +170 @@
 void  Pengrid::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){/*{{{*/
 
-        /*Take care of hooking up all objects for this load, ie links the objects in the hooks to their respective 
+        /*Take care of hooking up all objects for this load, ie links the objects in the hooks to their respective
          * datasets, using internal ids and offsets hidden in hooks: */
         hnode->configure(nodesin);
@@ -195 +195 @@
         /*No loads applied, do nothing, originaly used for moulin input: */
         return;
-        
+
 }
 /*}}}*/
@@ -416 +416 @@
 void           Pengrid::ConstraintActivateHydrologyDCInefficient(int* punstable){/*{{{*/
 
-        //   The penalty is stable if it doesn't change during two consecutive iterations.   
+        //   The penalty is stable if it doesn't change during two consecutive iterations.
         int        unstable=0;
         int        new_active;
@@ -422 +422 @@
         IssmDouble pressure;
         IssmDouble h;
-        IssmDouble h_max;       
+        IssmDouble h_max;
         HydrologyDCInefficientAnalysis* inefanalysis = NULL;
 
@@ -440 +440 @@
         /*Get sediment water head h*/
         inefanalysis = new HydrologyDCInefficientAnalysis();
-        element->GetInputValue(&h,node,SedimentHeadEnum);
+        element->GetInputValue(&h,node,SedimentHeadHydrostepEnum);
         inefanalysis->GetHydrologyDCInefficientHmax(&h_max,element,node);
         parameters->FindParam(&penalty_lock,HydrologydcPenaltyLockEnum);
@@ -476 +476 @@
 void           Pengrid::ConstraintActivateThermal(int* punstable){/*{{{*/
 
-        //   The penalty is stable if it doesn't change during to successive iterations.   
+        //   The penalty is stable if it doesn't change during to successive iterations.
         IssmDouble pressure;
         IssmDouble temperature;

issm/trunk-jpl/src/c/cores/hydrology_core.cpp ¶

@@ -64 +64 @@
                         /*define which variable needs to be averaged on the sub-timestep and initialize as needed*/
                         if (isefficientlayer){
-                                int inputtostack[4]={EffectivePressureEnum,SedimentHeadEnum,EplHeadEnum,HydrologydcEplThicknessEnum};
+                                int inputtostack[4]={EffectivePressureHydrostepEnum,SedimentHeadHydrostepEnum,EplHeadHydrostepEnum,HydrologydcEplThicknessHydrostepEnum};
                                 int stackedinput[4]={EffectivePressureStackedEnum,SedimentHeadStackedEnum,EplHeadStackedEnum,HydrologydcEplThicknessStackedEnum};
-                                int averagedinput[4]={EffectivePressureTimeAverageEnum,SedimentHeadTimeAverageEnum,EplHeadTimeAverageEnum,HydrologydcEplThicknessTimeAverageEnum};
+                                int averagedinput[4]={EffectivePressureEnum,SedimentHeadEnum,EplHeadEnum,HydrologydcEplThicknessEnum};
                                 femmodel->InitTransientOutputx(&stackedinput[0],4);
                                 while(hydrotime<time-(yts*DBL_EPSILON)){ //loop on hydro dts
                                         hydrotime+=hydrodt;
                                         /*save preceding timestep*/
-                                        InputDuplicatex(femmodel,SedimentHeadEnum,SedimentHeadOldEnum);
-                                        InputDuplicatex(femmodel,EplHeadEnum,EplHeadOldEnum);
-                                        InputDuplicatex(femmodel,HydrologydcEplThicknessEnum,HydrologydcEplThicknessOldEnum);
+                                        InputDuplicatex(femmodel,SedimentHeadHydrostepEnum,SedimentHeadOldEnum);
+                                        InputDuplicatex(femmodel,EplHeadHydrostepEnum,EplHeadOldEnum);
+                                        InputDuplicatex(femmodel,HydrologydcEplThicknessHydrostepEnum,HydrologydcEplThicknessOldEnum);
                                         /*Proceed now to heads computations*/
                                         solutionsequence_hydro_nonlinear(femmodel);
@@ -82 +82 @@
                         }
                         else{
-                                int inputtostack[2]={EffectivePressureEnum,SedimentHeadEnum};
+                                int inputtostack[2]={EffectivePressureHydrostepEnum,SedimentHeadHydrostepEnum};
                                 int stackedinput[2]={EffectivePressureStackedEnum,SedimentHeadStackedEnum};
-                                int averagedinput[2]={EffectivePressureTimeAverageEnum,SedimentHeadTimeAverageEnum};
+                                int averagedinput[2]={EffectivePressureEnum,SedimentHeadEnum};
                                 femmodel->InitTransientOutputx(&stackedinput[0],2);
                                 while(hydrotime<time-(yts*DBL_EPSILON)){ //loop on hydro dts
                                         hydrotime+=hydrodt;
                                         /*save preceding timestep*/
-                                        InputDuplicatex(femmodel,SedimentHeadEnum,SedimentHeadOldEnum);
+                                        InputDuplicatex(femmodel,SedimentHeadHydrostepEnum,SedimentHeadOldEnum);
                                         /*Proceed now to heads computations*/
                                         solutionsequence_hydro_nonlinear(femmodel);
@@ -99 +99 @@
                 }
                 else{
-                        InputDuplicatex(femmodel,SedimentHeadEnum,SedimentHeadOldEnum);
+                        InputDuplicatex(femmodel,SedimentHeadHydrostepEnum,SedimentHeadOldEnum);
                         if (isefficientlayer){
-                                InputDuplicatex(femmodel,EplHeadEnum,EplHeadOldEnum);
-                                InputDuplicatex(femmodel,HydrologydcEplThicknessEnum,HydrologydcEplThicknessOldEnum);
+                                InputDuplicatex(femmodel,EplHeadHydrostepEnum,EplHeadOldEnum);
+                                InputDuplicatex(femmodel,HydrologydcEplThicknessHydrostepEnum,HydrologydcEplThicknessOldEnum);
                         }
                         /*Proceed now to heads computations*/

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h ¶

@@ -409 +409 @@
         DrivingStressXEnum,
         DrivingStressYEnum,
-        EffectivePressureEnum,
+        EffectivePressureHydrostepEnum,
         EnthalpyEnum,
         EnthalpyPicardEnum,
-        EplHeadEnum,
+        EplHeadHydrostepEnum,
         EplHeadOldEnum,
         EplHeadSlopeXEnum,
@@ -437 +437 @@
         HydrologyBumpSpacingEnum,
         HydrologydcBasalMoulinInputEnum,
-        HydrologydcEplThicknessEnum,
+        HydrologydcEplThicknessHydrostepEnum,
         HydrologydcEplThicknessOldEnum,
         HydrologydcMaskEplactiveEltEnum,
@@ -492 +492 @@
         SealevelEnum,
         SealevelriseDeltathicknessEnum,
-        SedimentHeadEnum,
+        SedimentHeadHydrostepEnum,
         SedimentHeadOldEnum,
         SedimentHeadResidualEnum,
@@ -696 +696 @@
         DoubleVecParamEnum,
         EffectivePressureStackedEnum,
-        EffectivePressureTimeAverageEnum,
+        EffectivePressureEnum,
         ElementEnum,
         ElementHookEnum,
@@ -702 +702 @@
         EnthalpyAnalysisEnum,
         EplHeadStackedEnum,
-        EplHeadTimeAverageEnum,
+        EplHeadEnum,
         EsaAnalysisEnum,
         EsaEmotionEnum,
@@ -763 +763 @@
         HydrologydcEplPorosityEnum,
         HydrologydcEplThicknessStackedEnum,
-        HydrologydcEplThicknessTimeAverageEnum,
+        HydrologydcEplThicknessEnum,
         HydrologyDCInefficientAnalysisEnum,
         HydrologydcSedimentCompressibilityEnum,
@@ -1024 +1024 @@
         SealevelUmotionEnum,
         SedimentHeadStackedEnum,
-        SedimentHeadTimeAverageEnum,
+        SedimentHeadEnum,
         SegEnum,
         SegInputEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp ¶

@@ -415 +415 @@
                 case DrivingStressXEnum : return "DrivingStressX";
                 case DrivingStressYEnum : return "DrivingStressY";
-                case EffectivePressureEnum : return "EffectivePressure";
+                case EffectivePressureHydrostepEnum : return "EffectivePressureHydrostep";
                 case EnthalpyEnum : return "Enthalpy";
                 case EnthalpyPicardEnum : return "EnthalpyPicard";
-                case EplHeadEnum : return "EplHead";
+                case EplHeadHydrostepEnum : return "EplHeadHydrostep";
                 case EplHeadOldEnum : return "EplHeadOld";
                 case EplHeadSlopeXEnum : return "EplHeadSlopeX";
@@ -443 +443 @@
                 case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing";
                 case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput";
-                case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness";
+                case HydrologydcEplThicknessHydrostepEnum : return "HydrologydcEplThicknessHydrostep";
                 case HydrologydcEplThicknessOldEnum : return "HydrologydcEplThicknessOld";
                 case HydrologydcMaskEplactiveEltEnum : return "HydrologydcMaskEplactiveElt";
@@ -498 +498 @@
                 case SealevelEnum : return "Sealevel";
                 case SealevelriseDeltathicknessEnum : return "SealevelriseDeltathickness";
-                case SedimentHeadEnum : return "SedimentHead";
+                case SedimentHeadHydrostepEnum : return "SedimentHeadHydrostep";
                 case SedimentHeadOldEnum : return "SedimentHeadOld";
                 case SedimentHeadResidualEnum : return "SedimentHeadResidual";
@@ -700 +700 @@
                 case DoubleVecParamEnum : return "DoubleVecParam";
                 case EffectivePressureStackedEnum : return "EffectivePressureStacked";
-                case EffectivePressureTimeAverageEnum : return "EffectivePressureTimeAverage";
+                case EffectivePressureEnum : return "EffectivePressure";
                 case ElementEnum : return "Element";
                 case ElementHookEnum : return "ElementHook";
@@ -706 +706 @@
                 case EnthalpyAnalysisEnum : return "EnthalpyAnalysis";
                 case EplHeadStackedEnum : return "EplHeadStacked";
-                case EplHeadTimeAverageEnum : return "EplHeadTimeAverage";
+                case EplHeadEnum : return "EplHead";
                 case EsaAnalysisEnum : return "EsaAnalysis";
                 case EsaEmotionEnum : return "EsaEmotion";
@@ -767 +767 @@
                 case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity";
                 case HydrologydcEplThicknessStackedEnum : return "HydrologydcEplThicknessStacked";
-                case HydrologydcEplThicknessTimeAverageEnum : return "HydrologydcEplThicknessTimeAverage";
+                case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness";
                 case HydrologyDCInefficientAnalysisEnum : return "HydrologyDCInefficientAnalysis";
                 case HydrologydcSedimentCompressibilityEnum : return "HydrologydcSedimentCompressibility";
@@ -1028 +1028 @@
                 case SealevelUmotionEnum : return "SealevelUmotion";
                 case SedimentHeadStackedEnum : return "SedimentHeadStacked";
-                case SedimentHeadTimeAverageEnum : return "SedimentHeadTimeAverage";
+                case SedimentHeadEnum : return "SedimentHead";
                 case SegEnum : return "Seg";
                 case SegInputEnum : return "SegInput";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp ¶

@@ -424 +424 @@
               else if (strcmp(name,"DrivingStressX")==0) return DrivingStressXEnum;
               else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum;
-              else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
+              else if (strcmp(name,"EffectivePressureHydrostep")==0) return EffectivePressureHydrostepEnum;
               else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
               else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
-              else if (strcmp(name,"EplHead")==0) return EplHeadEnum;
+              else if (strcmp(name,"EplHeadHydrostep")==0) return EplHeadHydrostepEnum;
               else if (strcmp(name,"EplHeadOld")==0) return EplHeadOldEnum;
               else if (strcmp(name,"EplHeadSlopeX")==0) return EplHeadSlopeXEnum;
@@ -452 +452 @@
               else if (strcmp(name,"HydrologyBumpSpacing")==0) return HydrologyBumpSpacingEnum;
               else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
-              else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum;
+              else if (strcmp(name,"HydrologydcEplThicknessHydrostep")==0) return HydrologydcEplThicknessHydrostepEnum;
               else if (strcmp(name,"HydrologydcEplThicknessOld")==0) return HydrologydcEplThicknessOldEnum;
               else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
@@ -510 +510 @@
    if(stage==5){
               if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
-              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
+              else if (strcmp(name,"SedimentHeadHydrostep")==0) return SedimentHeadHydrostepEnum;
               else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum;
               else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum;
@@ -715 +715 @@
               else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
               else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
-              else if (strcmp(name,"EffectivePressureTimeAverage")==0) return EffectivePressureTimeAverageEnum;
+              else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
               else if (strcmp(name,"Element")==0) return ElementEnum;
               else if (strcmp(name,"ElementHook")==0) return ElementHookEnum;
@@ -721 +721 @@
               else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
               else if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum;
-              else if (strcmp(name,"EplHeadTimeAverage")==0) return EplHeadTimeAverageEnum;
+              else if (strcmp(name,"EplHead")==0) return EplHeadEnum;
               else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
               else if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum;
@@ -785 +785 @@
               else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum;
               else if (strcmp(name,"HydrologydcEplThicknessStacked")==0) return HydrologydcEplThicknessStackedEnum;
-              else if (strcmp(name,"HydrologydcEplThicknessTimeAverage")==0) return HydrologydcEplThicknessTimeAverageEnum;
+              else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum;
               else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
               else if (strcmp(name,"HydrologydcSedimentCompressibility")==0) return HydrologydcSedimentCompressibilityEnum;
@@ -1052 +1052 @@
               else if (strcmp(name,"SealevelUmotion")==0) return SealevelUmotionEnum;
               else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum;
-              else if (strcmp(name,"SedimentHeadTimeAverage")==0) return SedimentHeadTimeAverageEnum;
+              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
               else if (strcmp(name,"Seg")==0) return SegEnum;
               else if (strcmp(name,"SegInput")==0) return SegInputEnum;