Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 24044) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 24045) @@ -109,5 +109,5 @@ break; case BasalforcingsIsmip6Enum: - iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmp6BasinIdEnum); + iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmip6BasinIdEnum); break; default: Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 24044) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 24045) @@ -180,6 +180,6 @@ break; case BasalforcingsIsmip6Enum:{ - iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmp6BasinIdEnum); - iomodel->FetchDataToInput(elements,"md.basalforcings.melt_anomaly",BasalforcingsIsmp6MeltAnomalyEnum,0.); + iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmip6BasinIdEnum); + iomodel->FetchDataToInput(elements,"md.basalforcings.melt_anomaly",BasalforcingsIsmip6MeltAnomalyEnum,0.); IssmDouble** array3d = NULL; int* Ms = NULL; int* Ns = NULL; int K; iomodel->FetchData(&array3d,&Ms,&Ns,&K,"md.basalforcings.tf"); @@ -189,5 +189,5 @@ if(iomodel->domaintype!=Domain2DhorizontalEnum && !element->IsOnBase()) continue; for(int kk=0;kkDatasetInputAdd(BasalforcingsIsmp6TfEnum,array3d[kk],iomodel,Ms[kk],Ns[kk],1,BasalforcingsIsmp6TfEnum,7,kk); + element->DatasetInputAdd(BasalforcingsIsmip6TfEnum,array3d[kk],iomodel,Ms[kk],Ns[kk],1,BasalforcingsIsmip6TfEnum,7,kk); } } Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 24044) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 24045) @@ -784,5 +784,5 @@ break; case BasalforcingsIsmip6Enum: - iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmp6BasinIdEnum); + iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmip6BasinIdEnum); break; default: Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 24044) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 24045) @@ -136,5 +136,5 @@ break; case BasalforcingsIsmip6Enum: - iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmp6BasinIdEnum); + iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmip6BasinIdEnum); break; Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 24044) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 24045) @@ -2195,14 +2195,14 @@ /* Get parameters and inputs */ - this->inputs->GetInputValue(&basinid,BasalforcingsIsmp6BasinIdEnum); - this->parameters->FindParam(&num_basins,BasalforcingsIsmp6NumBasinsEnum); - this->parameters->FindParam(&gamma0,BasalforcingsIsmp6Gamma0Enum); - this->parameters->FindParam(&delta_t,&M,BasalforcingsIsmp6DeltaTEnum); _assert_(M==num_basins); - this->parameters->FindParam(&islocal,BasalforcingsIsmp6IsLocalEnum); + this->inputs->GetInputValue(&basinid,BasalforcingsIsmip6BasinIdEnum); + this->parameters->FindParam(&num_basins,BasalforcingsIsmip6NumBasinsEnum); + this->parameters->FindParam(&gamma0,BasalforcingsIsmip6Gamma0Enum); + this->parameters->FindParam(&delta_t,&M,BasalforcingsIsmip6DeltaTEnum); _assert_(M==num_basins); + this->parameters->FindParam(&islocal,BasalforcingsIsmip6IsLocalEnum); if(!islocal) { - this->parameters->FindParam(&mean_tf,&N,BasalforcingsIsmp6AverageTfEnum); _assert_(N==num_basins); - } - Input* tf_input = this->GetInput(BasalforcingsIsmp6TfShelfEnum); _assert_(tf_input); - Input* meltanomaly_input = this->GetInput(BasalforcingsIsmp6MeltAnomalyEnum); _assert_(meltanomaly_input); + this->parameters->FindParam(&mean_tf,&N,BasalforcingsIsmip6AverageTfEnum); _assert_(N==num_basins); + } + Input* tf_input = this->GetInput(BasalforcingsIsmip6TfShelfEnum); _assert_(tf_input); + Input* meltanomaly_input = this->GetInput(BasalforcingsIsmip6MeltAnomalyEnum); _assert_(meltanomaly_input); delta_t_basin = delta_t[basinid]; if(!islocal) mean_tf_basin = mean_tf[basinid]; Index: /issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (revision 24044) +++ /issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (revision 24045) @@ -78,7 +78,7 @@ IssmDouble* tf_depths = NULL; - femmodel->parameters->FindParam(&num_basins,BasalforcingsIsmp6NumBasinsEnum); - femmodel->parameters->FindParam(&tf_depths,&num_depths,BasalforcingsIsmp6TfDepthsEnum); _assert_(tf_depths); - femmodel->parameters->FindParam(&islocal,BasalforcingsIsmp6IsLocalEnum); + femmodel->parameters->FindParam(&num_basins,BasalforcingsIsmip6NumBasinsEnum); + femmodel->parameters->FindParam(&tf_depths,&num_depths,BasalforcingsIsmip6TfDepthsEnum); _assert_(tf_depths); + femmodel->parameters->FindParam(&islocal,BasalforcingsIsmip6IsLocalEnum); /*Binary search works for vectors that are sorted in increasing order only, make depths positive*/ @@ -99,5 +99,5 @@ IssmDouble* values = xNewZeroInit(numvertices); element->AddInput(BasalforcingsFloatingiceMeltingRateEnum,values,P1Enum); - element->AddInput(BasalforcingsIsmp6TfShelfEnum,values,P1Enum); + element->AddInput(BasalforcingsIsmip6TfShelfEnum,values,P1Enum); xDelete(values); continue; @@ -107,5 +107,5 @@ IssmDouble* tf_test = xNew(numvertices); IssmDouble* depth_vertices = xNew(numvertices); - Input* tf_input = element->GetInput(BasalforcingsIsmp6TfEnum); _assert_(tf_input); + Input* tf_input = element->GetInput(BasalforcingsIsmip6TfEnum); _assert_(tf_input); element->GetInputListOnVertices(&depth_vertices[0],BaseEnum); @@ -144,5 +144,5 @@ } - element->AddInput(BasalforcingsIsmp6TfShelfEnum,tf_test,P1Enum); + element->AddInput(BasalforcingsIsmip6TfShelfEnum,tf_test,P1Enum); xDelete(tf_test); xDelete(depth_vertices); @@ -157,6 +157,6 @@ /*Spawn basal element if on base to compute element area*/ Element* basalelement = element->SpawnBasalElement(); - Input* tf_input=basalelement->GetInput(BasalforcingsIsmp6TfShelfEnum); _assert_(tf_input); - basalelement->inputs->GetInputValue(&basinid,BasalforcingsIsmp6BasinIdEnum); + Input* tf_input=basalelement->GetInput(BasalforcingsIsmip6TfShelfEnum); _assert_(tf_input); + basalelement->inputs->GetInputValue(&basinid,BasalforcingsIsmip6BasinIdEnum); Gauss* gauss=basalelement->NewGauss(1); gauss->GaussPoint(0); tf_input->GetInputValue(&tf,gauss); @@ -176,5 +176,5 @@ /*Compute weighted means and save*/ for(int k=0;kparameters->AddObject(new DoubleVecParam(BasalforcingsIsmp6AverageTfEnum,tf_weighted_avg_cpu,num_basins)); + femmodel->parameters->AddObject(new DoubleVecParam(BasalforcingsIsmip6AverageTfEnum,tf_weighted_avg_cpu,num_basins)); } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 24044) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 24045) @@ -236,12 +236,12 @@ break; case BasalforcingsIsmip6Enum: - parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.num_basins",BasalforcingsIsmp6NumBasinsEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.gamma_0",BasalforcingsIsmp6Gamma0Enum)); - parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.islocal",BasalforcingsIsmp6IsLocalEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.num_basins",BasalforcingsIsmip6NumBasinsEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.gamma_0",BasalforcingsIsmip6Gamma0Enum)); + parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.islocal",BasalforcingsIsmip6IsLocalEnum)); iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.delta_t"); - parameters->AddObject(new DoubleVecParam(BasalforcingsIsmp6DeltaTEnum,transparam,N)); + parameters->AddObject(new DoubleVecParam(BasalforcingsIsmip6DeltaTEnum,transparam,N)); xDelete(transparam); iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.tf_depths"); - parameters->AddObject(new DoubleVecParam(BasalforcingsIsmp6TfDepthsEnum,transparam,N)); + parameters->AddObject(new DoubleVecParam(BasalforcingsIsmip6TfDepthsEnum,transparam,N)); xDelete(transparam); break; Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 24044) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 24045) @@ -69,11 +69,11 @@ syn keyword cConstant BasalforcingsDtbgEnum syn keyword cConstant BasalforcingsEnum -syn keyword cConstant BasalforcingsIsmp6AverageTfEnum -syn keyword cConstant BasalforcingsIsmp6BasinAreaEnum -syn keyword cConstant BasalforcingsIsmp6DeltaTEnum -syn keyword cConstant BasalforcingsIsmp6Gamma0Enum -syn keyword cConstant BasalforcingsIsmp6IsLocalEnum -syn keyword cConstant BasalforcingsIsmp6NumBasinsEnum -syn keyword cConstant BasalforcingsIsmp6TfDepthsEnum +syn keyword cConstant BasalforcingsIsmip6AverageTfEnum +syn keyword cConstant BasalforcingsIsmip6BasinAreaEnum +syn keyword cConstant BasalforcingsIsmip6DeltaTEnum +syn keyword cConstant BasalforcingsIsmip6Gamma0Enum +syn keyword cConstant BasalforcingsIsmip6IsLocalEnum +syn keyword cConstant BasalforcingsIsmip6NumBasinsEnum +syn keyword cConstant BasalforcingsIsmip6TfDepthsEnum syn keyword cConstant BasalforcingsLowercrustheatEnum syn keyword cConstant BasalforcingsMantleconductivityEnum @@ -454,8 +454,8 @@ syn keyword cConstant BasalforcingsGeothermalfluxEnum syn keyword cConstant BasalforcingsGroundediceMeltingRateEnum -syn keyword cConstant BasalforcingsIsmp6BasinIdEnum -syn keyword cConstant BasalforcingsIsmp6TfEnum -syn keyword cConstant BasalforcingsIsmp6TfShelfEnum -syn keyword cConstant BasalforcingsIsmp6MeltAnomalyEnum +syn keyword cConstant BasalforcingsIsmip6BasinIdEnum +syn keyword cConstant BasalforcingsIsmip6TfEnum +syn keyword cConstant BasalforcingsIsmip6TfShelfEnum +syn keyword cConstant BasalforcingsIsmip6MeltAnomalyEnum syn keyword cConstant BasalforcingsPicoBasinIdEnum syn keyword cConstant BasalforcingsPicoBoxIdEnum Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 24044) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 24045) @@ -63,11 +63,11 @@ BasalforcingsDtbgEnum, BasalforcingsEnum, - BasalforcingsIsmp6AverageTfEnum, - BasalforcingsIsmp6BasinAreaEnum, - BasalforcingsIsmp6DeltaTEnum, - BasalforcingsIsmp6Gamma0Enum, - BasalforcingsIsmp6IsLocalEnum, - BasalforcingsIsmp6NumBasinsEnum, - BasalforcingsIsmp6TfDepthsEnum, + BasalforcingsIsmip6AverageTfEnum, + BasalforcingsIsmip6BasinAreaEnum, + BasalforcingsIsmip6DeltaTEnum, + BasalforcingsIsmip6Gamma0Enum, + BasalforcingsIsmip6IsLocalEnum, + BasalforcingsIsmip6NumBasinsEnum, + BasalforcingsIsmip6TfDepthsEnum, BasalforcingsLowercrustheatEnum, BasalforcingsMantleconductivityEnum, @@ -450,8 +450,8 @@ BasalforcingsGeothermalfluxEnum, BasalforcingsGroundediceMeltingRateEnum, - BasalforcingsIsmp6BasinIdEnum, - BasalforcingsIsmp6TfEnum, - BasalforcingsIsmp6TfShelfEnum, - BasalforcingsIsmp6MeltAnomalyEnum, + BasalforcingsIsmip6BasinIdEnum, + BasalforcingsIsmip6TfEnum, + BasalforcingsIsmip6TfShelfEnum, + BasalforcingsIsmip6MeltAnomalyEnum, BasalforcingsPicoBasinIdEnum, BasalforcingsPicoBoxIdEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 24044) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 24045) @@ -71,11 +71,11 @@ case BasalforcingsDtbgEnum : return "BasalforcingsDtbg"; case BasalforcingsEnum : return "Basalforcings"; - case BasalforcingsIsmp6AverageTfEnum : return "BasalforcingsIsmp6AverageTf"; - case BasalforcingsIsmp6BasinAreaEnum : return "BasalforcingsIsmp6BasinArea"; - case BasalforcingsIsmp6DeltaTEnum : return "BasalforcingsIsmp6DeltaT"; - case BasalforcingsIsmp6Gamma0Enum : return "BasalforcingsIsmp6Gamma0"; - case BasalforcingsIsmp6IsLocalEnum : return "BasalforcingsIsmp6IsLocal"; - case BasalforcingsIsmp6NumBasinsEnum : return "BasalforcingsIsmp6NumBasins"; - case BasalforcingsIsmp6TfDepthsEnum : return "BasalforcingsIsmp6TfDepths"; + case BasalforcingsIsmip6AverageTfEnum : return "BasalforcingsIsmip6AverageTf"; + case BasalforcingsIsmip6BasinAreaEnum : return "BasalforcingsIsmip6BasinArea"; + case BasalforcingsIsmip6DeltaTEnum : return "BasalforcingsIsmip6DeltaT"; + case BasalforcingsIsmip6Gamma0Enum : return "BasalforcingsIsmip6Gamma0"; + case BasalforcingsIsmip6IsLocalEnum : return "BasalforcingsIsmip6IsLocal"; + case BasalforcingsIsmip6NumBasinsEnum : return "BasalforcingsIsmip6NumBasins"; + case BasalforcingsIsmip6TfDepthsEnum : return "BasalforcingsIsmip6TfDepths"; case BasalforcingsLowercrustheatEnum : return "BasalforcingsLowercrustheat"; case BasalforcingsMantleconductivityEnum : return "BasalforcingsMantleconductivity"; @@ -456,8 +456,8 @@ case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux"; case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate"; - case BasalforcingsIsmp6BasinIdEnum : return "BasalforcingsIsmp6BasinId"; - case BasalforcingsIsmp6TfEnum : return "BasalforcingsIsmp6Tf"; - case BasalforcingsIsmp6TfShelfEnum : return "BasalforcingsIsmp6TfShelf"; - case BasalforcingsIsmp6MeltAnomalyEnum : return "BasalforcingsIsmp6MeltAnomaly"; + case BasalforcingsIsmip6BasinIdEnum : return "BasalforcingsIsmip6BasinId"; + case BasalforcingsIsmip6TfEnum : return "BasalforcingsIsmip6Tf"; + case BasalforcingsIsmip6TfShelfEnum : return "BasalforcingsIsmip6TfShelf"; + case BasalforcingsIsmip6MeltAnomalyEnum : return "BasalforcingsIsmip6MeltAnomaly"; case BasalforcingsPicoBasinIdEnum : return "BasalforcingsPicoBasinId"; case BasalforcingsPicoBoxIdEnum : return "BasalforcingsPicoBoxId"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 24044) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 24045) @@ -71,11 +71,11 @@ else if (strcmp(name,"BasalforcingsDtbg")==0) return BasalforcingsDtbgEnum; else if (strcmp(name,"Basalforcings")==0) return BasalforcingsEnum; - else if (strcmp(name,"BasalforcingsIsmp6AverageTf")==0) return BasalforcingsIsmp6AverageTfEnum; - else if (strcmp(name,"BasalforcingsIsmp6BasinArea")==0) return BasalforcingsIsmp6BasinAreaEnum; - else if (strcmp(name,"BasalforcingsIsmp6DeltaT")==0) return BasalforcingsIsmp6DeltaTEnum; - else if (strcmp(name,"BasalforcingsIsmp6Gamma0")==0) return BasalforcingsIsmp6Gamma0Enum; - else if (strcmp(name,"BasalforcingsIsmp6IsLocal")==0) return BasalforcingsIsmp6IsLocalEnum; - else if (strcmp(name,"BasalforcingsIsmp6NumBasins")==0) return BasalforcingsIsmp6NumBasinsEnum; - else if (strcmp(name,"BasalforcingsIsmp6TfDepths")==0) return BasalforcingsIsmp6TfDepthsEnum; + else if (strcmp(name,"BasalforcingsIsmip6AverageTf")==0) return BasalforcingsIsmip6AverageTfEnum; + else if (strcmp(name,"BasalforcingsIsmip6BasinArea")==0) return BasalforcingsIsmip6BasinAreaEnum; + else if (strcmp(name,"BasalforcingsIsmip6DeltaT")==0) return BasalforcingsIsmip6DeltaTEnum; + else if (strcmp(name,"BasalforcingsIsmip6Gamma0")==0) return BasalforcingsIsmip6Gamma0Enum; + else if (strcmp(name,"BasalforcingsIsmip6IsLocal")==0) return BasalforcingsIsmip6IsLocalEnum; + else if (strcmp(name,"BasalforcingsIsmip6NumBasins")==0) return BasalforcingsIsmip6NumBasinsEnum; + else if (strcmp(name,"BasalforcingsIsmip6TfDepths")==0) return BasalforcingsIsmip6TfDepthsEnum; else if (strcmp(name,"BasalforcingsLowercrustheat")==0) return BasalforcingsLowercrustheatEnum; else if (strcmp(name,"BasalforcingsMantleconductivity")==0) return BasalforcingsMantleconductivityEnum; @@ -465,8 +465,8 @@ else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum; - else if (strcmp(name,"BasalforcingsIsmp6BasinId")==0) return BasalforcingsIsmp6BasinIdEnum; - else if (strcmp(name,"BasalforcingsIsmp6Tf")==0) return BasalforcingsIsmp6TfEnum; - else if (strcmp(name,"BasalforcingsIsmp6TfShelf")==0) return BasalforcingsIsmp6TfShelfEnum; - else if (strcmp(name,"BasalforcingsIsmp6MeltAnomaly")==0) return BasalforcingsIsmp6MeltAnomalyEnum; + else if (strcmp(name,"BasalforcingsIsmip6BasinId")==0) return BasalforcingsIsmip6BasinIdEnum; + else if (strcmp(name,"BasalforcingsIsmip6Tf")==0) return BasalforcingsIsmip6TfEnum; + else if (strcmp(name,"BasalforcingsIsmip6TfShelf")==0) return BasalforcingsIsmip6TfShelfEnum; + else if (strcmp(name,"BasalforcingsIsmip6MeltAnomaly")==0) return BasalforcingsIsmip6MeltAnomalyEnum; else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum; else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum; @@ -506,9 +506,9 @@ else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; - else if (strcmp(name,"DeviatoricStress1")==0) return DeviatoricStress1Enum; else stage=5; } if(stage==5){ - if (strcmp(name,"DeviatoricStress2")==0) return DeviatoricStress2Enum; + if (strcmp(name,"DeviatoricStress1")==0) return DeviatoricStress1Enum; + else if (strcmp(name,"DeviatoricStress2")==0) return DeviatoricStress2Enum; else if (strcmp(name,"DistanceToCalvingfront")==0) return DistanceToCalvingfrontEnum; else if (strcmp(name,"DistanceToGroundingline")==0) return DistanceToGroundinglineEnum; @@ -629,9 +629,9 @@ else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum; else if (strcmp(name,"NewDamage")==0) return NewDamageEnum; - else if (strcmp(name,"Node")==0) return NodeEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum; + if (strcmp(name,"Node")==0) return NodeEnum; + else if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum; else if (strcmp(name,"P0")==0) return P0Enum; else if (strcmp(name,"P1")==0) return P1Enum; @@ -752,9 +752,9 @@ else if (strcmp(name,"SmbW")==0) return SmbWEnum; else if (strcmp(name,"SmbWini")==0) return SmbWiniEnum; - else if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum; + if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum; + else if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum; else if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum; else if (strcmp(name,"SmbZY")==0) return SmbZYEnum; @@ -875,9 +875,9 @@ else if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum; else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum; - else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum; else stage=8; } if(stage==8){ - if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum; + if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum; + else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum; else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum; else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum; @@ -998,9 +998,9 @@ else if (strcmp(name,"Element")==0) return ElementEnum; else if (strcmp(name,"ElementHook")==0) return ElementHookEnum; - else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; + if (strcmp(name,"ElementSId")==0) return ElementSIdEnum; + else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum; else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum; @@ -1121,9 +1121,9 @@ else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum; else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum; - else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"MaxVx")==0) return MaxVxEnum; + if (strcmp(name,"MaxVel")==0) return MaxVelEnum; + else if (strcmp(name,"MaxVx")==0) return MaxVxEnum; else if (strcmp(name,"MaxVy")==0) return MaxVyEnum; else if (strcmp(name,"MaxVz")==0) return MaxVzEnum; @@ -1244,9 +1244,9 @@ else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; - else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; else stage=11; } if(stage==11){ - if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum; + 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,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;