Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 24048) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 24049) @@ -3293,4 +3293,5 @@ break; case CalvingFluxLevelsetEnum: this->CalvingFluxLevelset(); break; + case CalvingMeltingFluxLevelsetEnum: this->CalvingMeltingFluxLevelset(); break; case StrainRateparallelEnum: this->StrainRateparallel(); break; case StrainRateperpendicularEnum: this->StrainRateperpendicular(); break; Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 24048) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 24049) @@ -209,4 +209,5 @@ virtual void CalvingRateLevermann(void)=0; virtual void CalvingFluxLevelset(void){_error_("not implemented yet");}; + virtual void CalvingMeltingFluxLevelset(void){_error_("not implemented yet");}; virtual IssmDouble CharacteristicLength(void)=0; virtual void ComputeBasalStress(void){_error_("not implemented yet");}; @@ -323,4 +324,5 @@ virtual IssmDouble TimeAdapt()=0; virtual IssmDouble TotalCalvingFluxLevelset(bool scaled){_error_("not implemented");}; + virtual IssmDouble TotalCalvingMeltingFluxLevelset(bool scaled){_error_("not implemented");}; virtual IssmDouble TotalFloatingBmb(bool scaled)=0; virtual IssmDouble TotalGroundedBmb(bool scaled)=0; Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 24048) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 24049) @@ -615,4 +615,150 @@ this->inputs->AddInput(new TriaInput(CalvingFluxLevelsetEnum,&flux_per_area,P0Enum)); + } +} +/*}}}*/ +void Tria::CalvingMeltingFluxLevelset(){/*{{{*/ + + /*Make sure there is an ice front here*/ + if(!IsIceInElement() || !IsZeroLevelset(MaskIceLevelsetEnum)){ + IssmDouble flux_per_area=0; + this->inputs->AddInput(new TriaInput(CalvingMeltingFluxLevelsetEnum,&flux_per_area,P0Enum)); + } + else{ + int domaintype,index1,index2; + const IssmPDouble epsilon = 1.e-15; + IssmDouble s1,s2; + IssmDouble gl[NUMVERTICES]; + IssmDouble xyz_front[2][3]; + + + IssmDouble *xyz_list = NULL; + this->GetVerticesCoordinates(&xyz_list); + + /*Recover parameters and values*/ + parameters->FindParam(&domaintype,DomainTypeEnum); + GetInputListOnVertices(&gl[0],MaskIceLevelsetEnum); + + /*Be sure that values are not zero*/ + if(gl[0]==0.) gl[0]=gl[0]+epsilon; + if(gl[1]==0.) gl[1]=gl[1]+epsilon; + if(gl[2]==0.) gl[2]=gl[2]+epsilon; + + if(domaintype==Domain2DverticalEnum){ + _error_("not implemented"); + } + else if(domaintype==Domain2DhorizontalEnum || domaintype==Domain3DEnum || domaintype==Domain3DsurfaceEnum){ + int pt1 = 0; + int pt2 = 1; + if(gl[0]*gl[1]>0){ //Nodes 0 and 1 are similar, so points must be found on segment 0-2 and 1-2 + + /*Portion of the segments*/ + s1=gl[2]/(gl[2]-gl[1]); + s2=gl[2]/(gl[2]-gl[0]); + if(gl[2]<0.){ + pt1 = 1; pt2 = 0; + } + xyz_front[pt2][0]=xyz_list[3*2+0]+s1*(xyz_list[3*1+0]-xyz_list[3*2+0]); + xyz_front[pt2][1]=xyz_list[3*2+1]+s1*(xyz_list[3*1+1]-xyz_list[3*2+1]); + xyz_front[pt2][2]=xyz_list[3*2+2]+s1*(xyz_list[3*1+2]-xyz_list[3*2+2]); + xyz_front[pt1][0]=xyz_list[3*2+0]+s2*(xyz_list[3*0+0]-xyz_list[3*2+0]); + xyz_front[pt1][1]=xyz_list[3*2+1]+s2*(xyz_list[3*0+1]-xyz_list[3*2+1]); + xyz_front[pt1][2]=xyz_list[3*2+2]+s2*(xyz_list[3*0+2]-xyz_list[3*2+2]); + } + else if(gl[1]*gl[2]>0){ //Nodes 1 and 2 are similar, so points must be found on segment 0-1 and 0-2 + + /*Portion of the segments*/ + s1=gl[0]/(gl[0]-gl[1]); + s2=gl[0]/(gl[0]-gl[2]); + if(gl[0]<0.){ + pt1 = 1; pt2 = 0; + } + + xyz_front[pt1][0]=xyz_list[3*0+0]+s1*(xyz_list[3*1+0]-xyz_list[3*0+0]); + xyz_front[pt1][1]=xyz_list[3*0+1]+s1*(xyz_list[3*1+1]-xyz_list[3*0+1]); + xyz_front[pt1][2]=xyz_list[3*0+2]+s1*(xyz_list[3*1+2]-xyz_list[3*0+2]); + xyz_front[pt2][0]=xyz_list[3*0+0]+s2*(xyz_list[3*2+0]-xyz_list[3*0+0]); + xyz_front[pt2][1]=xyz_list[3*0+1]+s2*(xyz_list[3*2+1]-xyz_list[3*0+1]); + xyz_front[pt2][2]=xyz_list[3*0+2]+s2*(xyz_list[3*2+2]-xyz_list[3*0+2]); + } + else if(gl[0]*gl[2]>0){ //Nodes 0 and 2 are similar, so points must be found on segment 1-0 and 1-2 + + /*Portion of the segments*/ + s1=gl[1]/(gl[1]-gl[0]); + s2=gl[1]/(gl[1]-gl[2]); + if(gl[1]<0.){ + pt1 = 1; pt2 = 0; + } + + xyz_front[pt2][0]=xyz_list[3*1+0]+s1*(xyz_list[3*0+0]-xyz_list[3*1+0]); + xyz_front[pt2][1]=xyz_list[3*1+1]+s1*(xyz_list[3*0+1]-xyz_list[3*1+1]); + xyz_front[pt2][2]=xyz_list[3*1+2]+s1*(xyz_list[3*0+2]-xyz_list[3*1+2]); + xyz_front[pt1][0]=xyz_list[3*1+0]+s2*(xyz_list[3*2+0]-xyz_list[3*1+0]); + xyz_front[pt1][1]=xyz_list[3*1+1]+s2*(xyz_list[3*2+1]-xyz_list[3*1+1]); + xyz_front[pt1][2]=xyz_list[3*1+2]+s2*(xyz_list[3*2+2]-xyz_list[3*1+2]); + } + else{ + _error_("case not possible"); + } + + } + else _error_("mesh type "<=0 && s1<=1.); + _assert_(s2>=0 && s2<=1.); + + /*Get normal vector*/ + IssmDouble normal[3]; + this->NormalSection(&normal[0],&xyz_front[0][0]); + normal[0] = -normal[0]; + normal[1] = -normal[1]; + + /*Get inputs*/ + IssmDouble flux = 0.; + IssmDouble area = 0.; + IssmDouble calvingratex,calvingratey,vx,vy,vel,meltingrate,meltingratex,meltingratey,thickness,Jdet,flux_per_area; + IssmDouble rho_ice=FindParam(MaterialsRhoIceEnum); + Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* calvingratex_input=NULL; + Input* calvingratey_input=NULL; + Input* vx_input=NULL; + Input* vy_input=NULL; + Input* meltingrate_input=NULL; + if(domaintype==Domain2DhorizontalEnum){ + calvingratex_input=inputs->GetInput(CalvingratexEnum); _assert_(calvingratex_input); + calvingratey_input=inputs->GetInput(CalvingrateyEnum); _assert_(calvingratey_input); + vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); + vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + meltingrate_input=inputs->GetInput(CalvingMeltingrateEnum); _assert_(meltingrate_input); + } + else{ + calvingratex_input=inputs->GetInput(CalvingratexAverageEnum); _assert_(calvingratex_input); + calvingratey_input=inputs->GetInput(CalvingrateyAverageEnum); _assert_(calvingratey_input); + } + + /*Start looping on Gaussian points*/ + Gauss* gauss=this->NewGauss(xyz_list,&xyz_front[0][0],3); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + thickness_input->GetInputValue(&thickness,gauss); + calvingratex_input->GetInputValue(&calvingratex,gauss); + calvingratey_input->GetInputValue(&calvingratey,gauss); + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vel=vx*vx+vy*vy; + meltingrate_input->GetInputValue(&meltingrate,gauss); + meltingratex=meltingrate*vx/(sqrt(vel)+1.e-14); + meltingratey=meltingrate*vy/(sqrt(vel)+1.e-14); + this->JacobianDeterminantSurface(&Jdet,&xyz_front[0][0],gauss); + + flux += rho_ice*Jdet*gauss->weight*thickness*((calvingratex+meltingratex)*normal[0] + (calvingratey+meltingratey)*normal[1]); + area += Jdet*gauss->weight*thickness; + + flux_per_area=flux/area; + } + + this->inputs->AddInput(new TriaInput(CalvingMeltingFluxLevelsetEnum,&flux_per_area,P0Enum)); } } @@ -4002,4 +4148,145 @@ } /*}}}*/ +IssmDouble Tria::TotalCalvingMeltingFluxLevelset(bool scaled){/*{{{*/ + + /*Make sure there is an ice front here*/ + if(!IsIceInElement() || !IsZeroLevelset(MaskIceLevelsetEnum)) return 0; + + /*Scaled not implemented yet...*/ + _assert_(!scaled); + + int domaintype,index1,index2; + const IssmPDouble epsilon = 1.e-15; + IssmDouble s1,s2; + IssmDouble gl[NUMVERTICES]; + IssmDouble xyz_front[2][3]; + + + IssmDouble *xyz_list = NULL; + this->GetVerticesCoordinates(&xyz_list); + + /*Recover parameters and values*/ + parameters->FindParam(&domaintype,DomainTypeEnum); + GetInputListOnVertices(&gl[0],MaskIceLevelsetEnum); + + /*Be sure that values are not zero*/ + if(gl[0]==0.) gl[0]=gl[0]+epsilon; + if(gl[1]==0.) gl[1]=gl[1]+epsilon; + if(gl[2]==0.) gl[2]=gl[2]+epsilon; + + if(domaintype==Domain2DverticalEnum){ + _error_("not implemented"); + } + else if(domaintype==Domain2DhorizontalEnum || domaintype==Domain3DEnum || domaintype==Domain3DsurfaceEnum){ + int pt1 = 0; + int pt2 = 1; + if(gl[0]*gl[1]>0){ //Nodes 0 and 1 are similar, so points must be found on segment 0-2 and 1-2 + + /*Portion of the segments*/ + s1=gl[2]/(gl[2]-gl[1]); + s2=gl[2]/(gl[2]-gl[0]); + if(gl[2]<0.){ + pt1 = 1; pt2 = 0; + } + xyz_front[pt2][0]=xyz_list[3*2+0]+s1*(xyz_list[3*1+0]-xyz_list[3*2+0]); + xyz_front[pt2][1]=xyz_list[3*2+1]+s1*(xyz_list[3*1+1]-xyz_list[3*2+1]); + xyz_front[pt2][2]=xyz_list[3*2+2]+s1*(xyz_list[3*1+2]-xyz_list[3*2+2]); + xyz_front[pt1][0]=xyz_list[3*2+0]+s2*(xyz_list[3*0+0]-xyz_list[3*2+0]); + xyz_front[pt1][1]=xyz_list[3*2+1]+s2*(xyz_list[3*0+1]-xyz_list[3*2+1]); + xyz_front[pt1][2]=xyz_list[3*2+2]+s2*(xyz_list[3*0+2]-xyz_list[3*2+2]); + } + else if(gl[1]*gl[2]>0){ //Nodes 1 and 2 are similar, so points must be found on segment 0-1 and 0-2 + + /*Portion of the segments*/ + s1=gl[0]/(gl[0]-gl[1]); + s2=gl[0]/(gl[0]-gl[2]); + if(gl[0]<0.){ + pt1 = 1; pt2 = 0; + } + + xyz_front[pt1][0]=xyz_list[3*0+0]+s1*(xyz_list[3*1+0]-xyz_list[3*0+0]); + xyz_front[pt1][1]=xyz_list[3*0+1]+s1*(xyz_list[3*1+1]-xyz_list[3*0+1]); + xyz_front[pt1][2]=xyz_list[3*0+2]+s1*(xyz_list[3*1+2]-xyz_list[3*0+2]); + xyz_front[pt2][0]=xyz_list[3*0+0]+s2*(xyz_list[3*2+0]-xyz_list[3*0+0]); + xyz_front[pt2][1]=xyz_list[3*0+1]+s2*(xyz_list[3*2+1]-xyz_list[3*0+1]); + xyz_front[pt2][2]=xyz_list[3*0+2]+s2*(xyz_list[3*2+2]-xyz_list[3*0+2]); + } + else if(gl[0]*gl[2]>0){ //Nodes 0 and 2 are similar, so points must be found on segment 1-0 and 1-2 + + /*Portion of the segments*/ + s1=gl[1]/(gl[1]-gl[0]); + s2=gl[1]/(gl[1]-gl[2]); + if(gl[1]<0.){ + pt1 = 1; pt2 = 0; + } + + xyz_front[pt2][0]=xyz_list[3*1+0]+s1*(xyz_list[3*0+0]-xyz_list[3*1+0]); + xyz_front[pt2][1]=xyz_list[3*1+1]+s1*(xyz_list[3*0+1]-xyz_list[3*1+1]); + xyz_front[pt2][2]=xyz_list[3*1+2]+s1*(xyz_list[3*0+2]-xyz_list[3*1+2]); + xyz_front[pt1][0]=xyz_list[3*1+0]+s2*(xyz_list[3*2+0]-xyz_list[3*1+0]); + xyz_front[pt1][1]=xyz_list[3*1+1]+s2*(xyz_list[3*2+1]-xyz_list[3*1+1]); + xyz_front[pt1][2]=xyz_list[3*1+2]+s2*(xyz_list[3*2+2]-xyz_list[3*1+2]); + } + else{ + _error_("case not possible"); + } + + } + else _error_("mesh type "<=0 && s1<=1.); + _assert_(s2>=0 && s2<=1.); + + /*Get normal vector*/ + IssmDouble normal[3]; + this->NormalSection(&normal[0],&xyz_front[0][0]); + normal[0] = -normal[0]; + normal[1] = -normal[1]; + + /*Get inputs*/ + IssmDouble flux = 0.; + IssmDouble calvingratex,calvingratey,vx,vy,vel,meltingrate,meltingratex,meltingratey,thickness,Jdet,flux_per_area; + IssmDouble rho_ice=FindParam(MaterialsRhoIceEnum); + Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); + Input* calvingratex_input=NULL; + Input* calvingratey_input=NULL; + Input* vx_input=NULL; + Input* vy_input=NULL; + Input* meltingrate_input=NULL; + if(domaintype==Domain2DhorizontalEnum){ + calvingratex_input=inputs->GetInput(CalvingratexEnum); _assert_(calvingratex_input); + calvingratey_input=inputs->GetInput(CalvingrateyEnum); _assert_(calvingratey_input); + vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); + vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + meltingrate_input=inputs->GetInput(CalvingMeltingrateEnum); _assert_(meltingrate_input); + } + else{ + calvingratex_input=inputs->GetInput(CalvingratexAverageEnum); _assert_(calvingratex_input); + calvingratey_input=inputs->GetInput(CalvingrateyAverageEnum); _assert_(calvingratey_input); + } + + /*Start looping on Gaussian points*/ + Gauss* gauss=this->NewGauss(xyz_list,&xyz_front[0][0],3); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + thickness_input->GetInputValue(&thickness,gauss); + calvingratex_input->GetInputValue(&calvingratex,gauss); + calvingratey_input->GetInputValue(&calvingratey,gauss); + vx_input->GetInputValue(&vx,gauss); + vy_input->GetInputValue(&vy,gauss); + vel=vx*vx+vy*vy; + meltingrate_input->GetInputValue(&meltingrate,gauss); + meltingratex=meltingrate*vx/(sqrt(vel)+1.e-14); + meltingratey=meltingrate*vy/(sqrt(vel)+1.e-14); + this->JacobianDeterminantSurface(&Jdet,&xyz_front[0][0],gauss); + + flux += rho_ice*Jdet*gauss->weight*thickness*((calvingratex+meltingratex)*normal[0] + (calvingratey+meltingratey)*normal[1]); + } + + return flux; +} +/*}}}*/ IssmDouble Tria::TotalFloatingBmb(bool scaled){/*{{{*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 24048) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 24049) @@ -55,4 +55,5 @@ void CalvingRateLevermann(); void CalvingFluxLevelset(); + void CalvingMeltingFluxLevelset(); IssmDouble CharacteristicLength(void); void ComputeBasalStress(void); @@ -135,4 +136,5 @@ IssmDouble TimeAdapt(); IssmDouble TotalCalvingFluxLevelset(bool scaled); + IssmDouble TotalCalvingMeltingFluxLevelset(bool scaled); IssmDouble TotalFloatingBmb(bool scaled); IssmDouble TotalGroundedBmb(bool scaled); Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 24048) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 24049) @@ -1040,4 +1040,12 @@ } /*}}}*/ +void FemModel::CalvingMeltingFluxLevelsetx(){/*{{{*/ + + for(int i=0;iSize();i++){ + Element* element=dynamic_cast(this->elements->GetObjectByOffset(i)); + element->CalvingMeltingFluxLevelset(); + } +} +/*}}}*/ void FemModel::CostFunctionx(IssmDouble* pJ,IssmDouble** pJlist,int* pn){/*{{{*/ @@ -2282,5 +2290,6 @@ case MaxAbsVzEnum: this->MaxAbsVzx(&double_result); break; case MassFluxEnum: this->MassFluxx(&double_result); break; - case TotalCalvingFluxLevelsetEnum: this->TotalCalvingFluxLevelsetx(&double_result,false); break; + case TotalCalvingFluxLevelsetEnum: this->TotalCalvingFluxLevelsetx(&double_result,false); break; + case TotalCalvingMeltingFluxLevelsetEnum:this->TotalCalvingMeltingFluxLevelsetx(&double_result,false); break; case TotalFloatingBmbEnum: this->TotalFloatingBmbx(&double_result,false); break; case TotalFloatingBmbScaledEnum: this->TotalFloatingBmbx(&double_result,true); break; @@ -2527,5 +2536,6 @@ case DragCoefficientAbsGradientEnum: DragCoefficientAbsGradientx(responses, elements,nodes, vertices, loads, materials, parameters); break; case BalancethicknessMisfitEnum: BalancethicknessMisfitx(responses); break; - case TotalCalvingFluxLevelsetEnum: this->TotalCalvingFluxLevelsetx(responses, false); break; + case TotalCalvingFluxLevelsetEnum: this->TotalCalvingFluxLevelsetx(responses, false); break; + case TotalCalvingMeltingFluxLevelsetEnum:this->TotalCalvingMeltingFluxLevelsetx(responses, false); break; case TotalFloatingBmbEnum: this->TotalFloatingBmbx(responses, false); break; case TotalFloatingBmbScaledEnum: this->TotalFloatingBmbx(responses, true); break; @@ -2800,4 +2810,20 @@ Element* element=xDynamicCast(this->elements->GetObjectByOffset(i)); local_calving_flux+=element->TotalCalvingFluxLevelset(scaled); + } + ISSM_MPI_Reduce(&local_calving_flux,&total_calving_flux,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() ); + ISSM_MPI_Bcast(&total_calving_flux,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); + + /*Assign output pointers: */ + *pM=total_calving_flux; + +}/*}}}*/ +void FemModel::TotalCalvingMeltingFluxLevelsetx(IssmDouble* pM, bool scaled){/*{{{*/ + + IssmDouble local_calving_flux = 0; + IssmDouble total_calving_flux; + + for(int i=0;ielements->Size();i++){ + Element* element=xDynamicCast(this->elements->GetObjectByOffset(i)); + local_calving_flux+=element->TotalCalvingMeltingFluxLevelset(scaled); } ISSM_MPI_Reduce(&local_calving_flux,&total_calving_flux,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() ); Index: /issm/trunk-jpl/src/c/classes/FemModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.h (revision 24048) +++ /issm/trunk-jpl/src/c/classes/FemModel.h (revision 24049) @@ -91,4 +91,5 @@ void CalvingRateLevermannx(); void CalvingFluxLevelsetx(); + void CalvingMeltingFluxLevelsetx(); void DeviatoricStressx(); void Divergencex(IssmDouble* pdiv); @@ -131,4 +132,5 @@ void RignotMeltParameterizationx(); void TotalCalvingFluxLevelsetx(IssmDouble* pGbmb, bool scaled); + void TotalCalvingMeltingFluxLevelsetx(IssmDouble* pGbmb, bool scaled); void TotalFloatingBmbx(IssmDouble* pFbmb, bool scaled); void TotalGroundedBmbx(IssmDouble* pGbmb, bool scaled); Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 24048) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 24049) @@ -483,4 +483,5 @@ syn keyword cConstant CalvingrateyEnum syn keyword cConstant CalvingFluxLevelsetEnum +syn keyword cConstant CalvingMeltingFluxLevelsetEnum syn keyword cConstant ConvergedEnum syn keyword cConstant CrevasseDepthEnum @@ -1219,4 +1220,5 @@ syn keyword cConstant ThicknessErrorEstimatorEnum syn keyword cConstant TotalCalvingFluxLevelsetEnum +syn keyword cConstant TotalCalvingMeltingFluxLevelsetEnum syn keyword cConstant TotalFloatingBmbEnum syn keyword cConstant TotalFloatingBmbScaledEnum Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 24048) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 24049) @@ -479,4 +479,5 @@ CalvingrateyEnum, CalvingFluxLevelsetEnum, + CalvingMeltingFluxLevelsetEnum, ConvergedEnum, CrevasseDepthEnum, @@ -1217,4 +1218,5 @@ ThicknessErrorEstimatorEnum, TotalCalvingFluxLevelsetEnum, + TotalCalvingMeltingFluxLevelsetEnum, TotalFloatingBmbEnum, TotalFloatingBmbScaledEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 24048) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 24049) @@ -485,4 +485,5 @@ case CalvingrateyEnum : return "Calvingratey"; case CalvingFluxLevelsetEnum : return "CalvingFluxLevelset"; + case CalvingMeltingFluxLevelsetEnum : return "CalvingMeltingFluxLevelset"; case ConvergedEnum : return "Converged"; case CrevasseDepthEnum : return "CrevasseDepth"; @@ -1221,4 +1222,5 @@ case ThicknessErrorEstimatorEnum : return "ThicknessErrorEstimator"; case TotalCalvingFluxLevelsetEnum : return "TotalCalvingFluxLevelset"; + case TotalCalvingMeltingFluxLevelsetEnum : return "TotalCalvingMeltingFluxLevelset"; case TotalFloatingBmbEnum : return "TotalFloatingBmb"; case TotalFloatingBmbScaledEnum : return "TotalFloatingBmbScaled"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 24048) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 24049) @@ -494,4 +494,5 @@ else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum; else if (strcmp(name,"CalvingFluxLevelset")==0) return CalvingFluxLevelsetEnum; + else if (strcmp(name,"CalvingMeltingFluxLevelset")==0) return CalvingMeltingFluxLevelsetEnum; else if (strcmp(name,"Converged")==0) return ConvergedEnum; else if (strcmp(name,"CrevasseDepth")==0) return CrevasseDepthEnum; @@ -505,9 +506,9 @@ else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum; else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum; - else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; + if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; + else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; else if (strcmp(name,"DeviatoricStress1")==0) return DeviatoricStress1Enum; else if (strcmp(name,"DeviatoricStress2")==0) return DeviatoricStress2Enum; @@ -628,9 +629,9 @@ else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum; else if (strcmp(name,"Misfit")==0) return MisfitEnum; - else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"NewDamage")==0) return NewDamageEnum; + if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum; + else if (strcmp(name,"NewDamage")==0) return NewDamageEnum; else if (strcmp(name,"Node")==0) return NodeEnum; else if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum; @@ -751,9 +752,9 @@ else if (strcmp(name,"SmbVmean")==0) return SmbVmeanEnum; else if (strcmp(name,"SmbVz")==0) return SmbVzEnum; - else if (strcmp(name,"SmbW")==0) return SmbWEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"SmbWini")==0) return SmbWiniEnum; + if (strcmp(name,"SmbW")==0) return SmbWEnum; + else if (strcmp(name,"SmbWini")==0) return SmbWiniEnum; else if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum; else if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum; @@ -874,9 +875,9 @@ else if (strcmp(name,"Outputdefinition58")==0) return Outputdefinition58Enum; else if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum; - else if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum; else stage=8; } if(stage==8){ - if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum; + if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum; + else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum; else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum; else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum; @@ -997,9 +998,9 @@ else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum; else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; - else if (strcmp(name,"Element")==0) return ElementEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"ElementHook")==0) return ElementHookEnum; + if (strcmp(name,"Element")==0) return ElementEnum; + else if (strcmp(name,"ElementHook")==0) return ElementHookEnum; else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum; else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; @@ -1120,9 +1121,9 @@ else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum; else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum; - else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum; + if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum; + else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum; else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; else if (strcmp(name,"MaxVx")==0) return MaxVxEnum; @@ -1243,12 +1244,13 @@ else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum; else if (strcmp(name,"Tetra")==0) return TetraEnum; - else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; else stage=11; } if(stage==11){ - if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; + if (strcmp(name,"TetraInput")==0) return TetraInputEnum; + else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum; else if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum; + else if (strcmp(name,"TotalCalvingMeltingFluxLevelset")==0) return TotalCalvingMeltingFluxLevelsetEnum; else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum; else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;