Index: /issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp (revision 21343) +++ /issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp (revision 21344) @@ -73,4 +73,7 @@ parameters->AddObject(iomodel->CopyConstantObject("md.slr.tide_love_h",SealevelriseTidalLoveHEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.slr.tide_love_k",SealevelriseTidalLoveKEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.slr.fluid_love",SealevelriseFluidLoveEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.slr.equatorial_moi",SealevelriseEquatorialMoiEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.slr.polar_moi",SealevelrisePolarMoiEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.slr.angular_velocity",SealevelriseAngularVelocityEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.slr.ocean_area_scaling",SealevelriseOceanAreaScalingEnum)); Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 21343) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 21344) @@ -305,4 +305,5 @@ virtual IssmDouble OceanAverage(IssmDouble* Sg)=0; virtual IssmDouble OceanArea(void)=0; + virtual void SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea)=0; virtual void SealevelriseEustatic(Vector* pSgi,IssmDouble* peustatic,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea)=0; virtual void SealevelriseNonEustatic(Vector* pSgo,IssmDouble* Sg_old,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble eartharea)=0; Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 21343) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 21344) @@ -190,4 +190,5 @@ IssmDouble OceanArea(void){_error_("not implemented yet!");}; IssmDouble OceanAverage(IssmDouble* Sg){_error_("not implemented yet!");}; + void SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea){_error_("not implemented yet!");}; void SealevelriseEustatic(Vector* pSgi,IssmDouble* peustatic,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea){_error_("not implemented yet!");}; void SealevelriseNonEustatic(Vector* pSgo,IssmDouble* Sg_old,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble eartharea){_error_("not implemented yet!");}; Index: /issm/trunk-jpl/src/c/classes/Elements/Seg.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 21343) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 21344) @@ -173,4 +173,5 @@ #endif #ifdef _HAVE_SEALEVELRISE_ + void SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea){_error_("not implemented yet!");}; void SealevelriseEustatic(Vector* pSgi,IssmDouble* peustatic,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea){_error_("not implemented yet!");}; void SealevelriseNonEustatic(Vector* pSgo,IssmDouble* Sg_old,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble eartharea){_error_("not implemented yet!");}; Index: /issm/trunk-jpl/src/c/classes/Elements/Tetra.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tetra.h (revision 21343) +++ /issm/trunk-jpl/src/c/classes/Elements/Tetra.h (revision 21344) @@ -180,4 +180,5 @@ #endif #ifdef _HAVE_SEALEVELRISE_ + void SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea){_error_("not implemented yet!");}; void SealevelriseEustatic(Vector* pSgi,IssmDouble* peustatic,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea){_error_("not implemented yet!");}; void SealevelriseNonEustatic(Vector* pSgo,IssmDouble* Sg_old,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble eartharea){_error_("not implemented yet!");}; Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 21343) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 21344) @@ -3870,4 +3870,86 @@ } /*}}}*/ +void Tria::SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea){/*{{{*/ + + /*early return if we are not on an ice cap OR ocean:*/ + if(!(this->inputs->Max(MaskIceLevelsetEnum)<0) && !IsWaterInElement()) return; + + /*Compute area of element:*/ + IssmDouble area; + area=GetAreaSpherical(); + + /*Compute lat,long,radius of elemental centroid: */ + bool spherical=true; + IssmDouble llr_list[NUMVERTICES][3]; + IssmDouble late,longe,re; + /* Where is the centroid of this element?:{{{*/ + ::GetVerticesCoordinates(&llr_list[0][0],this->vertices,NUMVERTICES,spherical); + + IssmDouble minlong=400; + IssmDouble maxlong=-20; + for (int i=0;imaxlong)maxlong=llr_list[i][1]; + if(llr_list[i][1]180){ + if (llr_list[0][1]==0)llr_list[0][1]=360; + if (llr_list[1][1]==0)llr_list[1][1]=360; + if (llr_list[2][1]==0)llr_list[2][1]=360; + } + + // correction at the north pole + if(llr_list[0][0]==0)llr_list[0][1]=(llr_list[1][1]+llr_list[2][1])/2.0; + if(llr_list[1][0]==0)llr_list[1][1]=(llr_list[0][1]+llr_list[2][1])/2.0; + if(llr_list[2][0]==0)llr_list[2][1]=(llr_list[0][1]+llr_list[1][1])/2.0; + + //correction at the south pole + if(llr_list[0][0]==180)llr_list[0][1]=(llr_list[1][1]+llr_list[2][1])/2.0; + if(llr_list[1][0]==180)llr_list[1][1]=(llr_list[0][1]+llr_list[2][1])/2.0; + if(llr_list[2][0]==180)llr_list[2][1]=(llr_list[0][1]+llr_list[1][1])/2.0; + + late=(llr_list[0][0]+llr_list[1][0]+llr_list[2][0])/3.0; + longe=(llr_list[0][1]+llr_list[1][1]+llr_list[2][1])/3.0; + + late=90-late; + if(longe>180)longe=(longe-180)-180; + + late=late/180*PI; + longe=longe/180*PI; + /*}}}*/ + re=(llr_list[0][2]+llr_list[1][2]+llr_list[2][2])/3.0; + + if(IsWaterInElement()){ + IssmDouble rho_water, S; + + /*recover material parameters: */ + rho_water=matpar->GetMaterialParameter(MaterialsRhoFreshwaterEnum); + + /*From Sg_old, recover water sea level rise:*/ + S=0; for(int i=0;ivertices[i]->Sid()]/NUMVERTICES; + + dI_list[0] = -4*PI*(rho_water*S*area)*pow(re,4)*(sin(late)*cos(late)*cos(longe))/eartharea; + dI_list[1] = -4*PI*(rho_water*S*area)*pow(re,4)*(sin(late)*cos(late)*sin(longe))/eartharea; + dI_list[2] = +4*PI*(rho_water*S*area)*pow(re,4)*(1-pow(cos(late),2))/eartharea; + } + else if(this->inputs->Max(MaskIceLevelsetEnum)<0){ + IssmDouble rho_ice, I; + + /*recover material parameters: */ + rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum); + + /*Compute ice thickness change: */ + Input* deltathickness_input=inputs->GetInput(SealevelriseDeltathicknessEnum); + if (!deltathickness_input)_error_("delta thickness input needed to compute sea level rise!"); + deltathickness_input->GetInputAverage(&I); + + dI_list[0] = -4*PI*(rho_ice*I*area)*pow(re,4)*(sin(late)*cos(late)*cos(longe))/eartharea; + dI_list[1] = -4*PI*(rho_ice*I*area)*pow(re,4)*(sin(late)*cos(late)*sin(longe))/eartharea; + dI_list[2] = +4*PI*(rho_ice*I*area)*pow(re,4)*(1-pow(cos(late),2))/eartharea; + } + + return; +}/*}}}*/ void Tria::SealevelriseEustatic(Vector* pSgi,IssmDouble* peustatic,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea){ /*{{{*/ @@ -4026,5 +4108,5 @@ IssmDouble area; IssmDouble S; //change in water water level(Farrel and Clarke, Equ. 4) - IssmDouble late,longe,re; + IssmDouble late,longe; IssmDouble lati,longi,ri; IssmDouble minlong=400; @@ -4048,5 +4130,4 @@ bool computerigid = true; bool computeelastic= true; - bool computerotation= true; /*early return if we are not on the ocean:*/ @@ -4056,13 +4137,4 @@ this->parameters->FindParam(&computerigid,SealevelriseRigidEnum); this->parameters->FindParam(&computeelastic,SealevelriseElasticEnum); - this->parameters->FindParam(&computerotation,SealevelriseRotationEnum); - - /*recover some parameters for rotational feedback: */ - IssmDouble tide_love_h, tide_love_k, omega; - if(computerotation){ - this->parameters->FindParam(&tide_love_h,SealevelriseTidalLoveHEnum); - this->parameters->FindParam(&tide_love_k,SealevelriseTidalLoveKEnum); - this->parameters->FindParam(&omega,SealevelriseAngularVelocityEnum); - } /*early return if rigid or elastic not requested:*/ @@ -4134,12 +4206,4 @@ IssmDouble delPhi,delLambda; - /* if rotation, compute m1 m2 m3 from loading function */ - IssmDouble m1, m2, m3; - if(computerotation){ - m1=0; - m2=0; - m3=0; - } - for(int i=0;i(alpha/PI*(M-1)); G_elastic[i] += G_elastic_precomputed[index]; values[i]+=3*rho_water/rho_earth*area/eartharea*S*G_elastic[i]; - } - - /*Rotational feedback: */ - if(computerotation){ - values[i]+=(1+tide_love_k-tide_love_h/9.81)*0.5*pow((omega*radius[i]),2)*(-m3*(2+m3)*(1+3*cos(2*lati)) - + 2*pow(m2,2)*(pow(cos(lati),2) + 0.5*(-1 + 3*cos(2*longi)) * pow(sin(lati),2)) - + 2*pow(m1,2)*(pow(cos(lati),2) - 0.5*(1+3*cos(2*longi)) * pow(sin(lati),2)) - - m1*(1+m3)*cos(longi)*sin(2*lati) - - 2*m1*m2*cos(longi)*pow(sin(lati),2)*sin(longi) - - m2*(1+m3)*sin(2*lati)*sin(longi)); } } Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 21343) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 21344) @@ -151,4 +151,5 @@ IssmDouble OceanArea(void); IssmDouble OceanAverage(IssmDouble* Sg); + void SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea); void SealevelriseEustatic(Vector* pSgi,IssmDouble* peustatic,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea); void SealevelriseNonEustatic(Vector* pSgo,IssmDouble* Sg_old,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble eartharea); Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 21343) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 21344) @@ -2459,5 +2459,5 @@ /*Go through elements, and add contribution from each element to the deflection vector wg:*/ ns = elements->Size(); - + /*First, figure out the area of the ocean, which is needed to compute the eustatic component: */ for(int i=0;iGetAreaSpherical(); } + ISSM_MPI_Reduce (&eartharea_cpu,&eartharea,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() ); ISSM_MPI_Bcast(&eartharea,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); @@ -2475,16 +2476,88 @@ for(int i=0;i(elements->GetObjectByOffset(i)); - element->SealevelriseNonEustatic(pSgo, Sg_old,latitude,longitude,radius,eartharea); + element->SealevelriseNonEustatic(pSgo,Sg_old,latitude,longitude,radius,eartharea); } if(i%100==0)pSgo->Assemble(); } if(verboseconvolution)if(VerboseConvergence())_printf_("\n"); - + /*Free ressources:*/ xDelete(Sg_old); +} +/*}}}*/ +void FemModel::SealevelriseRotationalFeedback(Vector* pSgo_rot, Vector* pSg_old, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius){/*{{{*/ + + /*serialized vectors:*/ + IssmDouble* Sg_old=NULL; + IssmDouble eartharea=0; + IssmDouble eartharea_cpu=0; + IssmDouble tide_love_h, tide_love_k, fluid_love, moi_e, moi_p, omega, g; + IssmDouble load_love_k2 = -0.30922675; //degree 2 load Love number + IssmDouble m1, m2, m3; + IssmDouble lati, longi, value; + + /*Serialize vectors from previous iteration:*/ + Sg_old=pSg_old->ToMPISerial(); + + /*First, figure out the area of the ocean, which is needed to compute the eustatic component: */ + for(int i=0;iSize();i++){ + Element* element=xDynamicCast(elements->GetObjectByOffset(i)); + eartharea_cpu += element->GetAreaSpherical(); + } + ISSM_MPI_Reduce (&eartharea_cpu,&eartharea,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() ); + ISSM_MPI_Bcast(&eartharea,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); + + IssmDouble moi_list[3]={0,0,0}; + IssmDouble moi_list_cpu[3]={0,0,0}; + for(int i=0;iSize();i++){ + Element* element=xDynamicCast(elements->GetObjectByOffset(i)); + element->SealevelriseMomentOfInertia(&moi_list[0],Sg_old,eartharea); + moi_list_cpu[0] += moi_list[0]; + moi_list_cpu[1] += moi_list[1]; + moi_list_cpu[2] += moi_list[2]; + } + ISSM_MPI_Reduce (&moi_list_cpu[0],&moi_list[0],1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() ); + ISSM_MPI_Bcast(&moi_list[0],1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); + // + ISSM_MPI_Reduce (&moi_list_cpu[1],&moi_list[1],1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() ); + ISSM_MPI_Bcast(&moi_list[1],1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); + // + ISSM_MPI_Reduce (&moi_list_cpu[2],&moi_list[2],1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() ); + ISSM_MPI_Bcast(&moi_list[2],1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); + + /*pull out some useful parameters: */ + parameters->FindParam(&tide_love_h,SealevelriseTidalLoveHEnum); + parameters->FindParam(&tide_love_k,SealevelriseTidalLoveKEnum); + parameters->FindParam(&fluid_love,SealevelriseFluidLoveEnum); + parameters->FindParam(&moi_e,SealevelriseEquatorialMoiEnum); + parameters->FindParam(&moi_p,SealevelrisePolarMoiEnum); + parameters->FindParam(&omega,SealevelriseAngularVelocityEnum); + + /*compute perturbation terms for angular velocity vector: */ + m1 = 1/(1-tide_love_k/fluid_love) * (1+load_love_k2)/(moi_p-moi_e) * moi_list[0]; + m2 = 1/(1-tide_love_k/fluid_love) * (1+load_love_k2)/(moi_p-moi_e) * moi_list[1]; + m3 = -(1+load_love_k2)/moi_p * moi_list[2]; + + for(int i=0;iSize();i++){ + //Vertex* vertex=(Vertex*)vertices->GetObjectByOffset(i); + Vertex* vertex=xDynamicCast(vertices->GetObjectByOffset(i)); + + lati=latitude[i]/180*PI; longi=longitude[i]/180*PI; + + /*only first order terms are considered now: */ + value=((1.0+tide_love_k-tide_love_h)/9.81)*pow(omega*radius[i],2.0)* + (-m3/6.0 - m3*cos(2.0*lati)/2.0 - sin(lati)*cos(lati)*(m1*cos(longi)+m2*sin(longi))); + + pSgo_rot->SetValue(vertex->Sid(),value,INS_VAL); //INS_VAL ensures that you don't add several times + } + + /*Assemble mesh velocity*/ + pSgo_rot->Assemble(); + + /*Free ressources:*/ + xDelete(Sg_old); + } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/FemModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.h (revision 21343) +++ /issm/trunk-jpl/src/c/classes/FemModel.h (revision 21344) @@ -120,6 +120,8 @@ void SealevelriseEustatic(Vector* pSgi, IssmDouble* peustatic, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius); void SealevelriseNonEustatic(Vector* pSgo, Vector* pSg_old, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius,bool verboseconvolution); + void SealevelriseRotationalFeedback(Vector* pSgo_rot, Vector* pSg_old, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius); void SealevelriseGeodetic(Vector* pUp, Vector* pNorth, Vector* pEast, Vector* pSg_old, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius, IssmDouble* xx, IssmDouble* yy, IssmDouble* zz); IssmDouble SealevelriseOceanAverage(Vector* Sg); + IssmDouble SealevelriseRotationalFeedback(IssmDouble* moi_list); #endif void HydrologyEPLupdateDomainx(IssmDouble* pEplcount); Index: /issm/trunk-jpl/src/c/cores/sealevelrise_core_noneustatic.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/sealevelrise_core_noneustatic.cpp (revision 21343) +++ /issm/trunk-jpl/src/c/cores/sealevelrise_core_noneustatic.cpp (revision 21344) @@ -18,4 +18,5 @@ Vector *Sgo = NULL; //ocean convolution of the perturbation to gravity potential. + Vector *Sgo_rot= NULL; // rotational feedback IssmDouble Sgo_oceanaverage = 0; //average of Sgo over the ocean. @@ -27,4 +28,5 @@ bool spherical=true; bool converged=true; + bool rotation=true; bool verboseconvolution=true; int max_nonlinear_iterations; @@ -41,4 +43,7 @@ femmodel->parameters->FindParam(&eps_abs,SealevelriseAbstolEnum); femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); + + /*computational flag: */ + femmodel->parameters->FindParam(&rotation,SealevelriseRotationEnum); /*first, recover lat,long and radius vectors from vertices: */ @@ -75,4 +80,13 @@ Sgo->Assemble(); + if(rotation){ + /*call rotational feedback module: */ + Sgo_rot = new Vector(gsize); Sgo_rot->Assemble(); + femmodel->SealevelriseRotationalFeedback(Sgo_rot,Sg_old,latitude,longitude,radius); + Sgo_rot->Assemble(); + + Sgo->AXPY(Sgo_rot,1); + } + /*we need to average Sgo over the ocean: RHS term 5 in Eq.4 of Farrel and clarke. Only the elements can do that: */ Sgo_oceanaverage=femmodel->SealevelriseOceanAverage(Sgo); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 21343) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 21344) @@ -775,5 +775,8 @@ SealevelriseRotationEnum, SealevelriseTidalLoveHEnum, - SealevelriseTidalLoveKEnum, + SealevelriseTidalLoveKEnum, + SealevelriseFluidLoveEnum, + SealevelriseEquatorialMoiEnum, + SealevelrisePolarMoiEnum, SealevelriseAngularVelocityEnum, SealevelriseOceanAreaScalingEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 21343) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 21344) @@ -757,4 +757,7 @@ case SealevelriseTidalLoveHEnum : return "SealevelriseTidalLoveH"; case SealevelriseTidalLoveKEnum : return "SealevelriseTidalLoveK"; + case SealevelriseFluidLoveEnum : return "SealevelriseFluidLove"; + case SealevelriseEquatorialMoiEnum : return "SealevelriseEquatorialMoi"; + case SealevelrisePolarMoiEnum : return "SealevelrisePolarMoi"; case SealevelriseAngularVelocityEnum : return "SealevelriseAngularVelocity"; case SealevelriseOceanAreaScalingEnum : return "SealevelriseOceanAreaScaling"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 21343) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 21344) @@ -775,4 +775,7 @@ else if (strcmp(name,"SealevelriseTidalLoveH")==0) return SealevelriseTidalLoveHEnum; else if (strcmp(name,"SealevelriseTidalLoveK")==0) return SealevelriseTidalLoveKEnum; + else if (strcmp(name,"SealevelriseFluidLove")==0) return SealevelriseFluidLoveEnum; + else if (strcmp(name,"SealevelriseEquatorialMoi")==0) return SealevelriseEquatorialMoiEnum; + else if (strcmp(name,"SealevelrisePolarMoi")==0) return SealevelrisePolarMoiEnum; else if (strcmp(name,"SealevelriseAngularVelocity")==0) return SealevelriseAngularVelocityEnum; else if (strcmp(name,"SealevelriseOceanAreaScaling")==0) return SealevelriseOceanAreaScalingEnum; @@ -872,11 +875,11 @@ else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum; else if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum; - else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; - else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum; - else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum; + if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; + else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum; + else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum; + else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum; else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum; else if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum;