Index: ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 18746) +++ ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 18747) @@ -663,7 +663,7 @@ Input* active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); active_element_input->GetInputValue(&active_element); - basalelement->parameters->FindParam(&penalty_lock,HydrologydcPenaltyLockEnum); + basalelement->parameters->FindParam(&penalty_lock,HydrologydcEplflipLockEnum); basalelement-> GetInputListOnVertices(&old_active[0],HydrologydcMaskEplactiveNodeEnum); basalelement-> GetInputListOnVertices(&epl_thickness[0],HydrologydcEplThicknessEnum); Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18746) +++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18747) @@ -136,6 +136,7 @@ HydrologydcLeakageFactorEnum, HydrologydcPenaltyFactorEnum, HydrologydcPenaltyLockEnum, + HydrologydcEplflipLockEnum, HydrologydcBasalMoulinInputEnum, HydrologyLayerEnum, HydrologySedimentEnum, Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18746) +++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18747) @@ -144,6 +144,7 @@ case HydrologydcLeakageFactorEnum : return "HydrologydcLeakageFactor"; case HydrologydcPenaltyFactorEnum : return "HydrologydcPenaltyFactor"; case HydrologydcPenaltyLockEnum : return "HydrologydcPenaltyLock"; + case HydrologydcEplflipLockEnum : return "HydrologydcEplflipLock"; case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput"; case HydrologyLayerEnum : return "HydrologyLayer"; case HydrologySedimentEnum : return "HydrologySediment"; Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18746) +++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18747) @@ -147,6 +147,7 @@ else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum; else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum; else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum; + else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum; else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum; else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum; else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum; @@ -258,11 +259,11 @@ else if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum; else if (strcmp(name,"Domain3D")==0) return Domain3DEnum; else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum; - else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"MasstransportIscalvingrate")==0) return MasstransportIscalvingrateEnum; + if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum; + else if (strcmp(name,"MasstransportIscalvingrate")==0) return MasstransportIscalvingrateEnum; else if (strcmp(name,"MasstransportLevermannCalvingCoeff")==0) return MasstransportLevermannCalvingCoeffEnum; else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum; else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum; @@ -381,11 +382,11 @@ else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum; else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum; - else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum; + if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum; + else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum; else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum; else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum; else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum; @@ -504,11 +505,11 @@ else if (strcmp(name,"SegInput")==0) return SegInputEnum; else if (strcmp(name,"Tria")==0) return TriaEnum; else if (strcmp(name,"TriaInput")==0) return TriaInputEnum; - else if (strcmp(name,"Tetra")==0) return TetraEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"TetraInput")==0) return TetraInputEnum; + if (strcmp(name,"Tetra")==0) return TetraEnum; + else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; else if (strcmp(name,"Penta")==0) return PentaEnum; else if (strcmp(name,"PentaInput")==0) return PentaInputEnum; else if (strcmp(name,"Vertex")==0) return VertexEnum; @@ -627,11 +628,11 @@ else if (strcmp(name,"P1xP2")==0) return P1xP2Enum; else if (strcmp(name,"P1xP3")==0) return P1xP3Enum; else if (strcmp(name,"P2xP4")==0) return P2xP4Enum; - else if (strcmp(name,"P1P1")==0) return P1P1Enum; else stage=6; } if(stage==6){ - if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; + if (strcmp(name,"P1P1")==0) return P1P1Enum; + else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; else if (strcmp(name,"MINI")==0) return MINIEnum; else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum; else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum; @@ -750,11 +751,11 @@ else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum; else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum; else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum; - else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"Seaiceatm")==0) return SeaiceatmEnum; + if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum; + else if (strcmp(name,"Seaiceatm")==0) return SeaiceatmEnum; else if (strcmp(name,"Seaiceocean")==0) return SeaiceoceanEnum; else if (strcmp(name,"SeaiceThickness")==0) return SeaiceThicknessEnum; else if (strcmp(name,"SeaiceConcentration")==0) return SeaiceConcentrationEnum;