Index: /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp (revision 22605) +++ /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp (revision 22606) @@ -14,21 +14,18 @@ switch(analysis_enum){ - #ifdef _HAVE_SMB_ - case SmbAnalysisEnum : return new SmbAnalysis(); + #ifdef _HAVE_ADJOINTBALANCETHICKNESS2_ + case AdjointBalancethickness2AnalysisEnum : return new AdjointBalancethickness2Analysis(); #endif #ifdef _HAVE_ADJOINTBALANCETHICKNESS_ case AdjointBalancethicknessAnalysisEnum : return new AdjointBalancethicknessAnalysis(); #endif - #ifdef _HAVE_ADJOINTBALANCETHICKNESS2_ - case AdjointBalancethickness2AnalysisEnum : return new AdjointBalancethickness2Analysis(); - #endif #ifdef _HAVE_ADJOINTHORIZ_ case AdjointHorizAnalysisEnum : return new AdjointHorizAnalysis(); #endif + #ifdef _HAVE_BALANCETHICKNESS2_ + case Balancethickness2AnalysisEnum : return new Balancethickness2Analysis(); + #endif #ifdef _HAVE_BALANCETHICKNESS_ case BalancethicknessAnalysisEnum : return new BalancethicknessAnalysis(); - #endif - #ifdef _HAVE_BALANCETHICKNESS2_ - case Balancethickness2AnalysisEnum : return new Balancethickness2Analysis(); #endif #ifdef _HAVE_BALANCETHICKNESSSOFT_ @@ -38,12 +35,72 @@ case BalancevelocityAnalysisEnum : return new BalancevelocityAnalysis(); #endif - #ifdef _HAVE_L2PROJECTIONEPL_ - case L2ProjectionEPLAnalysisEnum : return new L2ProjectionEPLAnalysis(); + #ifdef _HAVE_DAMAGEEVOLUTION_ + case DamageEvolutionAnalysisEnum : return new DamageEvolutionAnalysis(); + #endif + #ifdef _HAVE_DEPTHAVERAGE_ + case DepthAverageAnalysisEnum : return new DepthAverageAnalysis(); + #endif + #ifdef _HAVE_ENTHALPY_ + case EnthalpyAnalysisEnum : return new EnthalpyAnalysis(); + #endif + #ifdef _HAVE_ESA_ + case EsaAnalysisEnum : return new EsaAnalysis(); + #endif + #ifdef _HAVE_EXTRAPOLATION_ + case ExtrapolationAnalysisEnum : return new ExtrapolationAnalysis(); + #endif + #ifdef _HAVE_EXTRUDEFROMBASE_ + case ExtrudeFromBaseAnalysisEnum : return new ExtrudeFromBaseAnalysis(); + #endif + #ifdef _HAVE_EXTRUDEFROMTOP_ + case ExtrudeFromTopAnalysisEnum : return new ExtrudeFromTopAnalysis(); + #endif + #ifdef _HAVE_FREESURFACEBASE_ + case FreeSurfaceBaseAnalysisEnum : return new FreeSurfaceBaseAnalysis(); + #endif + #ifdef _HAVE_FREESURFACETOP_ + case FreeSurfaceTopAnalysisEnum : return new FreeSurfaceTopAnalysis(); + #endif + #ifdef _HAVE_GIAIVINS_ + case GiaIvinsAnalysisEnum : return new GiaIvinsAnalysis(); + #endif + #ifdef _HAVE_HYDROLOGYDCEFFICIENT_ + case HydrologyDCEfficientAnalysisEnum : return new HydrologyDCEfficientAnalysis(); + #endif + #ifdef _HAVE_HYDROLOGYDCINEFFICIENT_ + case HydrologyDCInefficientAnalysisEnum : return new HydrologyDCInefficientAnalysis(); + #endif + #ifdef _HAVE_HYDROLOGYSHREVE_ + case HydrologyShreveAnalysisEnum : return new HydrologyShreveAnalysis(); + #endif + #ifdef _HAVE_HYDROLOGYSOMMERS_ + case HydrologySommersAnalysisEnum : return new HydrologySommersAnalysis(); #endif #ifdef _HAVE_L2PROJECTIONBASE_ case L2ProjectionBaseAnalysisEnum : return new L2ProjectionBaseAnalysis(); #endif - #ifdef _HAVE_DAMAGEEVOLUTION_ - case DamageEvolutionAnalysisEnum : return new DamageEvolutionAnalysis(); + #ifdef _HAVE_L2PROJECTIONEPL_ + case L2ProjectionEPLAnalysisEnum : return new L2ProjectionEPLAnalysis(); + #endif + #ifdef _HAVE_LEVELSET_ + case LevelsetAnalysisEnum : return new LevelsetAnalysis(); + #endif + #ifdef _HAVE_LOVE_ + case LoveAnalysisEnum : return new LoveAnalysis(); + #endif + #ifdef _HAVE_MASSTRANSPORT_ + case MasstransportAnalysisEnum : return new MasstransportAnalysis(); + #endif + #ifdef _HAVE_MELTING_ + case MeltingAnalysisEnum : return new MeltingAnalysis(); + #endif + #ifdef _HAVE_SEALEVELRISE_ + case SealevelriseAnalysisEnum : return new SealevelriseAnalysis(); + #endif + #ifdef _HAVE_SMB_ + case SmbAnalysisEnum : return new SmbAnalysis(); + #endif + #ifdef _HAVE_SMOOTH_ + case SmoothAnalysisEnum : return new SmoothAnalysis(); #endif #ifdef _HAVE_STRESSBALANCE_ @@ -56,46 +113,4 @@ case StressbalanceVerticalAnalysisEnum : return new StressbalanceVerticalAnalysis(); #endif - #ifdef _HAVE_ENTHALPY_ - case EnthalpyAnalysisEnum : return new EnthalpyAnalysis(); - #endif - #ifdef _HAVE_HYDROLOGYSHREVE_ - case HydrologyShreveAnalysisEnum : return new HydrologyShreveAnalysis(); - #endif - #ifdef _HAVE_HYDROLOGYDCINEFFICIENT_ - case HydrologyDCInefficientAnalysisEnum : return new HydrologyDCInefficientAnalysis(); - #endif - #ifdef _HAVE_HYDROLOGYDCEFFICIENT_ - case HydrologyDCEfficientAnalysisEnum : return new HydrologyDCEfficientAnalysis(); - #endif - #ifdef _HAVE_HYDROLOGYSOMMERS_ - case HydrologySommersAnalysisEnum : return new HydrologySommersAnalysis(); - #endif - #ifdef _HAVE_MELTING_ - case MeltingAnalysisEnum : return new MeltingAnalysis(); - #endif - #ifdef _HAVE_MASSTRANSPORT_ - case MasstransportAnalysisEnum : return new MasstransportAnalysis(); - #endif - #ifdef _HAVE_FREESURFACEBASE_ - case FreeSurfaceBaseAnalysisEnum : return new FreeSurfaceBaseAnalysis(); - #endif - #ifdef _HAVE_FREESURFACETOP_ - case FreeSurfaceTopAnalysisEnum : return new FreeSurfaceTopAnalysis(); - #endif - #ifdef _HAVE_EXTRUDEFROMBASE_ - case ExtrudeFromBaseAnalysisEnum : return new ExtrudeFromBaseAnalysis(); - #endif - #ifdef _HAVE_EXTRUDEFROMTOP_ - case ExtrudeFromTopAnalysisEnum : return new ExtrudeFromTopAnalysis(); - #endif - #ifdef _HAVE_DEPTHAVERAGE_ - case DepthAverageAnalysisEnum : return new DepthAverageAnalysis(); - #endif - #ifdef _HAVE_SEALEVELRISE_ - case SealevelriseAnalysisEnum : return new SealevelriseAnalysis(); - #endif - #ifdef _HAVE_SMOOTH_ - case SmoothAnalysisEnum : return new SmoothAnalysis(); - #endif #ifdef _HAVE_THERMAL_ case ThermalAnalysisEnum : return new ThermalAnalysis(); @@ -104,19 +119,4 @@ case UzawaPressureAnalysisEnum : return new UzawaPressureAnalysis(); #endif - #ifdef _HAVE_GIAIVINS_ - case GiaIvinsAnalysisEnum : return new GiaIvinsAnalysis(); - #endif - #ifdef _HAVE_ESA_ - case EsaAnalysisEnum : return new EsaAnalysis(); - #endif - #ifdef _HAVE_LOVE_ - case LoveAnalysisEnum : return new LoveAnalysis(); - #endif - #ifdef _HAVE_LEVELSET_ - case LevelsetAnalysisEnum : return new LevelsetAnalysis(); - #endif - #ifdef _HAVE_EXTRAPOLATION_ - case ExtrapolationAnalysisEnum : return new ExtrapolationAnalysis(); - #endif default : _error_("enum provided not supported ("<AddObject(iomodel->CopyConstantObject("md.smb.ismungsm",SmbIsmungsmEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.smb.issetpddfac",SmbIssetpddfacEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.smb.desfac",SmbDesfacEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlaps",SmbRlapsEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlapslgm",SmbRlapslgmEnum)); @@ -218,5 +217,4 @@ parameters->AddObject(iomodel->CopyConstantObject("md.smb.isd18opd",SmbIsd18opdEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.smb.issetpddfac",SmbIssetpddfacEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.smb.desfac",SmbDesfacEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlaps",SmbRlapsEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlapslgm",SmbRlapslgmEnum)); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 22605) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 22606) @@ -27,12 +27,4 @@ if(control_analysis){ - - /*What solution type?*/ - if(solution_type==SteadystateSolutionEnum){ - parameters->AddObject(new BoolParam(ControlSteadyEnum,true)); - } - else{ - parameters->AddObject(new BoolParam(ControlSteadyEnum,false)); - } switch(inversiontype){ @@ -127,5 +119,4 @@ parameters->AddObject(iomodel->CopyConstantObject("md.inversion.incomplete_adjoint",InversionIncompleteAdjointEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.inversion.nsteps",InversionNstepsEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.inversion.cost_function_threshold",InversionCostFunctionThresholdEnum)); iomodel->FetchData(&cm_jump,&nsteps,NULL,"md.inversion.step_threshold"); iomodel->FetchData(&optscal,NULL,NULL,"md.inversion.gradient_scaling"); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 22605) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 22606) @@ -54,9 +54,7 @@ parameters->AddObject(iomodel->CopyConstantObject("md.settings.recording_frequency",SettingsRecordingFrequencyEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.constants.yts",ConstantsYtsEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.settings.lowmem",SettingsLowmemEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.debug.profiling",DebugProfilingEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.mesh.average_vertex_connectivity",MeshAverageVertexConnectivityEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.settings.waitonlock",SettingsWaitonlockEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.mesh.numberofelements",MeshNumberofelementsEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.mesh.numberofvertices",MeshNumberofverticesEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.settings.results_on_nodes",SettingsResultsOnNodesEnum)); @@ -93,5 +91,4 @@ parameters->AddObject(iomodel->CopyConstantObject("md.steadystate.reltol",SteadystateReltolEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.steadystate.maxiter",SteadystateMaxiterEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.constants.referencetemperature",ConstantsReferencetemperatureEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.groundingline.migration",GroundinglineMigrationEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.transient.isstressbalance",TransientIsstressbalanceEnum)); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22605) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22606) @@ -85,7 +85,5 @@ CalvingMinthicknessEnum, ConfigurationTypeEnum, - ConstantsReferencetemperatureEnum, ConstantsYtsEnum, - ControlSteadyEnum, DamageC1Enum, DamageC2Enum, @@ -157,5 +155,4 @@ InversionControlScalingFactorsEnum, InversionCostFunctionsEnum, - InversionCostFunctionThresholdEnum, InversionDxminEnum, InversionGatolEnum, @@ -198,5 +195,4 @@ MeshAverageVertexConnectivityEnum, MeshElementtypeEnum, - MeshNumberofelementsEnum, MeshNumberoflayersEnum, MeshNumberofverticesEnum, @@ -241,5 +237,4 @@ SealevelriseUElasticEnum, SettingsIoGatherEnum, - SettingsLowmemEnum, SettingsOutputFrequencyEnum, SettingsRecordingFrequencyEnum, @@ -645,4 +640,5 @@ ColinearEnum, ConstantsGEnum, + ConstantsReferencetemperatureEnum, ConstraintsEnum, ContactEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22605) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22606) @@ -93,7 +93,5 @@ case CalvingMinthicknessEnum : return "CalvingMinthickness"; case ConfigurationTypeEnum : return "ConfigurationType"; - case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature"; case ConstantsYtsEnum : return "ConstantsYts"; - case ControlSteadyEnum : return "ControlSteady"; case DamageC1Enum : return "DamageC1"; case DamageC2Enum : return "DamageC2"; @@ -165,5 +163,4 @@ case InversionControlScalingFactorsEnum : return "InversionControlScalingFactors"; case InversionCostFunctionsEnum : return "InversionCostFunctions"; - case InversionCostFunctionThresholdEnum : return "InversionCostFunctionThreshold"; case InversionDxminEnum : return "InversionDxmin"; case InversionGatolEnum : return "InversionGatol"; @@ -206,5 +203,4 @@ case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity"; case MeshElementtypeEnum : return "MeshElementtype"; - case MeshNumberofelementsEnum : return "MeshNumberofelements"; case MeshNumberoflayersEnum : return "MeshNumberoflayers"; case MeshNumberofverticesEnum : return "MeshNumberofvertices"; @@ -249,5 +245,4 @@ case SealevelriseUElasticEnum : return "SealevelriseUElastic"; case SettingsIoGatherEnum : return "SettingsIoGather"; - case SettingsLowmemEnum : return "SettingsLowmem"; case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency"; case SettingsRecordingFrequencyEnum : return "SettingsRecordingFrequency"; @@ -649,4 +644,5 @@ case ColinearEnum : return "Colinear"; case ConstantsGEnum : return "ConstantsG"; + case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature"; case ConstraintsEnum : return "Constraints"; case ContactEnum : return "Contact"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22605) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22606) @@ -93,7 +93,5 @@ else if (strcmp(name,"CalvingMinthickness")==0) return CalvingMinthicknessEnum; else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum; - else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum; else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum; - else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum; else if (strcmp(name,"DamageC1")==0) return DamageC1Enum; else if (strcmp(name,"DamageC2")==0) return DamageC2Enum; @@ -137,10 +135,10 @@ else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum; else if (strcmp(name,"HydrologydcMaxIter")==0) return HydrologydcMaxIterEnum; + else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum; + else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum; else stage=2; } if(stage==2){ - if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum; - else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum; - else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum; + if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum; else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum; else if (strcmp(name,"HydrologydcSedimentlimitFlag")==0) return HydrologydcSedimentlimitFlagEnum; @@ -168,5 +166,4 @@ else if (strcmp(name,"InversionControlScalingFactors")==0) return InversionControlScalingFactorsEnum; else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum; - else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum; else if (strcmp(name,"InversionDxmin")==0) return InversionDxminEnum; else if (strcmp(name,"InversionGatol")==0) return InversionGatolEnum; @@ -209,5 +206,4 @@ else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; else if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum; - else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum; else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum; else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum; @@ -252,5 +248,4 @@ else if (strcmp(name,"SealevelriseUElastic")==0) return SealevelriseUElasticEnum; else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; - else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum; else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; else if (strcmp(name,"SettingsRecordingFrequency")==0) return SettingsRecordingFrequencyEnum; @@ -260,13 +255,13 @@ else if (strcmp(name,"SmbAdThresh")==0) return SmbAdThreshEnum; else if (strcmp(name,"SmbAIce")==0) return SmbAIceEnum; - else stage=3; - } - if(stage==3){ - if (strcmp(name,"SmbAIdx")==0) return SmbAIdxEnum; + else if (strcmp(name,"SmbAIdx")==0) return SmbAIdxEnum; else if (strcmp(name,"SmbASnow")==0) return SmbASnowEnum; else if (strcmp(name,"SmbCldFrac")==0) return SmbCldFracEnum; else if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum; else if (strcmp(name,"SmbDelta18oSurface")==0) return SmbDelta18oSurfaceEnum; - else if (strcmp(name,"SmbDenIdx")==0) return SmbDenIdxEnum; + else stage=3; + } + if(stage==3){ + if (strcmp(name,"SmbDenIdx")==0) return SmbDenIdxEnum; else if (strcmp(name,"SmbDt")==0) return SmbDtEnum; else if (strcmp(name,"Smb")==0) return SmbEnum; @@ -383,13 +378,13 @@ else if (strcmp(name,"CalvinglevermannMeltingrate")==0) return CalvinglevermannMeltingrateEnum; else if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum; - else stage=4; - } - if(stage==4){ - if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum; + else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum; else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum; else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum; else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum; else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum; - else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum; else if (strcmp(name,"Converged")==0) return ConvergedEnum; else if (strcmp(name,"CrevasseDepth")==0) return CrevasseDepthEnum; @@ -506,13 +501,13 @@ else if (strcmp(name,"SmbBNeg")==0) return SmbBNegEnum; else if (strcmp(name,"SmbBPos")==0) return SmbBPosEnum; - else stage=5; - } - if(stage==5){ - if (strcmp(name,"SmbC")==0) return SmbCEnum; + else if (strcmp(name,"SmbC")==0) return SmbCEnum; else if (strcmp(name,"SmbD")==0) return SmbDEnum; else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum; else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum; else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum; - else if (strcmp(name,"SmbDz")==0) return SmbDzEnum; + else stage=5; + } + if(stage==5){ + if (strcmp(name,"SmbDz")==0) return SmbDzEnum; else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum; else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum; @@ -629,13 +624,13 @@ else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum; else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum; - else stage=6; - } - if(stage==6){ - if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum; + else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum; else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum; else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum; else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum; - else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum; + else stage=6; + } + if(stage==6){ + if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum; else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum; @@ -664,4 +659,5 @@ else if (strcmp(name,"Colinear")==0) return ColinearEnum; else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum; + else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum; else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; else if (strcmp(name,"Contact")==0) return ContactEnum; @@ -752,12 +748,12 @@ else if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum; else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum; + else if (strcmp(name,"Gset")==0) return GsetEnum; + else if (strcmp(name,"Gsl")==0) return GslEnum; + else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum; + else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"Gset")==0) return GsetEnum; - else if (strcmp(name,"Gsl")==0) return GslEnum; - else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum; - else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum; - else if (strcmp(name,"Hook")==0) return HookEnum; + if (strcmp(name,"Hook")==0) return HookEnum; else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum; else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum; @@ -875,12 +871,12 @@ else if (strcmp(name,"MINI")==0) return MINIEnum; else if (strcmp(name,"MinVel")==0) return MinVelEnum; + else if (strcmp(name,"MinVx")==0) return MinVxEnum; + else if (strcmp(name,"MinVy")==0) return MinVyEnum; + else if (strcmp(name,"MinVz")==0) return MinVzEnum; + else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"MinVx")==0) return MinVxEnum; - else if (strcmp(name,"MinVy")==0) return MinVyEnum; - else if (strcmp(name,"MinVz")==0) return MinVzEnum; - else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum; - else if (strcmp(name,"Moulin")==0) return MoulinEnum; + if (strcmp(name,"Moulin")==0) return MoulinEnum; else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum; else if (strcmp(name,"Mpi")==0) return MpiEnum; @@ -998,12 +994,12 @@ else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum; + else if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum; + else if (strcmp(name,"Tetra")==0) return TetraEnum; + else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; + else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum; - else if (strcmp(name,"Tetra")==0) return TetraEnum; - else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; - else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; - else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; + if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum; @@ -1121,12 +1117,12 @@ else if (strcmp(name,"Outputdefinition83")==0) return Outputdefinition83Enum; else if (strcmp(name,"Outputdefinition84")==0) return Outputdefinition84Enum; + else if (strcmp(name,"Outputdefinition85")==0) return Outputdefinition85Enum; + else if (strcmp(name,"Outputdefinition86")==0) return Outputdefinition86Enum; + else if (strcmp(name,"Outputdefinition87")==0) return Outputdefinition87Enum; + else if (strcmp(name,"Outputdefinition88")==0) return Outputdefinition88Enum; else stage=10; } if(stage==10){ - if (strcmp(name,"Outputdefinition85")==0) return Outputdefinition85Enum; - else if (strcmp(name,"Outputdefinition86")==0) return Outputdefinition86Enum; - else if (strcmp(name,"Outputdefinition87")==0) return Outputdefinition87Enum; - else if (strcmp(name,"Outputdefinition88")==0) return Outputdefinition88Enum; - else if (strcmp(name,"Outputdefinition89")==0) return Outputdefinition89Enum; + if (strcmp(name,"Outputdefinition89")==0) return Outputdefinition89Enum; else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum; else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum; Index: /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh (revision 22605) +++ /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh (revision 22606) @@ -13,4 +13,5 @@ #Deal with Analyses +if false ; then #Build EnumToAnalysis.cpp {{{ #Header @@ -85,4 +86,5 @@ END #}}} +fi #Enum to String conversions