Index: /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14644) +++ /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14645) @@ -99,5 +99,4 @@ IndependentObjectEnum, InversionControlParametersEnum, - InversionCostFunctionEnum, InversionCostFunctionThresholdEnum, InversionCostFunctionsCoefficientsEnum, @@ -411,6 +410,4 @@ TemperatureOldEnum, TemperaturePicardEnum, - TemperatureSurfaceEnum, - TemperatureBasalEnum, ThicknessAbsMisfitEnum, TypeEnum, @@ -469,5 +466,4 @@ DoubleExternalResultEnum, DoubleMatExternalResultEnum, - DoubleVecExternalResultEnum, IntExternalResultEnum, JEnum, @@ -476,5 +472,4 @@ PatchVerticesEnum, PentaP1ElementResultEnum, - PetscVecExternalResultEnum, StringExternalResultEnum, StepEnum, @@ -508,5 +503,4 @@ SoftMigrationEnum, SubelementMigrationEnum, - GroundedPortionEnum, GLlevelsetEnum, /*}}}*/ Index: /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14644) +++ /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14645) @@ -104,5 +104,4 @@ case IndependentObjectEnum : return "IndependentObject"; case InversionControlParametersEnum : return "InversionControlParameters"; - case InversionCostFunctionEnum : return "InversionCostFunction"; case InversionCostFunctionThresholdEnum : return "InversionCostFunctionThreshold"; case InversionCostFunctionsCoefficientsEnum : return "InversionCostFunctionsCoefficients"; @@ -402,6 +401,4 @@ case TemperatureOldEnum : return "TemperatureOld"; case TemperaturePicardEnum : return "TemperaturePicard"; - case TemperatureSurfaceEnum : return "TemperatureSurface"; - case TemperatureBasalEnum : return "TemperatureBasal"; case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit"; case TypeEnum : return "Type"; @@ -456,5 +453,4 @@ case DoubleExternalResultEnum : return "DoubleExternalResult"; case DoubleMatExternalResultEnum : return "DoubleMatExternalResult"; - case DoubleVecExternalResultEnum : return "DoubleVecExternalResult"; case IntExternalResultEnum : return "IntExternalResult"; case JEnum : return "J"; @@ -463,5 +459,4 @@ case PatchVerticesEnum : return "PatchVertices"; case PentaP1ElementResultEnum : return "PentaP1ElementResult"; - case PetscVecExternalResultEnum : return "PetscVecExternalResult"; case StringExternalResultEnum : return "StringExternalResult"; case StepEnum : return "Step"; @@ -489,5 +484,4 @@ case SoftMigrationEnum : return "SoftMigration"; case SubelementMigrationEnum : return "SubelementMigration"; - case GroundedPortionEnum : return "GroundedPortion"; case GLlevelsetEnum : return "GLlevelset"; case StokesSolverEnum : return "StokesSolver"; Index: /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14644) +++ /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14645) @@ -105,5 +105,4 @@ else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum; else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum; - else if (strcmp(name,"InversionCostFunction")==0) return InversionCostFunctionEnum; else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum; else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum; @@ -138,9 +137,9 @@ else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum; else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum; + else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum; else stage=2; } if(stage==2){ - if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum; - else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; + if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; else if (strcmp(name,"MaterialsRheologyZ")==0) return MaterialsRheologyZEnum; @@ -261,9 +260,9 @@ else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum; else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum; + else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum; - else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; + if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum; else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum; @@ -384,9 +383,9 @@ else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; else if (strcmp(name,"Misfit")==0) return MisfitEnum; + else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum; - else if (strcmp(name,"Pressure")==0) return PressureEnum; + if (strcmp(name,"Pressure")==0) return PressureEnum; else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum; @@ -412,6 +411,4 @@ else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum; else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; - else if (strcmp(name,"TemperatureSurface")==0) return TemperatureSurfaceEnum; - else if (strcmp(name,"TemperatureBasal")==0) return TemperatureBasalEnum; else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; else if (strcmp(name,"Type")==0) return TypeEnum; @@ -466,5 +463,4 @@ else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum; else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; - else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum; else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; else if (strcmp(name,"J")==0) return JEnum; @@ -473,5 +469,4 @@ else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum; else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; - else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum; else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; else if (strcmp(name,"Step")==0) return StepEnum; @@ -499,5 +494,4 @@ else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum; else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum; - else if (strcmp(name,"GroundedPortion")==0) return GroundedPortionEnum; else if (strcmp(name,"GLlevelset")==0) return GLlevelsetEnum; else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum; @@ -507,8 +501,5 @@ else if (strcmp(name,"Fset")==0) return FsetEnum; else if (strcmp(name,"Gradient1")==0) return Gradient1Enum; - else stage=5; - } - if(stage==5){ - if (strcmp(name,"Gradient2")==0) return Gradient2Enum; + else if (strcmp(name,"Gradient2")==0) return Gradient2Enum; else if (strcmp(name,"Gradient3")==0) return Gradient3Enum; else if (strcmp(name,"Gradient")==0) return GradientEnum; @@ -516,5 +507,8 @@ else if (strcmp(name,"Gset")==0) return GsetEnum; else if (strcmp(name,"Index")==0) return IndexEnum; - else if (strcmp(name,"Indexed")==0) return IndexedEnum; + else stage=5; + } + if(stage==5){ + if (strcmp(name,"Indexed")==0) return IndexedEnum; else if (strcmp(name,"Intersect")==0) return IntersectEnum; else if (strcmp(name,"Nodal")==0) return NodalEnum;