Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 22855) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 22856) @@ -61,7 +61,7 @@ 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,5 +134,5 @@ if(iomodel->my_vertices[i]){ loads->AddObject(new Moulin(iomodel->loadcounter+i+1,i,iomodel,HydrologyDCEfficientAnalysisEnum)); - } + } } } @@ -199,5 +199,5 @@ if(!active_element) { if(domaintype!=Domain2DhorizontalEnum){ - basalelement->DeleteMaterials(); + basalelement->DeleteMaterials(); delete basalelement; } @@ -226,6 +226,6 @@ 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,5 +235,5 @@ 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,5 +245,5 @@ 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,6 +260,6 @@ basis,1,numnodes,0, &Ke->values[0],1); - - + + /*Transfer EPL part*/ transfer=GetHydrologyKMatrixTransfer(basalelement); @@ -308,5 +308,5 @@ if(!active_element) { if(domaintype!=Domain2DhorizontalEnum){ - basalelement->DeleteMaterials(); + basalelement->DeleteMaterials(); delete basalelement; } @@ -333,10 +333,10 @@ /*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,5 +361,5 @@ if(dt!=0.) scalar = scalar*dt; for(int i=0;ivalues[i]+=scalar*basis[i]; - + /*Transient and transfer terms*/ if(dt!=0.){ @@ -393,5 +393,5 @@ void HydrologyDCEfficientAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ - element->GetSolutionFromInputsOneDof(solution,EplHeadEnum); + element->GetSolutionFromInputsOneDof(solution,EplHeadHydrostepEnum); }/*}}}*/ @@ -446,5 +446,5 @@ //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;iAddBasalInput(EplHeadEnum,eplHeads,P1Enum); + element->AddBasalInput(EplHeadHydrostepEnum,eplHeads,P1Enum); /*Free ressources:*/ xDelete(eplHeads); @@ -525,5 +525,5 @@ IssmDouble EPLgrad2; IssmDouble EPL_N; - + femmodel->parameters->FindParam(&domaintype,DomainTypeEnum); femmodel->parameters->FindParam(&iseplthickcomp,HydrologydcEplThickCompEnum); @@ -531,10 +531,10 @@ for(int j=0;jelements->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(numnodes); @@ -547,9 +547,9 @@ IssmDouble* bed = xNew(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,7 +567,7 @@ 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,5 +599,5 @@ } } - element->AddInput(HydrologydcEplThicknessEnum,thickness,element->GetElementType()); + element->AddInput(HydrologydcEplThicknessHydrostepEnum,thickness,element->GetElementType()); xDelete(thickness); xDelete(eplhead); @@ -612,7 +612,7 @@ 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,5 +667,5 @@ IssmDouble* residual =xNew(numnodes); IssmDouble* base =xNew(numnodes); - + IssmDouble init_thick =basalelement->GetMaterialParameter(HydrologydcEplInitialThicknessEnum); IssmDouble colapse_thick =basalelement->GetMaterialParameter(HydrologydcEplColapseThicknessEnum); @@ -674,8 +674,8 @@ 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,8 +724,8 @@ } } - basalelement->AddInput(HydrologydcEplThicknessEnum,epl_thickness,basalelement->GetElementType()); + basalelement->AddInput(HydrologydcEplThicknessHydrostepEnum,epl_thickness,basalelement->GetElementType()); if(domaintype!=Domain2DhorizontalEnum){ - basalelement->DeleteMaterials(); + basalelement->DeleteMaterials(); delete basalelement; } @@ -802,5 +802,5 @@ default: _error_("mesh "<GetNumberOfNodes(); IssmDouble flag = 0.; @@ -810,7 +810,7 @@ /*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;iSetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); - } + } } else{ @@ -836,5 +836,5 @@ void HydrologyDCEfficientAnalysis::GetHydrologyDCInefficientHmax(IssmDouble* ph_max,Element* element, Node* innode){/*{{{*/ - + int hmax_flag; IssmDouble h_max; @@ -843,5 +843,5 @@ /*Get the flag to the limitation method*/ element->FindParam(&hmax_flag,HydrologydcSedimentlimitFlagEnum); - + /*Switch between the different cases*/ switch(hmax_flag){ Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 22855) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 22856) @@ -98,5 +98,5 @@ 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,5 +107,5 @@ 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,5 +225,5 @@ 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,6 +337,6 @@ 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,5 +447,5 @@ void HydrologyDCInefficientAnalysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/ - element->GetSolutionFromInputsOneDof(solution,SedimentHeadEnum); + element->GetSolutionFromInputsOneDof(solution,SedimentHeadHydrostepEnum); }/*}}}*/ @@ -532,6 +532,6 @@ /*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); Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 22855) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 22856) @@ -60,5 +60,5 @@ } - 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,5 +184,5 @@ return NULL; } - + /*Intermediaries */ int input_enum,index; @@ -202,6 +202,6 @@ 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,3 +254,2 @@ return; }/*}}}*/ - Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 22855) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 22856) @@ -117,5 +117,5 @@ /*Add Stress tensor components into inputs*/ this->AddInput(LambdaSEnum,lambdas,P1Enum); - + /*Clean up and return*/ delete gauss; @@ -172,5 +172,5 @@ B_input=this->GetInput(MaterialsRheologyBEnum); _assert_(B_input); } - + /* Start looping on the number of nodes: */ Gauss* gauss=this->NewGauss(); @@ -196,5 +196,5 @@ /* 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,5 +262,5 @@ 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,8 +270,8 @@ 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,5 +659,5 @@ xDelete(PrecipitationsReconstructed); xDelete(tmp); - + } /*}}}*/ @@ -856,5 +856,5 @@ int numnodes = this->GetNumberOfNodes(); for(int i=0;i(values); xDelete(vertexids); } else if(vector_type==2){ //element vector - + IssmDouble value; - + /*Are we in transient or static? */ if(M==iomodel->numberofelements){ @@ -1640,5 +1640,5 @@ } else if(vector_type==3){ //element vector - + /*For right now we are static */ if(M==iomodel->numberofelements){ @@ -1665,7 +1665,7 @@ /*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,5 +1699,5 @@ TransientInput* grad_input = new TransientInput(ControlInputGradEnum); for(int t=0;tObjectEnum()){ 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,5 +1740,5 @@ * code: what type of data is in the vector (booleans, ints, doubles) */ - + /*Intermediaries*/ int i,t; @@ -1760,9 +1760,9 @@ /*Branch on type of vector: nodal or elementary: */ if(vector_type==1){ //nodal vector - + int numvertices = this->GetNumberOfVertices(); int *vertexids = xNew(numvertices); IssmDouble *values = xNew(numvertices); - + /*Recover vertices ids needed to initialize inputs*/ _assert_(iomodel->elements); @@ -1770,5 +1770,5 @@ vertexids[i]=reCast(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,5 +1779,5 @@ case TetraEnum: datasetinput->AddInput(new TetraInput(vector_enum,values,P0Enum),input_enum); break; default: _error_("Not implemented yet"); - } + } } else if(M==iomodel->numberofvertices){ @@ -1827,5 +1827,5 @@ 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,12 +1851,12 @@ _error_("nodal vector is either numberofvertices or numberofvertices+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long"); } - + xDelete(values); xDelete(vertexids); } else if(vector_type==2){ //element vector - + IssmDouble value; - + /*Are we in transient or static? */ if(M==iomodel->numberofelements){ @@ -1893,5 +1893,5 @@ } else if(vector_type==3){ //element vector - + /*For right now we are static */ if(M==iomodel->numberofelements){ @@ -2021,5 +2021,5 @@ name==EnthalpyPicardEnum || name==WaterfractionEnum|| - name==WatercolumnEnum || + name==WatercolumnEnum || name==FrictionCoefficientEnum || name==FrictionAsEnum || @@ -2035,5 +2035,5 @@ name==GradientEnum || name==OldGradientEnum || - name==ConvergedEnum || + name==ConvergedEnum || name==MaterialsRheologyEEnum || name==MaterialsRheologyEbarEnum || @@ -2045,25 +2045,25 @@ 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,10 +2073,10 @@ 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,5 +2181,5 @@ }/*}}}*/ void Element::MarshallElement(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction,int numanalyses){/*{{{*/ - + _assert_(this); if(marshall_direction==MARSHALLING_BACKWARD){ @@ -2189,5 +2189,5 @@ MARSHALLING_ENUM(ElementEnum); - + MARSHALLING(id); MARSHALLING(sid); @@ -2229,5 +2229,5 @@ /* 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,5 +2235,5 @@ /*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,6 +2495,6 @@ } - /*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,5 +2542,5 @@ 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,5 +2577,5 @@ this->InputExtrude(SmbMassBalanceEnum,-1); break; - case TetraEnum: + case TetraEnum: if(IsOnSurface()){ GetInputListOnVertices(&s[0],TemperatureEnum); @@ -2625,9 +2625,9 @@ 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,14 +2638,14 @@ 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,10 +2952,10 @@ /*}}}*/ /*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,6 +2978,6 @@ 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,5 +3033,5 @@ a = xNewZeroInit(m); for(int i=0;i(m); for(int i=0;iSid()); - /*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,5 +3147,5 @@ 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,7 +3158,7 @@ /*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,5 +3183,5 @@ /*Calculate total system mass:*/ - sumMass=0; + sumMass=0; fac=0; for(int i=0;iGetInputDerivativeValue(&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 }/*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Loads/Friction.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Friction.cpp (revision 22855) +++ /issm/trunk-jpl/src/c/classes/Loads/Friction.cpp (revision 22856) @@ -722,5 +722,5 @@ break; case 4: - element->GetInputValue(&Neff,gauss,EffectivePressureTimeAverageEnum); + element->GetInputValue(&Neff,gauss,EffectivePressureEnum); break; default: Index: /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp (revision 22855) +++ /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp (revision 22856) @@ -170,5 +170,5 @@ 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,5 +195,5 @@ /*No loads applied, do nothing, originaly used for moulin input: */ return; - + } /*}}}*/ @@ -416,5 +416,5 @@ 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,5 +422,5 @@ IssmDouble pressure; IssmDouble h; - IssmDouble h_max; + IssmDouble h_max; HydrologyDCInefficientAnalysis* inefanalysis = NULL; @@ -440,5 +440,5 @@ /*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,5 +476,5 @@ 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; Index: /issm/trunk-jpl/src/c/cores/hydrology_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/hydrology_core.cpp (revision 22855) +++ /issm/trunk-jpl/src/c/cores/hydrology_core.cpp (revision 22856) @@ -64,14 +64,14 @@ /*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(hydrotimeInitTransientOutputx(&stackedinput[0],2); while(hydrotime