Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 8941) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 8942) @@ -132,6 +132,6 @@ PentaVertexInputEnum, TriaVertexInputEnum, - TriaVertexForcingEnum, //TO BE DELETED (not used anymore) - PentaVertexForcingEnum, //TO BE DELETED (not used anymore) + Fake0Enum, + Fake1Enum, ControlInputEnum, /*Params: */ @@ -184,10 +184,10 @@ CmResponseEnum, CmResponsesEnum, - CmNoiseDmpEnum, //TO BE DELETED (not used anymore) + Fake2Enum, ConstantEnum, NumControlsEnum, ControlTypeEnum, ConvergedEnum, - DhDtEnum, //TO BE DELETED + Fake3Enum, DragCoefficientEnum, DragPEnum, @@ -201,9 +201,9 @@ ElementOnSurfaceEnum, ElementOnWaterEnum, - EpsVelEnum, //TO BE DELETED + Fake4Enum, FillEnum, FractionIncrementEnum, FrictionEnum, - GeothermalFluxEnum, //TO BE DELETED + Fake5Enum, HydrostaticAdjustmentEnum, InternalEnum, @@ -219,5 +219,5 @@ SurfaceAverageVelMisfitEnum, MaxPenetrationEnum, - MeanVelEnum, //TO BE DELETED + Fake6Enum, MeltingOffsetEnum, GroundingLineMeltingRateEnum, @@ -242,5 +242,5 @@ ShelfDampeningEnum, StabilizeConstraintsEnum, - StokesReconditioningEnum, //TO BE DELETED + Fake7Enum, SurfaceAccumulationRateEnum, SurfaceAblationRateEnum, @@ -304,5 +304,5 @@ TimeEnum, OutputFrequencyEnum, - WaterColumnEnum, //TO BE DELETED + Fake8Enum, WaterColumnOldEnum, WaterColumnPicardEnum, @@ -339,5 +339,5 @@ RhoWaterEnum, GravityEnum, - ThermalConductivityEnum, //TO BE DELETED + Fake9Enum, BasalMeltingRateCorrectionEnum, BasalMeltingRateCorrectionApplyEnum, @@ -371,17 +371,17 @@ EpsRelEnum, EpsResEnum, - HeatCapacityEnum, //TO BE DELETED - IsHutterEnum, //TO BE DELETED - IsMacAyealPattynEnum, //TO BE DELETED - IsStokesEnum, //TO BE DELETED - KffEnum, //TO BE DELETED - LatentHeatEnum, //TO BE DELETED + Fake10Enum, + IsHutterEnum, + Fake11Enum, + Fake12Enum, + Fake13Enum, + Fake14Enum, LowmemEnum, - MaxIterEnum, //TO BE DELETED + Fake16Enum, MaxNonlinearIterationsEnum, - MeltingPointEnum, //TO BE DELETED + Fake17Enum, MinMechanicalConstraintsEnum, MinThermalConstraintsEnum, - NStepsEnum, //TO BE DELETED + Fake18Enum, NdtEnum, NumOutputEnum, @@ -390,8 +390,8 @@ NumberOfNodesEnum, NumberOfVerticesEnum, - OptScalEnum, //TO BE DELETED + Fake19Enum, OutputFilePointerEnum, - OutputFileNameEnum, //TO BE DELETED - ParameterOutputEnum, //TO BE DELETED + Fake20Enum, + Fake21Enum, PenaltyMeltingEnum, QmuAnalysisEnum, @@ -404,5 +404,4 @@ QmuNumberOfResponsesEnum, QmuSaveFemmodelEnum, - PartEnum, IndexedEnum, RegularEnum, @@ -413,8 +412,8 @@ PetscRcEnum, SparsityEnum, - TolXEnum, //TO BE DELETED + Fake22Enum, VariabledescriptorsEnum, VerboseEnum, - WaitOnLockEnum, //TO BE DELETED + Fake23Enum, PetscOptionsStringsEnum, PetscOptionsAnalysesEnum, @@ -446,13 +445,13 @@ VyMeshEnum, VzMeshEnum, - IsDiagnosticEnum, //TO BE DELETED - IsPrognosticEnum, //TO BE DELETED - IsThermalEnum, //TO BE DELETED + Fake24Enum, + Fake25Enum, + Fake26Enum, EnthalpySolutionEnum, EnthalpyAnalysisEnum, EnthalpyEnum, EnthalpyPicardEnum, - WaterFractionEnum, //TO BE DELETED - ReferenceTemperatureEnum, //TO BE DELETED + Fake27Enum, + Fake28Enum, ThicknessAbsGradientEnum, VelAbsGradientEnum, @@ -540,5 +539,6 @@ NumberOfResponsesEnum, NpartEnum, - QmuMassFluxNumProfilesEnum + QmuMassFluxNumProfilesEnum, + PartEnum }; Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 8941) +++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 8942) @@ -111,6 +111,6 @@ case PentaVertexInputEnum : return "PentaVertexInput"; case TriaVertexInputEnum : return "TriaVertexInput"; - case TriaVertexForcingEnum : return "TriaVertexForcing"; - case PentaVertexForcingEnum : return "PentaVertexForcing"; + case Fake0Enum : return "Fake0"; + case Fake1Enum : return "Fake1"; case ControlInputEnum : return "ControlInput"; case ParamEnum : return "Param"; @@ -152,10 +152,10 @@ case CmResponseEnum : return "CmResponse"; case CmResponsesEnum : return "CmResponses"; - case CmNoiseDmpEnum : return "CmNoiseDmp"; + case Fake2Enum : return "Fake2"; case ConstantEnum : return "Constant"; case NumControlsEnum : return "NumControls"; case ControlTypeEnum : return "ControlType"; case ConvergedEnum : return "Converged"; - case DhDtEnum : return "DhDt"; + case Fake3Enum : return "Fake3"; case DragCoefficientEnum : return "DragCoefficient"; case DragPEnum : return "DragP"; @@ -169,9 +169,9 @@ case ElementOnSurfaceEnum : return "ElementOnSurface"; case ElementOnWaterEnum : return "ElementOnWater"; - case EpsVelEnum : return "EpsVel"; + case Fake4Enum : return "Fake4"; case FillEnum : return "Fill"; case FractionIncrementEnum : return "FractionIncrement"; case FrictionEnum : return "Friction"; - case GeothermalFluxEnum : return "GeothermalFlux"; + case Fake5Enum : return "Fake5"; case HydrostaticAdjustmentEnum : return "HydrostaticAdjustment"; case InternalEnum : return "Internal"; @@ -187,5 +187,5 @@ case SurfaceAverageVelMisfitEnum : return "SurfaceAverageVelMisfit"; case MaxPenetrationEnum : return "MaxPenetration"; - case MeanVelEnum : return "MeanVel"; + case Fake6Enum : return "Fake6"; case MeltingOffsetEnum : return "MeltingOffset"; case GroundingLineMeltingRateEnum : return "GroundingLineMeltingRate"; @@ -210,5 +210,5 @@ case ShelfDampeningEnum : return "ShelfDampening"; case StabilizeConstraintsEnum : return "StabilizeConstraints"; - case StokesReconditioningEnum : return "StokesReconditioning"; + case Fake7Enum : return "Fake7"; case SurfaceAccumulationRateEnum : return "SurfaceAccumulationRate"; case SurfaceAblationRateEnum : return "SurfaceAblationRate"; @@ -268,5 +268,5 @@ case TimeEnum : return "Time"; case OutputFrequencyEnum : return "OutputFrequency"; - case WaterColumnEnum : return "WaterColumn"; + case Fake8Enum : return "Fake8"; case WaterColumnOldEnum : return "WaterColumnOld"; case WaterColumnPicardEnum : return "WaterColumnPicard"; @@ -293,5 +293,5 @@ case RhoWaterEnum : return "RhoWater"; case GravityEnum : return "Gravity"; - case ThermalConductivityEnum : return "ThermalConductivity"; + case Fake9Enum : return "Fake9"; case BasalMeltingRateCorrectionEnum : return "BasalMeltingRateCorrection"; case BasalMeltingRateCorrectionApplyEnum : return "BasalMeltingRateCorrectionApply"; @@ -321,17 +321,17 @@ case EpsRelEnum : return "EpsRel"; case EpsResEnum : return "EpsRes"; - case HeatCapacityEnum : return "HeatCapacity"; + case Fake10Enum : return "Fake10"; case IsHutterEnum : return "IsHutter"; - case IsMacAyealPattynEnum : return "IsMacAyealPattyn"; - case IsStokesEnum : return "IsStokes"; - case KffEnum : return "Kff"; - case LatentHeatEnum : return "LatentHeat"; + case Fake11Enum : return "Fake11"; + case Fake12Enum : return "Fake12"; + case Fake13Enum : return "Fake13"; + case Fake14Enum : return "Fake14"; case LowmemEnum : return "Lowmem"; - case MaxIterEnum : return "MaxIter"; + case Fake16Enum : return "Fake16"; case MaxNonlinearIterationsEnum : return "MaxNonlinearIterations"; - case MeltingPointEnum : return "MeltingPoint"; + case Fake17Enum : return "Fake17"; case MinMechanicalConstraintsEnum : return "MinMechanicalConstraints"; case MinThermalConstraintsEnum : return "MinThermalConstraints"; - case NStepsEnum : return "NSteps"; + case Fake18Enum : return "Fake18"; case NdtEnum : return "Ndt"; case NumOutputEnum : return "NumOutput"; @@ -340,8 +340,8 @@ case NumberOfNodesEnum : return "NumberOfNodes"; case NumberOfVerticesEnum : return "NumberOfVertices"; - case OptScalEnum : return "OptScal"; + case Fake19Enum : return "Fake19"; case OutputFilePointerEnum : return "OutputFilePointer"; - case OutputFileNameEnum : return "OutputFileName"; - case ParameterOutputEnum : return "ParameterOutput"; + case Fake20Enum : return "Fake20"; + case Fake21Enum : return "Fake21"; case PenaltyMeltingEnum : return "PenaltyMelting"; case QmuAnalysisEnum : return "QmuAnalysis"; @@ -354,5 +354,4 @@ case QmuNumberOfResponsesEnum : return "QmuNumberOfResponses"; case QmuSaveFemmodelEnum : return "QmuSaveFemmodel"; - case PartEnum : return "Part"; case IndexedEnum : return "Indexed"; case RegularEnum : return "Regular"; @@ -363,8 +362,8 @@ case PetscRcEnum : return "PetscRc"; case SparsityEnum : return "Sparsity"; - case TolXEnum : return "TolX"; + case Fake22Enum : return "Fake22"; case VariabledescriptorsEnum : return "Variabledescriptors"; case VerboseEnum : return "Verbose"; - case WaitOnLockEnum : return "WaitOnLock"; + case Fake23Enum : return "Fake23"; case PetscOptionsStringsEnum : return "PetscOptionsStrings"; case PetscOptionsAnalysesEnum : return "PetscOptionsAnalyses"; @@ -389,13 +388,13 @@ case VyMeshEnum : return "VyMesh"; case VzMeshEnum : return "VzMesh"; - case IsDiagnosticEnum : return "IsDiagnostic"; - case IsPrognosticEnum : return "IsPrognostic"; - case IsThermalEnum : return "IsThermal"; + case Fake24Enum : return "Fake24"; + case Fake25Enum : return "Fake25"; + case Fake26Enum : return "Fake26"; case EnthalpySolutionEnum : return "EnthalpySolution"; case EnthalpyAnalysisEnum : return "EnthalpyAnalysis"; case EnthalpyEnum : return "Enthalpy"; case EnthalpyPicardEnum : return "EnthalpyPicard"; - case WaterFractionEnum : return "WaterFraction"; - case ReferenceTemperatureEnum : return "ReferenceTemperature"; + case Fake27Enum : return "Fake27"; + case Fake28Enum : return "Fake28"; case ThicknessAbsGradientEnum : return "ThicknessAbsGradient"; case VelAbsGradientEnum : return "VelAbsGradient"; @@ -482,4 +481,5 @@ case NpartEnum : return "Npart"; case QmuMassFluxNumProfilesEnum : return "QmuMassFluxNumProfiles"; + case PartEnum : return "Part"; default : return "unknown"; Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 8941) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 8942) @@ -109,6 +109,6 @@ else if (strcmp(name,"PentaVertexInput")==0) return PentaVertexInputEnum; else if (strcmp(name,"TriaVertexInput")==0) return TriaVertexInputEnum; - else if (strcmp(name,"TriaVertexForcing")==0) return TriaVertexForcingEnum; - else if (strcmp(name,"PentaVertexForcing")==0) return PentaVertexForcingEnum; + else if (strcmp(name,"Fake0")==0) return Fake0Enum; + else if (strcmp(name,"Fake1")==0) return Fake1Enum; else if (strcmp(name,"ControlInput")==0) return ControlInputEnum; else if (strcmp(name,"Param")==0) return ParamEnum; @@ -150,10 +150,10 @@ else if (strcmp(name,"CmResponse")==0) return CmResponseEnum; else if (strcmp(name,"CmResponses")==0) return CmResponsesEnum; - else if (strcmp(name,"CmNoiseDmp")==0) return CmNoiseDmpEnum; + else if (strcmp(name,"Fake2")==0) return Fake2Enum; else if (strcmp(name,"Constant")==0) return ConstantEnum; else if (strcmp(name,"NumControls")==0) return NumControlsEnum; else if (strcmp(name,"ControlType")==0) return ControlTypeEnum; else if (strcmp(name,"Converged")==0) return ConvergedEnum; - else if (strcmp(name,"DhDt")==0) return DhDtEnum; + else if (strcmp(name,"Fake3")==0) return Fake3Enum; else if (strcmp(name,"DragCoefficient")==0) return DragCoefficientEnum; else if (strcmp(name,"DragP")==0) return DragPEnum; @@ -167,9 +167,9 @@ else if (strcmp(name,"ElementOnSurface")==0) return ElementOnSurfaceEnum; else if (strcmp(name,"ElementOnWater")==0) return ElementOnWaterEnum; - else if (strcmp(name,"EpsVel")==0) return EpsVelEnum; + else if (strcmp(name,"Fake4")==0) return Fake4Enum; else if (strcmp(name,"Fill")==0) return FillEnum; else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum; else if (strcmp(name,"Friction")==0) return FrictionEnum; - else if (strcmp(name,"GeothermalFlux")==0) return GeothermalFluxEnum; + else if (strcmp(name,"Fake5")==0) return Fake5Enum; else if (strcmp(name,"HydrostaticAdjustment")==0) return HydrostaticAdjustmentEnum; else if (strcmp(name,"Internal")==0) return InternalEnum; @@ -185,5 +185,5 @@ else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum; else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum; - else if (strcmp(name,"MeanVel")==0) return MeanVelEnum; + else if (strcmp(name,"Fake6")==0) return Fake6Enum; else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; else if (strcmp(name,"GroundingLineMeltingRate")==0) return GroundingLineMeltingRateEnum; @@ -208,5 +208,5 @@ else if (strcmp(name,"ShelfDampening")==0) return ShelfDampeningEnum; else if (strcmp(name,"StabilizeConstraints")==0) return StabilizeConstraintsEnum; - else if (strcmp(name,"StokesReconditioning")==0) return StokesReconditioningEnum; + else if (strcmp(name,"Fake7")==0) return Fake7Enum; else if (strcmp(name,"SurfaceAccumulationRate")==0) return SurfaceAccumulationRateEnum; else if (strcmp(name,"SurfaceAblationRate")==0) return SurfaceAblationRateEnum; @@ -266,5 +266,5 @@ else if (strcmp(name,"Time")==0) return TimeEnum; else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum; - else if (strcmp(name,"WaterColumn")==0) return WaterColumnEnum; + else if (strcmp(name,"Fake8")==0) return Fake8Enum; else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; else if (strcmp(name,"WaterColumnPicard")==0) return WaterColumnPicardEnum; @@ -291,5 +291,5 @@ else if (strcmp(name,"RhoWater")==0) return RhoWaterEnum; else if (strcmp(name,"Gravity")==0) return GravityEnum; - else if (strcmp(name,"ThermalConductivity")==0) return ThermalConductivityEnum; + else if (strcmp(name,"Fake9")==0) return Fake9Enum; else if (strcmp(name,"BasalMeltingRateCorrection")==0) return BasalMeltingRateCorrectionEnum; else if (strcmp(name,"BasalMeltingRateCorrectionApply")==0) return BasalMeltingRateCorrectionApplyEnum; @@ -319,17 +319,17 @@ else if (strcmp(name,"EpsRel")==0) return EpsRelEnum; else if (strcmp(name,"EpsRes")==0) return EpsResEnum; - else if (strcmp(name,"HeatCapacity")==0) return HeatCapacityEnum; + else if (strcmp(name,"Fake10")==0) return Fake10Enum; else if (strcmp(name,"IsHutter")==0) return IsHutterEnum; - else if (strcmp(name,"IsMacAyealPattyn")==0) return IsMacAyealPattynEnum; - else if (strcmp(name,"IsStokes")==0) return IsStokesEnum; - else if (strcmp(name,"Kff")==0) return KffEnum; - else if (strcmp(name,"LatentHeat")==0) return LatentHeatEnum; + else if (strcmp(name,"Fake11")==0) return Fake11Enum; + else if (strcmp(name,"Fake12")==0) return Fake12Enum; + else if (strcmp(name,"Fake13")==0) return Fake13Enum; + else if (strcmp(name,"Fake14")==0) return Fake14Enum; else if (strcmp(name,"Lowmem")==0) return LowmemEnum; - else if (strcmp(name,"MaxIter")==0) return MaxIterEnum; + else if (strcmp(name,"Fake16")==0) return Fake16Enum; else if (strcmp(name,"MaxNonlinearIterations")==0) return MaxNonlinearIterationsEnum; - else if (strcmp(name,"MeltingPoint")==0) return MeltingPointEnum; + else if (strcmp(name,"Fake17")==0) return Fake17Enum; else if (strcmp(name,"MinMechanicalConstraints")==0) return MinMechanicalConstraintsEnum; else if (strcmp(name,"MinThermalConstraints")==0) return MinThermalConstraintsEnum; - else if (strcmp(name,"NSteps")==0) return NStepsEnum; + else if (strcmp(name,"Fake18")==0) return Fake18Enum; else if (strcmp(name,"Ndt")==0) return NdtEnum; else if (strcmp(name,"NumOutput")==0) return NumOutputEnum; @@ -338,8 +338,8 @@ else if (strcmp(name,"NumberOfNodes")==0) return NumberOfNodesEnum; else if (strcmp(name,"NumberOfVertices")==0) return NumberOfVerticesEnum; - else if (strcmp(name,"OptScal")==0) return OptScalEnum; + else if (strcmp(name,"Fake19")==0) return Fake19Enum; else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum; - else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum; - else if (strcmp(name,"ParameterOutput")==0) return ParameterOutputEnum; + else if (strcmp(name,"Fake20")==0) return Fake20Enum; + else if (strcmp(name,"Fake21")==0) return Fake21Enum; else if (strcmp(name,"PenaltyMelting")==0) return PenaltyMeltingEnum; else if (strcmp(name,"QmuAnalysis")==0) return QmuAnalysisEnum; @@ -352,5 +352,4 @@ else if (strcmp(name,"QmuNumberOfResponses")==0) return QmuNumberOfResponsesEnum; else if (strcmp(name,"QmuSaveFemmodel")==0) return QmuSaveFemmodelEnum; - else if (strcmp(name,"Part")==0) return PartEnum; else if (strcmp(name,"Indexed")==0) return IndexedEnum; else if (strcmp(name,"Regular")==0) return RegularEnum; @@ -361,8 +360,8 @@ else if (strcmp(name,"PetscRc")==0) return PetscRcEnum; else if (strcmp(name,"Sparsity")==0) return SparsityEnum; - else if (strcmp(name,"TolX")==0) return TolXEnum; + else if (strcmp(name,"Fake22")==0) return Fake22Enum; else if (strcmp(name,"Variabledescriptors")==0) return VariabledescriptorsEnum; else if (strcmp(name,"Verbose")==0) return VerboseEnum; - else if (strcmp(name,"WaitOnLock")==0) return WaitOnLockEnum; + else if (strcmp(name,"Fake23")==0) return Fake23Enum; else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum; else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum; @@ -387,13 +386,13 @@ else if (strcmp(name,"VyMesh")==0) return VyMeshEnum; else if (strcmp(name,"VzMesh")==0) return VzMeshEnum; - else if (strcmp(name,"IsDiagnostic")==0) return IsDiagnosticEnum; - else if (strcmp(name,"IsPrognostic")==0) return IsPrognosticEnum; - else if (strcmp(name,"IsThermal")==0) return IsThermalEnum; + else if (strcmp(name,"Fake24")==0) return Fake24Enum; + else if (strcmp(name,"Fake25")==0) return Fake25Enum; + else if (strcmp(name,"Fake26")==0) return Fake26Enum; else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum; else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum; else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum; - else if (strcmp(name,"WaterFraction")==0) return WaterFractionEnum; - else if (strcmp(name,"ReferenceTemperature")==0) return ReferenceTemperatureEnum; + else if (strcmp(name,"Fake27")==0) return Fake27Enum; + else if (strcmp(name,"Fake28")==0) return Fake28Enum; else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum; else if (strcmp(name,"VelAbsGradient")==0) return VelAbsGradientEnum; @@ -480,4 +479,5 @@ else if (strcmp(name,"Npart")==0) return NpartEnum; else if (strcmp(name,"QmuMassFluxNumProfiles")==0) return QmuMassFluxNumProfilesEnum; + else if (strcmp(name,"Part")==0) return PartEnum; else _error_("Enum %s not found",name);