Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 16234) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 16235) @@ -42,5 +42,4 @@ DependentObjectEnum, StressbalanceAbstolEnum, - StressbalanceIcefrontEnum, StressbalanceIsnewtonEnum, StressbalanceMaxiterEnum, @@ -118,5 +117,4 @@ HydrologyEfficientEnum, HydrologySedimentKmaxEnum, - BasisIntegralEnum, WaterTransferEnum, IndependentObjectEnum, @@ -138,5 +136,4 @@ InversionStepThresholdEnum, InversionThicknessObsEnum, - InversionVelObsEnum, InversionVxObsEnum, InversionVyObsEnum, @@ -283,5 +280,4 @@ AdjointBalancethicknessAnalysisEnum, AdjointHorizAnalysisEnum, - AdjointSolutionEnum, AnalysisCounterEnum, NoneAnalysisEnum, @@ -361,5 +357,4 @@ ControlInputEnum, DatasetInputEnum, - DofIndexingEnum, DoubleInputEnum, DataSetParamEnum, @@ -372,6 +367,4 @@ ExternalResultEnum, FileParamEnum, - HookEnum, - IcefrontEnum, InputEnum, IntInputEnum, @@ -379,7 +372,4 @@ IntVecParamEnum, TransientParamEnum, - IceFrontTypeEnum, - SSA2dIceFrontEnum, - SSA3dIceFrontEnum, MaticeEnum, MatparEnum, @@ -388,6 +378,4 @@ NumericalfluxTypeEnum, ParamEnum, - L1L2IceFrontEnum, - HOIceFrontEnum, PengridEnum, PenpairEnum, @@ -405,5 +393,4 @@ SpcStaticEnum, SpcTransientEnum, - FSIceFrontEnum, StringArrayParamEnum, StringParamEnum, @@ -434,5 +421,4 @@ BedSlopeYEnum, BoundaryEnum, - ConstantEnum, ConvergedEnum, FillEnum, @@ -442,8 +428,6 @@ InternalEnum, MassFluxEnum, - MaxPenetrationEnum, MeltingOffsetEnum, MisfitEnum, - NumberNodeToElementConnectivityEnum, PressureEnum, PressurePicardEnum, @@ -471,5 +455,4 @@ SurfaceSlopeYEnum, TemperatureEnum, - TemperatureOldEnum, TemperaturePicardEnum, ThicknessAbsMisfitEnum, @@ -634,8 +617,5 @@ GenericOptionEnum, OptionCellEnum, - OptionCharEnum, OptionStructEnum, - OptionDoubleEnum, - OptionLogicalEnum, /*}}}*/ /*Rheology law (move too Material) {{{*/ Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 16234) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 16235) @@ -50,5 +50,4 @@ case DependentObjectEnum : return "DependentObject"; case StressbalanceAbstolEnum : return "StressbalanceAbstol"; - case StressbalanceIcefrontEnum : return "StressbalanceIcefront"; case StressbalanceIsnewtonEnum : return "StressbalanceIsnewton"; case StressbalanceMaxiterEnum : return "StressbalanceMaxiter"; @@ -126,5 +125,4 @@ case HydrologyEfficientEnum : return "HydrologyEfficient"; case HydrologySedimentKmaxEnum : return "HydrologySedimentKmax"; - case BasisIntegralEnum : return "BasisIntegral"; case WaterTransferEnum : return "WaterTransfer"; case IndependentObjectEnum : return "IndependentObject"; @@ -146,5 +144,4 @@ case InversionStepThresholdEnum : return "InversionStepThreshold"; case InversionThicknessObsEnum : return "InversionThicknessObs"; - case InversionVelObsEnum : return "InversionVelObs"; case InversionVxObsEnum : return "InversionVxObs"; case InversionVyObsEnum : return "InversionVyObs"; @@ -289,5 +286,4 @@ case AdjointBalancethicknessAnalysisEnum : return "AdjointBalancethicknessAnalysis"; case AdjointHorizAnalysisEnum : return "AdjointHorizAnalysis"; - case AdjointSolutionEnum : return "AdjointSolution"; case AnalysisCounterEnum : return "AnalysisCounter"; case NoneAnalysisEnum : return "NoneAnalysis"; @@ -361,5 +357,4 @@ case ControlInputEnum : return "ControlInput"; case DatasetInputEnum : return "DatasetInput"; - case DofIndexingEnum : return "DofIndexing"; case DoubleInputEnum : return "DoubleInput"; case DataSetParamEnum : return "DataSetParam"; @@ -372,6 +367,4 @@ case ExternalResultEnum : return "ExternalResult"; case FileParamEnum : return "FileParam"; - case HookEnum : return "Hook"; - case IcefrontEnum : return "Icefront"; case InputEnum : return "Input"; case IntInputEnum : return "IntInput"; @@ -379,7 +372,4 @@ case IntVecParamEnum : return "IntVecParam"; case TransientParamEnum : return "TransientParam"; - case IceFrontTypeEnum : return "IceFrontType"; - case SSA2dIceFrontEnum : return "SSA2dIceFront"; - case SSA3dIceFrontEnum : return "SSA3dIceFront"; case MaticeEnum : return "Matice"; case MatparEnum : return "Matpar"; @@ -388,6 +378,4 @@ case NumericalfluxTypeEnum : return "NumericalfluxType"; case ParamEnum : return "Param"; - case L1L2IceFrontEnum : return "L1L2IceFront"; - case HOIceFrontEnum : return "HOIceFront"; case PengridEnum : return "Pengrid"; case PenpairEnum : return "Penpair"; @@ -405,5 +393,4 @@ case SpcStaticEnum : return "SpcStatic"; case SpcTransientEnum : return "SpcTransient"; - case FSIceFrontEnum : return "FSIceFront"; case StringArrayParamEnum : return "StringArrayParam"; case StringParamEnum : return "StringParam"; @@ -428,5 +415,4 @@ case BedSlopeYEnum : return "BedSlopeY"; case BoundaryEnum : return "Boundary"; - case ConstantEnum : return "Constant"; case ConvergedEnum : return "Converged"; case FillEnum : return "Fill"; @@ -436,8 +422,6 @@ case InternalEnum : return "Internal"; case MassFluxEnum : return "MassFlux"; - case MaxPenetrationEnum : return "MaxPenetration"; case MeltingOffsetEnum : return "MeltingOffset"; case MisfitEnum : return "Misfit"; - case NumberNodeToElementConnectivityEnum : return "NumberNodeToElementConnectivity"; case PressureEnum : return "Pressure"; case PressurePicardEnum : return "PressurePicard"; @@ -465,5 +449,4 @@ case SurfaceSlopeYEnum : return "SurfaceSlopeY"; case TemperatureEnum : return "Temperature"; - case TemperatureOldEnum : return "TemperatureOld"; case TemperaturePicardEnum : return "TemperaturePicard"; case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit"; @@ -606,8 +589,5 @@ case GenericOptionEnum : return "GenericOption"; case OptionCellEnum : return "OptionCell"; - case OptionCharEnum : return "OptionChar"; case OptionStructEnum : return "OptionStruct"; - case OptionDoubleEnum : return "OptionDouble"; - case OptionLogicalEnum : return "OptionLogical"; case PatersonEnum : return "Paterson"; case ArrheniusEnum : return "Arrhenius"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 16234) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 16235) @@ -50,5 +50,4 @@ else if (strcmp(name,"DependentObject")==0) return DependentObjectEnum; else if (strcmp(name,"StressbalanceAbstol")==0) return StressbalanceAbstolEnum; - else if (strcmp(name,"StressbalanceIcefront")==0) return StressbalanceIcefrontEnum; else if (strcmp(name,"StressbalanceIsnewton")==0) return StressbalanceIsnewtonEnum; else if (strcmp(name,"StressbalanceMaxiter")==0) return StressbalanceMaxiterEnum; @@ -126,5 +125,4 @@ else if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum; else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum; - else if (strcmp(name,"BasisIntegral")==0) return BasisIntegralEnum; else if (strcmp(name,"WaterTransfer")==0) return WaterTransferEnum; else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum; @@ -137,10 +135,10 @@ else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; + else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum; + else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; else stage=2; } if(stage==2){ - if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum; - else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; - else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum; + if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum; else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum; else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum; @@ -149,5 +147,4 @@ else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum; else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum; - else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum; else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum; else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; @@ -260,11 +257,11 @@ else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum; else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum; + else if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum; + else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum; + else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum; - else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum; - else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum; - else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; + if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; else if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum; else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum; @@ -295,5 +292,4 @@ else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum; else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum; - else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum; else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum; else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum; @@ -367,5 +363,4 @@ else if (strcmp(name,"ControlInput")==0) return ControlInputEnum; else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum; - else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum; else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum; else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum; @@ -378,17 +373,9 @@ else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum; else if (strcmp(name,"FileParam")==0) return FileParamEnum; - else if (strcmp(name,"Hook")==0) return HookEnum; - else if (strcmp(name,"Icefront")==0) return IcefrontEnum; else if (strcmp(name,"Input")==0) return InputEnum; else if (strcmp(name,"IntInput")==0) return IntInputEnum; else if (strcmp(name,"IntParam")==0) return IntParamEnum; - else stage=4; - } - if(stage==4){ - if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; + else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; else if (strcmp(name,"TransientParam")==0) return TransientParamEnum; - else if (strcmp(name,"IceFrontType")==0) return IceFrontTypeEnum; - else if (strcmp(name,"SSA2dIceFront")==0) return SSA2dIceFrontEnum; - else if (strcmp(name,"SSA3dIceFront")==0) return SSA3dIceFrontEnum; else if (strcmp(name,"Matice")==0) return MaticeEnum; else if (strcmp(name,"Matpar")==0) return MatparEnum; @@ -396,7 +383,8 @@ else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum; - else if (strcmp(name,"Param")==0) return ParamEnum; - else if (strcmp(name,"L1L2IceFront")==0) return L1L2IceFrontEnum; - else if (strcmp(name,"HOIceFront")==0) return HOIceFrontEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"Param")==0) return ParamEnum; else if (strcmp(name,"Pengrid")==0) return PengridEnum; else if (strcmp(name,"Penpair")==0) return PenpairEnum; @@ -414,5 +402,4 @@ else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; - else if (strcmp(name,"FSIceFront")==0) return FSIceFrontEnum; else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; else if (strcmp(name,"StringParam")==0) return StringParamEnum; @@ -437,5 +424,4 @@ else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum; else if (strcmp(name,"Boundary")==0) return BoundaryEnum; - else if (strcmp(name,"Constant")==0) return ConstantEnum; else if (strcmp(name,"Converged")==0) return ConvergedEnum; else if (strcmp(name,"Fill")==0) return FillEnum; @@ -445,8 +431,6 @@ else if (strcmp(name,"Internal")==0) return InternalEnum; else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; - else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum; 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 if (strcmp(name,"Pressure")==0) return PressureEnum; else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; @@ -474,5 +458,4 @@ else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; else if (strcmp(name,"Temperature")==0) return TemperatureEnum; - else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum; else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; @@ -506,8 +489,5 @@ else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum; else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum; - else stage=5; - } - if(stage==5){ - if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; + else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum; else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; @@ -526,5 +506,8 @@ else if (strcmp(name,"P1")==0) return P1Enum; else if (strcmp(name,"P1DG")==0) return P1DGEnum; - else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; + else stage=5; + } + if(stage==5){ + if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; else if (strcmp(name,"P2")==0) return P2Enum; @@ -618,8 +601,5 @@ else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum; else if (strcmp(name,"OptionCell")==0) return OptionCellEnum; - else if (strcmp(name,"OptionChar")==0) return OptionCharEnum; else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum; - else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum; - else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum; else if (strcmp(name,"Paterson")==0) return PatersonEnum; else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; Index: /issm/trunk-jpl/src/c/shared/Exp/exp.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Exp/exp.h (revision 16234) +++ /issm/trunk-jpl/src/c/shared/Exp/exp.h (revision 16235) @@ -92,5 +92,5 @@ //# Points Count Value if(fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy)!=4) _error_("Could not read " << domainname); - if(fscanf(fid,"%20u %255s\n",&n,chardummy)!=2) _error_("Could not read number of points in "<