Context Navigation

← Previous Changeset
Next Changeset →

Changeset 7635

Timestamp:

03/15/11 08:55:24 (14 years ago)

Author:

Eric.Larour

Message:

new enums for hydrology model

Location:

issm/trunk/src

Files:

: 331 edited

c/EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
c/EnumDefinitions/EnumToString.cpp (modified) (2 diffs)
c/EnumDefinitions/StringToEnum.cpp (modified) (2 diffs)
m/enum/AbsoluteEnum.m (modified) (1 diff)
m/enum/AccumulationRateEnum.m (modified) (1 diff)
m/enum/AdjointEnum.m (modified) (1 diff)
m/enum/AdjointpEnum.m (modified) (1 diff)
m/enum/AdjointxEnum.m (modified) (1 diff)
m/enum/AdjointyEnum.m (modified) (1 diff)
m/enum/AdjointzEnum.m (modified) (1 diff)
m/enum/AgressiveMigrationEnum.m (modified) (1 diff)
m/enum/AirEnum.m (modified) (1 diff)
m/enum/ApproximationEnum.m (modified) (1 diff)
m/enum/ArtDiffEnum.m (modified) (1 diff)
m/enum/BalancedthicknessAnalysisEnum.m (modified) (1 diff)
m/enum/BalancedthicknessSolutionEnum.m (modified) (1 diff)
m/enum/BalancedvelocitiesAnalysisEnum.m (modified) (1 diff)
m/enum/BalancedvelocitiesSolutionEnum.m (modified) (1 diff)
m/enum/BathymetryEnum.m (modified) (1 diff)
m/enum/BedEnum.m (modified) (1 diff)
m/enum/BedSlopeAnalysisEnum.m (modified) (1 diff)
m/enum/BedSlopeSolutionEnum.m (modified) (1 diff)
m/enum/BedSlopeXAnalysisEnum.m (modified) (1 diff)
m/enum/BedSlopeXEnum.m (modified) (1 diff)
m/enum/BedSlopeYAnalysisEnum.m (modified) (1 diff)
m/enum/BedSlopeYEnum.m (modified) (1 diff)
m/enum/BetaEnum.m (modified) (1 diff)
m/enum/BilinearInterpEnum.m (modified) (1 diff)
m/enum/BoolElementResultEnum.m (modified) (1 diff)
m/enum/BoolExternalResultEnum.m (modified) (1 diff)
m/enum/BoolInputEnum.m (modified) (1 diff)
m/enum/BoolParamEnum.m (modified) (1 diff)
m/enum/BoundaryEnum.m (modified) (1 diff)
m/enum/CflCoefficientEnum.m (modified) (1 diff)
m/enum/ClosedEnum.m (modified) (1 diff)
m/enum/CmGradientEnum.m (modified) (1 diff)
m/enum/CmJumpEnum.m (modified) (1 diff)
m/enum/CmMaxEnum.m (modified) (1 diff)
m/enum/CmMinEnum.m (modified) (1 diff)
m/enum/CmNoiseDmpEnum.m (modified) (1 diff)
m/enum/CmResponseEnum.m (modified) (1 diff)
m/enum/CmResponsesEnum.m (modified) (1 diff)
m/enum/ColinearEnum.m (modified) (1 diff)
m/enum/ConnectivityEnum.m (modified) (1 diff)
m/enum/ConstantEnum.m (modified) (1 diff)
m/enum/ControlInputEnum.m (modified) (1 diff)
m/enum/ControlSteadyEnum.m (modified) (1 diff)
m/enum/ControlTypeEnum.m (modified) (1 diff)
m/enum/ConvergedEnum.m (modified) (1 diff)
m/enum/DakotaParameterEnum.m (modified) (1 diff)
m/enum/DhDtEnum.m (modified) (1 diff)
m/enum/DimEnum.m (modified) (1 diff)
m/enum/DofIndexingEnum.m (modified) (1 diff)
m/enum/DoubleElementResultEnum.m (modified) (1 diff)
m/enum/DoubleExternalResultEnum.m (modified) (1 diff)
m/enum/DoubleInputEnum.m (modified) (1 diff)
m/enum/DoubleMatArrayParamEnum.m (modified) (1 diff)
m/enum/DoubleMatExternalResultEnum.m (modified) (1 diff)
m/enum/DoubleMatParamEnum.m (modified) (1 diff)
m/enum/DoubleParamEnum.m (modified) (1 diff)
m/enum/DoubleVecExternalResultEnum.m (modified) (1 diff)
m/enum/DoubleVecParamEnum.m (modified) (1 diff)
m/enum/DragCoefficientEnum.m (modified) (1 diff)
m/enum/DragPEnum.m (modified) (1 diff)
m/enum/DragQEnum.m (modified) (1 diff)
m/enum/DragTypeEnum.m (modified) (1 diff)
m/enum/DtEnum.m (modified) (1 diff)
m/enum/ElementEnum.m (modified) (1 diff)
m/enum/ElementOnBedEnum.m (modified) (1 diff)
m/enum/ElementOnIceShelfEnum.m (modified) (1 diff)
m/enum/ElementOnSurfaceEnum.m (modified) (1 diff)
m/enum/ElementOnWaterEnum.m (modified) (1 diff)
m/enum/ElementPropertiesEnum.m (modified) (1 diff)
m/enum/ElementResultEnum.m (modified) (1 diff)
m/enum/EnumToString.m (modified) (2 diffs)
m/enum/EpsAbsEnum.m (modified) (1 diff)
m/enum/EpsCmEnum.m (modified) (1 diff)
m/enum/EpsRelEnum.m (modified) (1 diff)
m/enum/EpsResEnum.m (modified) (1 diff)
m/enum/EpsVelEnum.m (modified) (1 diff)
m/enum/ExtToIuEnum.m (modified) (1 diff)
m/enum/ExternalResultEnum.m (modified) (1 diff)
m/enum/FileParamEnum.m (modified) (1 diff)
m/enum/FillEnum.m (modified) (1 diff)
m/enum/FractionIncrementEnum.m (modified) (1 diff)
m/enum/FreeEnum.m (modified) (1 diff)
m/enum/FrictionEnum.m (modified) (1 diff)
m/enum/FsetEnum.m (modified) (1 diff)
m/enum/GeographyEnum.m (modified) (1 diff)
m/enum/GeothermalFluxEnum.m (modified) (1 diff)
m/enum/Gradient1Enum.m (modified) (1 diff)
m/enum/Gradient2Enum.m (modified) (1 diff)
m/enum/Gradient3Enum.m (modified) (1 diff)
m/enum/GradientEnum.m (modified) (1 diff)
m/enum/GravityEnum.m (modified) (1 diff)
m/enum/GroundingLineMeltingRateEnum.m (modified) (1 diff)
m/enum/GroundingLineMigration2DSolutionEnum.m (modified) (1 diff)
m/enum/GroundingLineMigrationEnum.m (modified) (1 diff)
m/enum/GsetEnum.m (modified) (1 diff)
m/enum/HeatCapacityEnum.m (modified) (1 diff)
m/enum/HookEnum.m (modified) (1 diff)
m/enum/HutterApproximationEnum.m (modified) (1 diff)
m/enum/HydrostaticAdjustmentEnum.m (modified) (1 diff)
m/enum/IceEnum.m (modified) (1 diff)
m/enum/IceSheetEnum.m (modified) (1 diff)
m/enum/IceShelfEnum.m (modified) (1 diff)
m/enum/IcefrontEnum.m (modified) (1 diff)
m/enum/IncrementalEnum.m (modified) (1 diff)
m/enum/IndexEnum.m (modified) (1 diff)
m/enum/IndexedEnum.m (modified) (1 diff)
m/enum/InputEnum.m (modified) (1 diff)
m/enum/IntExternalResultEnum.m (modified) (1 diff)
m/enum/IntInputEnum.m (modified) (1 diff)
m/enum/IntParamEnum.m (modified) (1 diff)
m/enum/IntVecParamEnum.m (modified) (1 diff)
m/enum/InternalEnum.m (modified) (1 diff)
m/enum/IntersectEnum.m (modified) (1 diff)
m/enum/IoGatherEnum.m (modified) (1 diff)
m/enum/IsHutterEnum.m (modified) (1 diff)
m/enum/IsMacAyealPattynEnum.m (modified) (1 diff)
m/enum/IsStokesEnum.m (modified) (1 diff)
m/enum/IuToExtEnum.m (modified) (1 diff)
m/enum/JEnum.m (modified) (1 diff)
m/enum/KffEnum.m (modified) (1 diff)
m/enum/KflagEnum.m (modified) (1 diff)
m/enum/LatentHeatEnum.m (modified) (1 diff)
m/enum/LoadEnum.m (modified) (1 diff)
m/enum/LowmemEnum.m (modified) (1 diff)
m/enum/MacAyeal2dIceFrontEnum.m (modified) (1 diff)
m/enum/MacAyeal3dIceFrontEnum.m (modified) (1 diff)
m/enum/MacAyealApproximationEnum.m (modified) (1 diff)
m/enum/MacAyealPattynApproximationEnum.m (modified) (1 diff)
m/enum/MacAyealStokesApproximationEnum.m (modified) (1 diff)
m/enum/MassFluxEnum.m (modified) (1 diff)
m/enum/MaterialEnum.m (modified) (1 diff)
m/enum/MaticeEnum.m (modified) (1 diff)
m/enum/MatparEnum.m (modified) (1 diff)
m/enum/MaxAbsVxEnum.m (modified) (1 diff)
m/enum/MaxAbsVyEnum.m (modified) (1 diff)
m/enum/MaxAbsVzEnum.m (modified) (1 diff)
m/enum/MaxIterEnum.m (modified) (1 diff)
m/enum/MaxNonlinearIterationsEnum.m (modified) (1 diff)
m/enum/MaxPenetrationEnum.m (modified) (1 diff)
m/enum/MaxVelEnum.m (modified) (1 diff)
m/enum/MaxVxEnum.m (modified) (1 diff)
m/enum/MaxVyEnum.m (modified) (1 diff)
m/enum/MaxVzEnum.m (modified) (1 diff)
m/enum/MeanVelEnum.m (modified) (1 diff)
m/enum/MelangeEnum.m (modified) (1 diff)
m/enum/MeltingAnalysisEnum.m (modified) (1 diff)
m/enum/MeltingOffsetEnum.m (modified) (1 diff)
m/enum/MeltingPointEnum.m (modified) (1 diff)
m/enum/MeltingRateCorrectionApplyEnum.m (modified) (1 diff)
m/enum/MeltingRateCorrectionEnum.m (modified) (1 diff)
m/enum/MeltingRateEnum.m (modified) (1 diff)
m/enum/MinMechanicalConstraintsEnum.m (modified) (1 diff)
m/enum/MinThermalConstraintsEnum.m (modified) (1 diff)
m/enum/MinVelEnum.m (modified) (1 diff)
m/enum/MinVxEnum.m (modified) (1 diff)
m/enum/MinVyEnum.m (modified) (1 diff)
m/enum/MinVzEnum.m (modified) (1 diff)
m/enum/MiniEnum.m (modified) (1 diff)
m/enum/MisfitEnum.m (modified) (1 diff)
m/enum/MixedLayerCapacityEnum.m (modified) (1 diff)
m/enum/NStepsEnum.m (modified) (1 diff)
m/enum/NdtEnum.m (modified) (1 diff)
m/enum/NearestInterpEnum.m (modified) (1 diff)
m/enum/NodalEnum.m (modified) (1 diff)
m/enum/NodeEnum.m (modified) (1 diff)
m/enum/NodeOnBedEnum.m (modified) (1 diff)
m/enum/NodeOnIceSheetEnum.m (modified) (1 diff)
m/enum/NodeOnIceShelfEnum.m (modified) (1 diff)
m/enum/NodeOnSurfaceEnum.m (modified) (1 diff)
m/enum/NodePropertiesEnum.m (modified) (1 diff)
m/enum/NoneAnalysisEnum.m (modified) (1 diff)
m/enum/NoneApproximationEnum.m (modified) (1 diff)
m/enum/NoneEnum.m (modified) (1 diff)
m/enum/NumControlsEnum.m (modified) (1 diff)
m/enum/NumOutputEnum.m (modified) (1 diff)
m/enum/NumRiftsEnum.m (modified) (1 diff)
m/enum/NumberNodeToElementConnectivityEnum.m (modified) (1 diff)
m/enum/NumberOfElementsEnum.m (modified) (1 diff)
m/enum/NumberOfNodesEnum.m (modified) (1 diff)
m/enum/NumberOfVerticesEnum.m (modified) (1 diff)
m/enum/NumericalfluxEnum.m (modified) (1 diff)
m/enum/ObjectEnum.m (modified) (1 diff)
m/enum/OldGradientEnum.m (modified) (1 diff)
m/enum/OpenEnum.m (modified) (1 diff)
m/enum/OptScalEnum.m (modified) (1 diff)
m/enum/OutputFileNameEnum.m (modified) (1 diff)
m/enum/OutputFilePointerEnum.m (modified) (1 diff)
m/enum/OutputFrequencyEnum.m (modified) (1 diff)
m/enum/P0Enum.m (modified) (1 diff)
m/enum/P1DGEnum.m (modified) (1 diff)
m/enum/P1Enum.m (modified) (1 diff)
m/enum/ParamEnum.m (modified) (1 diff)
m/enum/ParameterOutputEnum.m (modified) (1 diff)
m/enum/ParametersAnalysisEnum.m (modified) (1 diff)
m/enum/ParametersSolutionEnum.m (modified) (1 diff)
m/enum/PatchEnum.m (modified) (1 diff)
m/enum/PatchNodesEnum.m (modified) (1 diff)
m/enum/PatchVerticesEnum.m (modified) (1 diff)
m/enum/PattynApproximationEnum.m (modified) (1 diff)
m/enum/PattynIceFrontEnum.m (modified) (1 diff)
m/enum/PattynStokesApproximationEnum.m (modified) (1 diff)
m/enum/PenaltyMeltingEnum.m (modified) (1 diff)
m/enum/PenaltyOffsetEnum.m (modified) (1 diff)
m/enum/PengridEnum.m (modified) (1 diff)
m/enum/PenpairEnum.m (modified) (1 diff)
m/enum/PentaEnum.m (modified) (1 diff)
m/enum/PentaVertexElementResultEnum.m (modified) (1 diff)
m/enum/PentaVertexInputEnum.m (modified) (1 diff)
m/enum/PetscMatParamEnum.m (modified) (1 diff)
m/enum/PetscOptionsAnalysesEnum.m (modified) (1 diff)
m/enum/PetscOptionsStringsEnum.m (modified) (1 diff)
m/enum/PetscRcEnum.m (modified) (1 diff)
m/enum/PetscVecExternalResultEnum.m (modified) (1 diff)
m/enum/PetscVecParamEnum.m (modified) (1 diff)
m/enum/PflagEnum.m (modified) (1 diff)
m/enum/PressureEnum.m (modified) (1 diff)
m/enum/PressureOldEnum.m (modified) (1 diff)
m/enum/PrognosticAnalysisEnum.m (modified) (1 diff)
m/enum/PrognosticSolutionEnum.m (modified) (1 diff)
m/enum/QmuAnalysisEnum.m (modified) (1 diff)
m/enum/QmuErrNameEnum.m (modified) (1 diff)
m/enum/QmuInNameEnum.m (modified) (1 diff)
m/enum/QmuMassFluxSegmentsEnum.m (modified) (1 diff)
m/enum/QmuNPartEnum.m (modified) (1 diff)
m/enum/QmuNumberOfResponsesEnum.m (modified) (1 diff)
m/enum/QmuOutNameEnum.m (modified) (1 diff)
m/enum/QmuPartEnum.m (modified) (1 diff)
m/enum/QmuPressureEnum.m (modified) (1 diff)
m/enum/QmuSaveFemmodelEnum.m (modified) (1 diff)
m/enum/QmuVxEnum.m (modified) (1 diff)
m/enum/QmuVyEnum.m (modified) (1 diff)
m/enum/QmuVzEnum.m (modified) (1 diff)
m/enum/QuadRiftFrontEnum.m (modified) (1 diff)
m/enum/RegularEnum.m (modified) (1 diff)
m/enum/RelativeEnum.m (modified) (1 diff)
m/enum/ResetPenaltiesEnum.m (modified) (1 diff)
m/enum/ResidualEnum.m (modified) (1 diff)
m/enum/ResponseDescriptorsEnum.m (modified) (1 diff)
m/enum/RheologyBEnum.m (modified) (1 diff)
m/enum/RheologyBbarEnum.m (modified) (1 diff)
m/enum/RheologyNEnum.m (modified) (1 diff)
m/enum/RhoIceEnum.m (modified) (1 diff)
m/enum/RhoWaterEnum.m (modified) (1 diff)
m/enum/RiftfrontEnum.m (modified) (1 diff)
m/enum/ScaledEnum.m (modified) (1 diff)
m/enum/SegmentEnum.m (modified) (1 diff)
m/enum/SegmentOnIceShelfEnum.m (modified) (1 diff)
m/enum/SegmentRiftfrontEnum.m (modified) (1 diff)
m/enum/SeparateEnum.m (modified) (1 diff)
m/enum/ShelfDampeningEnum.m (modified) (1 diff)
m/enum/SoftMigrationEnum.m (modified) (1 diff)
m/enum/SparsityEnum.m (modified) (1 diff)
m/enum/SpcEnum.m (modified) (1 diff)
m/enum/SsetEnum.m (modified) (1 diff)
m/enum/StabilizeConstraintsEnum.m (modified) (1 diff)
m/enum/SteadyAnalysisEnum.m (modified) (1 diff)
m/enum/SteadystateAnalysisEnum.m (modified) (1 diff)
m/enum/SteadystateSolutionEnum.m (modified) (1 diff)
m/enum/StokesApproximationEnum.m (modified) (1 diff)
m/enum/StokesIceFrontEnum.m (modified) (1 diff)
m/enum/StokesReconditioningEnum.m (modified) (1 diff)
m/enum/StokesSolverEnum.m (modified) (1 diff)
m/enum/StringArrayParamEnum.m (modified) (1 diff)
m/enum/StringExternalResultEnum.m (modified) (1 diff)
m/enum/StringParamEnum.m (modified) (1 diff)
m/enum/StringToEnum.m (modified) (2 diffs)
m/enum/SurfaceAbsVelMisfitEnum.m (modified) (1 diff)
m/enum/SurfaceAreaEnum.m (modified) (1 diff)
m/enum/SurfaceAverageVelMisfitEnum.m (modified) (1 diff)
m/enum/SurfaceEnum.m (modified) (1 diff)
m/enum/SurfaceLogVelMisfitEnum.m (modified) (1 diff)
m/enum/SurfaceLogVxVyMisfitEnum.m (modified) (1 diff)
m/enum/SurfaceRelVelMisfitEnum.m (modified) (1 diff)
m/enum/SurfaceSlopeAnalysisEnum.m (modified) (1 diff)
m/enum/SurfaceSlopeSolutionEnum.m (modified) (1 diff)
m/enum/SurfaceSlopeXAnalysisEnum.m (modified) (1 diff)
m/enum/SurfaceSlopeXEnum.m (modified) (1 diff)
m/enum/SurfaceSlopeYAnalysisEnum.m (modified) (1 diff)
m/enum/SurfaceSlopeYEnum.m (modified) (1 diff)
m/enum/TemperatureEnum.m (modified) (1 diff)
m/enum/TemperatureOldEnum.m (modified) (1 diff)
m/enum/TemporaryTemperatureEnum.m (modified) (1 diff)
m/enum/ThermalConductivityEnum.m (modified) (1 diff)
m/enum/ThermalExchangeVelocityEnum.m (modified) (1 diff)
m/enum/ThicknessAbsMisfitEnum.m (modified) (1 diff)
m/enum/ThicknessCoeffEnum.m (modified) (1 diff)
m/enum/ThicknessEnum.m (modified) (1 diff)
m/enum/ThicknessObsEnum.m (modified) (1 diff)
m/enum/TimeAdaptEnum.m (modified) (1 diff)
m/enum/TimeEnum.m (modified) (1 diff)
m/enum/TolXEnum.m (modified) (1 diff)
m/enum/Transient2DAnalysisEnum.m (modified) (1 diff)
m/enum/Transient2DSolutionEnum.m (modified) (1 diff)
m/enum/Transient3DAnalysisEnum.m (modified) (1 diff)
m/enum/Transient3DSolutionEnum.m (modified) (1 diff)
m/enum/TransientAnalysisEnum.m (modified) (1 diff)
m/enum/TriaEnum.m (modified) (1 diff)
m/enum/TriaVertexElementResultEnum.m (modified) (1 diff)
m/enum/TriaVertexInputEnum.m (modified) (1 diff)
m/enum/TriangleInterpEnum.m (modified) (1 diff)
m/enum/TypeEnum.m (modified) (1 diff)
m/enum/VariableDescriptorsEnum.m (modified) (1 diff)
m/enum/VelEnum.m (modified) (1 diff)
m/enum/VelObsEnum.m (modified) (1 diff)
m/enum/VelocityEnum.m (modified) (1 diff)
m/enum/VerboseEnum.m (modified) (1 diff)
m/enum/VertexEnum.m (modified) (1 diff)
m/enum/ViscosityOvershootEnum.m (modified) (1 diff)
m/enum/VxAverageEnum.m (modified) (1 diff)
m/enum/VxEnum.m (modified) (1 diff)
m/enum/VxObsEnum.m (modified) (1 diff)
m/enum/VxOldEnum.m (modified) (1 diff)
m/enum/VyAverageEnum.m (modified) (1 diff)
m/enum/VyEnum.m (modified) (1 diff)
m/enum/VyObsEnum.m (modified) (1 diff)
m/enum/VyOldEnum.m (modified) (1 diff)
m/enum/VzAverageEnum.m (modified) (1 diff)
m/enum/VzEnum.m (modified) (1 diff)
m/enum/VzMacAyealEnum.m (modified) (1 diff)
m/enum/VzObsEnum.m (modified) (1 diff)
m/enum/VzOldEnum.m (modified) (1 diff)
m/enum/VzPattynEnum.m (modified) (1 diff)
m/enum/VzStokesEnum.m (modified) (1 diff)
m/enum/WaitOnLockEnum.m (modified) (1 diff)
m/enum/WaterEnum.m (modified) (1 diff)
m/enum/WeightsEnum.m (modified) (1 diff)
m/enum/YtsEnum.m (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

-              r7627
+              r7635
         ThermalSolutionEnum,
         ThermalAnalysisEnum,
+        //hydro
+        HydrologySolutionEnum,
+        HydrologyAnalysisEnum,
         //transient
         Transient2DSolutionEnum,
 …
         TimeEnum,
         OutputFrequencyEnum,
+        WaterColumnEnum,
+        OldWaterColumnEnum,
+        PicardWaterColumnEnum,
         /*}}}*/
         /*Io{{{1*/

issm/trunk/src/c/EnumDefinitions/EnumToString.cpp

-              r7627
+              r7635
                 case ThermalSolutionEnum : return "ThermalSolution";
                 case ThermalAnalysisEnum : return "ThermalAnalysis";
+                case HydrologySolutionEnum : return "HydrologySolution";
+                case HydrologyAnalysisEnum : return "HydrologyAnalysis";
                 case Transient2DSolutionEnum : return "Transient2DSolution";
                 case Transient2DAnalysisEnum : return "Transient2DAnalysis";
 …
                 case TimeEnum : return "Time";
                 case OutputFrequencyEnum : return "OutputFrequency";
+                case WaterColumnEnum : return "WaterColumn";
+                case OldWaterColumnEnum : return "OldWaterColumn";
+                case PicardWaterColumnEnum : return "PicardWaterColumn";
                 case IoGatherEnum : return "IoGather";
                 case MinVelEnum : return "MinVel";

issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp

-              r7627
+              r7635
         else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
         else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
+        else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
+        else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum;
         else if (strcmp(name,"Transient2DSolution")==0) return Transient2DSolutionEnum;
         else if (strcmp(name,"Transient2DAnalysis")==0) return Transient2DAnalysisEnum;
 …
         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,"OldWaterColumn")==0) return OldWaterColumnEnum;
+        else if (strcmp(name,"PicardWaterColumn")==0) return PicardWaterColumnEnum;
         else if (strcmp(name,"IoGather")==0) return IoGatherEnum;
         else if (strcmp(name,"MinVel")==0) return MinVelEnum;

issm/trunk/src/m/enum/AbsoluteEnum.m

r7628	r7635
9	9	% macro=AbsoluteEnum()
10	10
11		macro=261;
	11	macro=266;

issm/trunk/src/m/enum/AccumulationRateEnum.m

r7628	r7635
9	9	% macro=AccumulationRateEnum()
10	10
11		macro=121;
	11	macro=123;

issm/trunk/src/m/enum/AdjointEnum.m

r7628	r7635
9	9	% macro=AdjointEnum()
10	10
11		macro=283;
	11	macro=288;

issm/trunk/src/m/enum/AdjointpEnum.m

r7628	r7635
9	9	% macro=AdjointpEnum()
10	10
11		macro=125;
	11	macro=127;

issm/trunk/src/m/enum/AdjointxEnum.m

r7628	r7635
9	9	% macro=AdjointxEnum()
10	10
11		macro=122;
	11	macro=124;

issm/trunk/src/m/enum/AdjointyEnum.m

r7628	r7635
9	9	% macro=AdjointyEnum()
10	10
11		macro=123;
	11	macro=125;

issm/trunk/src/m/enum/AdjointzEnum.m

r7628	r7635
9	9	% macro=AdjointzEnum()
10	10
11		macro=124;
	11	macro=126;

issm/trunk/src/m/enum/AgressiveMigrationEnum.m

r7628	r7635
9	9	% macro=AgressiveMigrationEnum()
10	10
11		macro=264;
	11	macro=269;

issm/trunk/src/m/enum/AirEnum.m

r7628	r7635
9	9	% macro=AirEnum()
10	10
11		macro=116;
	11	macro=118;

issm/trunk/src/m/enum/ApproximationEnum.m

r7628	r7635
9	9	% macro=ApproximationEnum()
10	10
11		macro=53;
	11	macro=55;

issm/trunk/src/m/enum/ArtDiffEnum.m

r7628	r7635
9	9	% macro=ArtDiffEnum()
10	10
11		macro=126;
	11	macro=128;

issm/trunk/src/m/enum/BalancedthicknessAnalysisEnum.m

r7628	r7635
9	9	% macro=BalancedthicknessAnalysisEnum()
10	10
11		macro=42;
	11	macro=44;

issm/trunk/src/m/enum/BalancedthicknessSolutionEnum.m

r7628	r7635
9	9	% macro=BalancedthicknessSolutionEnum()
10	10
11		macro=41;
	11	macro=43;

issm/trunk/src/m/enum/BalancedvelocitiesAnalysisEnum.m

r7628	r7635
9	9	% macro=BalancedvelocitiesAnalysisEnum()
10	10
11		macro=44;
	11	macro=46;

issm/trunk/src/m/enum/BalancedvelocitiesSolutionEnum.m

r7628	r7635
9	9	% macro=BalancedvelocitiesSolutionEnum()
10	10
11		macro=43;
	11	macro=45;

issm/trunk/src/m/enum/BathymetryEnum.m

r7628	r7635
9	9	% macro=BathymetryEnum()
10	10
11		macro=128;
	11	macro=130;

issm/trunk/src/m/enum/BedEnum.m

r7628	r7635
9	9	% macro=BedEnum()
10	10
11		macro=127;
	11	macro=129;

issm/trunk/src/m/enum/BedSlopeAnalysisEnum.m

r7628	r7635
9	9	% macro=BedSlopeAnalysisEnum()
10	10
11		macro=34;
	11	macro=36;

issm/trunk/src/m/enum/BedSlopeSolutionEnum.m

r7628	r7635
9	9	% macro=BedSlopeSolutionEnum()
10	10
11		macro=33;
	11	macro=35;

issm/trunk/src/m/enum/BedSlopeXAnalysisEnum.m

r7628	r7635
9	9	% macro=BedSlopeXAnalysisEnum()
10	10
11		macro=37;
	11	macro=39;

issm/trunk/src/m/enum/BedSlopeXEnum.m

r7628	r7635
9	9	% macro=BedSlopeXEnum()
10	10
11		macro=129;
	11	macro=131;

issm/trunk/src/m/enum/BedSlopeYAnalysisEnum.m

r7628	r7635
9	9	% macro=BedSlopeYAnalysisEnum()
10	10
11		macro=38;
	11	macro=40;

issm/trunk/src/m/enum/BedSlopeYEnum.m

r7628	r7635
9	9	% macro=BedSlopeYEnum()
10	10
11		macro=130;
	11	macro=132;

issm/trunk/src/m/enum/BetaEnum.m

r7628	r7635
9	9	% macro=BetaEnum()
10	10
11		macro=278;
	11	macro=283;

issm/trunk/src/m/enum/BilinearInterpEnum.m

r7628	r7635
9	9	% macro=BilinearInterpEnum()
10	10
11		macro=350;
	11	macro=355;

issm/trunk/src/m/enum/BoolElementResultEnum.m

r7628	r7635
9	9	% macro=BoolElementResultEnum()
10	10
11		macro=233;
	11	macro=235;

issm/trunk/src/m/enum/BoolExternalResultEnum.m

r7628	r7635
9	9	% macro=BoolExternalResultEnum()
10	10
11		macro=234;
	11	macro=236;

issm/trunk/src/m/enum/BoolInputEnum.m

r7628	r7635
9	9	% macro=BoolInputEnum()
10	10
11		macro=89;
	11	macro=91;

issm/trunk/src/m/enum/BoolParamEnum.m

r7628	r7635
9	9	% macro=BoolParamEnum()
10	10
11		macro=96;
	11	macro=98;

issm/trunk/src/m/enum/BoundaryEnum.m

r7628	r7635
9	9	% macro=BoundaryEnum()
10	10
11		macro=131;
	11	macro=133;

issm/trunk/src/m/enum/CflCoefficientEnum.m

r7628	r7635
9	9	% macro=CflCoefficientEnum()
10	10
11		macro=146;
	11	macro=148;

issm/trunk/src/m/enum/ClosedEnum.m

r7628	r7635
9	9	% macro=ClosedEnum()
10	10
11		macro=120;
	11	macro=122;

issm/trunk/src/m/enum/CmGradientEnum.m

r7628	r7635
9	9	% macro=CmGradientEnum()
10	10
11		macro=279;
	11	macro=284;

issm/trunk/src/m/enum/CmJumpEnum.m

r7628	r7635
9	9	% macro=CmJumpEnum()
10	10
11		macro=280;
	11	macro=285;

issm/trunk/src/m/enum/CmMaxEnum.m

r7628	r7635
9	9	% macro=CmMaxEnum()
10	10
11		macro=281;
	11	macro=286;

issm/trunk/src/m/enum/CmMinEnum.m

r7628	r7635
9	9	% macro=CmMinEnum()
10	10
11		macro=282;
	11	macro=287;

issm/trunk/src/m/enum/CmNoiseDmpEnum.m

r7628	r7635
9	9	% macro=CmNoiseDmpEnum()
10	10
11		macro=134;
	11	macro=136;

issm/trunk/src/m/enum/CmResponseEnum.m

r7628	r7635
9	9	% macro=CmResponseEnum()
10	10
11		macro=132;
	11	macro=134;

issm/trunk/src/m/enum/CmResponsesEnum.m

r7628	r7635
9	9	% macro=CmResponsesEnum()
10	10
11		macro=133;
	11	macro=135;

issm/trunk/src/m/enum/ColinearEnum.m

r7628	r7635
9	9	% macro=ColinearEnum()
10	10
11		macro=276;
	11	macro=281;

issm/trunk/src/m/enum/ConnectivityEnum.m

r7628	r7635
9	9	% macro=ConnectivityEnum()
10	10
11		macro=289;
	11	macro=294;

issm/trunk/src/m/enum/ConstantEnum.m

r7628	r7635
9	9	% macro=ConstantEnum()
10	10
11		macro=135;
	11	macro=137;

issm/trunk/src/m/enum/ControlInputEnum.m

r7628	r7635
9	9	% macro=ControlInputEnum()
10	10
11		macro=94;
	11	macro=96;

issm/trunk/src/m/enum/ControlSteadyEnum.m

r7628	r7635
9	9	% macro=ControlSteadyEnum()
10	10
11		macro=290;
	11	macro=295;

issm/trunk/src/m/enum/ControlTypeEnum.m

r7628	r7635
9	9	% macro=ControlTypeEnum()
10	10
11		macro=137;
	11	macro=139;

issm/trunk/src/m/enum/ConvergedEnum.m

r7628	r7635
9	9	% macro=ConvergedEnum()
10	10
11		macro=138;
	11	macro=140;

issm/trunk/src/m/enum/DakotaParameterEnum.m

r7628	r7635
9	9	% macro=DakotaParameterEnum()
10	10
11		macro=291;
	11	macro=296;

issm/trunk/src/m/enum/DhDtEnum.m

r7628	r7635
9	9	% macro=DhDtEnum()
10	10
11		macro=139;
	11	macro=141;

issm/trunk/src/m/enum/DimEnum.m

r7628	r7635
9	9	% macro=DimEnum()
10	10
11		macro=292;
	11	macro=297;

issm/trunk/src/m/enum/DofIndexingEnum.m

r7628	r7635
9	9	% macro=DofIndexingEnum()
10	10
11		macro=66;
	11	macro=68;

issm/trunk/src/m/enum/DoubleElementResultEnum.m

r7628	r7635
9	9	% macro=DoubleElementResultEnum()
10	10
11		macro=230;
	11	macro=232;

issm/trunk/src/m/enum/DoubleExternalResultEnum.m

r7628	r7635
9	9	% macro=DoubleExternalResultEnum()
10	10
11		macro=235;
	11	macro=237;

issm/trunk/src/m/enum/DoubleInputEnum.m

r7628	r7635
9	9	% macro=DoubleInputEnum()
10	10
11		macro=90;
	11	macro=92;

issm/trunk/src/m/enum/DoubleMatArrayParamEnum.m

r7628	r7635
9	9	% macro=DoubleMatArrayParamEnum()
10	10
11		macro=98;
	11	macro=100;

issm/trunk/src/m/enum/DoubleMatExternalResultEnum.m

r7628	r7635
9	9	% macro=DoubleMatExternalResultEnum()
10	10
11		macro=237;
	11	macro=239;

issm/trunk/src/m/enum/DoubleMatParamEnum.m

r7628	r7635
9	9	% macro=DoubleMatParamEnum()
10	10
11		macro=97;
	11	macro=99;

issm/trunk/src/m/enum/DoubleParamEnum.m

r7628	r7635
9	9	% macro=DoubleParamEnum()
10	10
11		macro=99;
	11	macro=101;

issm/trunk/src/m/enum/DoubleVecExternalResultEnum.m

r7628	r7635
9	9	% macro=DoubleVecExternalResultEnum()
10	10
11		macro=236;
	11	macro=238;

issm/trunk/src/m/enum/DoubleVecParamEnum.m

r7628	r7635
9	9	% macro=DoubleVecParamEnum()
10	10
11		macro=100;
	11	macro=102;

issm/trunk/src/m/enum/DragCoefficientEnum.m

r7628	r7635
9	9	% macro=DragCoefficientEnum()
10	10
11		macro=140;
	11	macro=142;

issm/trunk/src/m/enum/DragPEnum.m

r7628	r7635
9	9	% macro=DragPEnum()
10	10
11		macro=141;
	11	macro=143;

issm/trunk/src/m/enum/DragQEnum.m

r7628	r7635
9	9	% macro=DragQEnum()
10	10
11		macro=142;
	11	macro=144;

issm/trunk/src/m/enum/DragTypeEnum.m

r7628	r7635
9	9	% macro=DragTypeEnum()
10	10
11		macro=143;
	11	macro=145;

issm/trunk/src/m/enum/DtEnum.m

r7628	r7635
9	9	% macro=DtEnum()
10	10
11		macro=144;
	11	macro=146;

issm/trunk/src/m/enum/ElementEnum.m

r7628	r7635
9	9	% macro=ElementEnum()
10	10
11		macro=65;
	11	macro=67;

issm/trunk/src/m/enum/ElementOnBedEnum.m

r7628	r7635
9	9	% macro=ElementOnBedEnum()
10	10
11		macro=147;
	11	macro=149;

issm/trunk/src/m/enum/ElementOnIceShelfEnum.m

r7628	r7635
9	9	% macro=ElementOnIceShelfEnum()
10	10
11		macro=148;
	11	macro=150;

issm/trunk/src/m/enum/ElementOnSurfaceEnum.m

r7628	r7635
9	9	% macro=ElementOnSurfaceEnum()
10	10
11		macro=149;
	11	macro=151;

issm/trunk/src/m/enum/ElementOnWaterEnum.m

r7628	r7635
9	9	% macro=ElementOnWaterEnum()
10	10
11		macro=150;
	11	macro=152;

issm/trunk/src/m/enum/ElementPropertiesEnum.m

r7628	r7635
9	9	% macro=ElementPropertiesEnum()
10	10
11		macro=67;
	11	macro=69;

issm/trunk/src/m/enum/ElementResultEnum.m

r7628	r7635
9	9	% macro=ElementResultEnum()
10	10
11		macro=108;
	11	macro=110;

issm/trunk/src/m/enum/EnumToString.m

-              r7628
+              r7635
 case ThermalSolutionEnum(), string='ThermalSolution'; return
 case ThermalAnalysisEnum(), string='ThermalAnalysis'; return
+case HydrologySolutionEnum(), string='HydrologySolution'; return
+case HydrologyAnalysisEnum(), string='HydrologyAnalysis'; return
 case Transient2DSolutionEnum(), string='Transient2DSolution'; return
 case Transient2DAnalysisEnum(), string='Transient2DAnalysis'; return
 …
 case TimeEnum(), string='Time'; return
 case OutputFrequencyEnum(), string='OutputFrequency'; return
+case WaterColumnEnum(), string='WaterColumn'; return
+case OldWaterColumnEnum(), string='OldWaterColumn'; return
+case PicardWaterColumnEnum(), string='PicardWaterColumn'; return
 case IoGatherEnum(), string='IoGather'; return
 case MinVelEnum(), string='MinVel'; return

issm/trunk/src/m/enum/EpsAbsEnum.m

r7628	r7635
9	9	% macro=EpsAbsEnum()
10	10
11		macro=293;
	11	macro=298;

issm/trunk/src/m/enum/EpsCmEnum.m

r7628	r7635
9	9	% macro=EpsCmEnum()
10	10
11		macro=294;
	11	macro=299;

issm/trunk/src/m/enum/EpsRelEnum.m

r7628	r7635
9	9	% macro=EpsRelEnum()
10	10
11		macro=~~295~~;
	11	macro=300;

issm/trunk/src/m/enum/EpsResEnum.m

r7628	r7635
9	9	% macro=EpsResEnum()
10	10
11		macro=~~296~~;
	11	macro=301;

issm/trunk/src/m/enum/EpsVelEnum.m

r7628	r7635
9	9	% macro=EpsVelEnum()
10	10
11		macro=151;
	11	macro=153;

issm/trunk/src/m/enum/ExtToIuEnum.m

r7628	r7635
9	9	% macro=ExtToIuEnum()
10	10
11		macro=160;
	11	macro=162;

issm/trunk/src/m/enum/ExternalResultEnum.m

r7628	r7635
9	9	% macro=ExternalResultEnum()
10	10
11		macro=109;
	11	macro=111;

issm/trunk/src/m/enum/FileParamEnum.m

r7628	r7635
9	9	% macro=FileParamEnum()
10	10
11		macro=103;
	11	macro=105;

issm/trunk/src/m/enum/FillEnum.m

r7628	r7635
9	9	% macro=FillEnum()
10	10
11		macro=152;
	11	macro=154;

issm/trunk/src/m/enum/FractionIncrementEnum.m

r7628	r7635
9	9	% macro=FractionIncrementEnum()
10	10
11		macro=153;
	11	macro=155;

issm/trunk/src/m/enum/FreeEnum.m

r7628	r7635
9	9	% macro=FreeEnum()
10	10
11		macro=118;
	11	macro=120;

issm/trunk/src/m/enum/FrictionEnum.m

r7628	r7635
9	9	% macro=FrictionEnum()
10	10
11		macro=154;
	11	macro=156;

issm/trunk/src/m/enum/FsetEnum.m

r7628	r7635
9	9	% macro=FsetEnum()
10	10
11		macro=345;
	11	macro=350;

issm/trunk/src/m/enum/GeographyEnum.m

r7628	r7635
9	9	% macro=GeographyEnum()
10	10
11		macro=111;
	11	macro=113;

issm/trunk/src/m/enum/GeothermalFluxEnum.m

r7628	r7635
9	9	% macro=GeothermalFluxEnum()
10	10
11		macro=155;
	11	macro=157;

issm/trunk/src/m/enum/Gradient1Enum.m

r7628	r7635
9	9	% macro=Gradient1Enum()
10	10
11		macro=285;
	11	macro=290;

issm/trunk/src/m/enum/Gradient2Enum.m

r7628	r7635
9	9	% macro=Gradient2Enum()
10	10
11		macro=286;
	11	macro=291;

issm/trunk/src/m/enum/Gradient3Enum.m

r7628	r7635
9	9	% macro=Gradient3Enum()
10	10
11		macro=287;
	11	macro=292;

issm/trunk/src/m/enum/GradientEnum.m

r7628	r7635
9	9	% macro=GradientEnum()
10	10
11		macro=284;
	11	macro=289;

issm/trunk/src/m/enum/GravityEnum.m

r7628	r7635
9	9	% macro=GravityEnum()
10	10
11		macro=268;
	11	macro=273;

issm/trunk/src/m/enum/GroundingLineMeltingRateEnum.m

r7628	r7635
9	9	% macro=GroundingLineMeltingRateEnum()
10	10
11		macro=171;
	11	macro=173;

issm/trunk/src/m/enum/GroundingLineMigration2DSolutionEnum.m

r7628	r7635
9	9	% macro=GroundingLineMigration2DSolutionEnum()
10	10
11		macro=30;
	11	macro=32;

issm/trunk/src/m/enum/GroundingLineMigrationEnum.m

r7628	r7635
9	9	% macro=GroundingLineMigrationEnum()
10	10
11		macro=347;
	11	macro=352;

issm/trunk/src/m/enum/GsetEnum.m

r7628	r7635
9	9	% macro=GsetEnum()
10	10
11		macro=344;
	11	macro=349;

issm/trunk/src/m/enum/HeatCapacityEnum.m

r7628	r7635
9	9	% macro=HeatCapacityEnum()
10	10
11		macro=~~297~~;
	11	macro=302;

issm/trunk/src/m/enum/HookEnum.m

r7628	r7635
9	9	% macro=HookEnum()
10	10
11		macro=63;
	11	macro=65;

issm/trunk/src/m/enum/HutterApproximationEnum.m

r7628	r7635
9	9	% macro=HutterApproximationEnum()
10	10
11		macro=54;
	11	macro=56;

issm/trunk/src/m/enum/HydrostaticAdjustmentEnum.m

r7628	r7635
9	9	% macro=HydrostaticAdjustmentEnum()
10	10
11		macro=156;
	11	macro=158;

issm/trunk/src/m/enum/IceEnum.m

r7628	r7635
9	9	% macro=IceEnum()
10	10
11		macro=115;
	11	macro=117;

issm/trunk/src/m/enum/IceSheetEnum.m

r7628	r7635
9	9	% macro=IceSheetEnum()
10	10
11		macro=112;
	11	macro=114;

issm/trunk/src/m/enum/IceShelfEnum.m

r7628	r7635
9	9	% macro=IceShelfEnum()
10	10
11		macro=113;
	11	macro=115;

issm/trunk/src/m/enum/IcefrontEnum.m

r7628	r7635
9	9	% macro=IcefrontEnum()
10	10
11		macro=74;
	11	macro=76;

issm/trunk/src/m/enum/IncrementalEnum.m

r7628	r7635
9	9	% macro=IncrementalEnum()
10	10
11		macro=262;
	11	macro=267;

issm/trunk/src/m/enum/IndexEnum.m

r7628	r7635
9	9	% macro=IndexEnum()
10	10
11		macro=332;
	11	macro=337;

issm/trunk/src/m/enum/IndexedEnum.m

r7628	r7635
9	9	% macro=IndexedEnum()
10	10
11		macro=330;
	11	macro=335;

issm/trunk/src/m/enum/InputEnum.m

r7628	r7635
9	9	% macro=InputEnum()
10	10
11		macro=88;
	11	macro=90;

issm/trunk/src/m/enum/IntExternalResultEnum.m

r7628	r7635
9	9	% macro=IntExternalResultEnum()
10	10
11		macro=238;
	11	macro=240;

issm/trunk/src/m/enum/IntInputEnum.m

r7628	r7635
9	9	% macro=IntInputEnum()
10	10
11		macro=91;
	11	macro=93;

issm/trunk/src/m/enum/IntParamEnum.m

r7628	r7635
9	9	% macro=IntParamEnum()
10	10
11		macro=101;
	11	macro=103;

issm/trunk/src/m/enum/IntVecParamEnum.m

r7628	r7635
9	9	% macro=IntVecParamEnum()
10	10
11		macro=102;
	11	macro=104;

issm/trunk/src/m/enum/InternalEnum.m

r7628	r7635
9	9	% macro=InternalEnum()
10	10
11		macro=157;
	11	macro=159;

issm/trunk/src/m/enum/IntersectEnum.m

r7628	r7635
9	9	% macro=IntersectEnum()
10	10
11		macro=275;
	11	macro=280;

issm/trunk/src/m/enum/IoGatherEnum.m

r7628	r7635
9	9	% macro=IoGatherEnum()
10	10
11		macro=247;
	11	macro=252;

issm/trunk/src/m/enum/IsHutterEnum.m

r7628	r7635
9	9	% macro=IsHutterEnum()
10	10
11		macro=~~298~~;
	11	macro=303;

issm/trunk/src/m/enum/IsMacAyealPattynEnum.m

r7628	r7635
9	9	% macro=IsMacAyealPattynEnum()
10	10
11		macro=~~299~~;
	11	macro=304;

issm/trunk/src/m/enum/IsStokesEnum.m

r7628	r7635
9	9	% macro=IsStokesEnum()
10	10
11		macro=300;
	11	macro=305;

issm/trunk/src/m/enum/IuToExtEnum.m

r7628	r7635
9	9	% macro=IuToExtEnum()
10	10
11		macro=159;
	11	macro=161;

issm/trunk/src/m/enum/JEnum.m

r7628	r7635
9	9	% macro=JEnum()
10	10
11		macro=241;
	11	macro=243;

issm/trunk/src/m/enum/KffEnum.m

r7628	r7635
9	9	% macro=KffEnum()
10	10
11		macro=301;
	11	macro=306;

issm/trunk/src/m/enum/KflagEnum.m

r7628	r7635
9	9	% macro=KflagEnum()
10	10
11		macro=158;
	11	macro=160;

issm/trunk/src/m/enum/LatentHeatEnum.m

r7628	r7635
9	9	% macro=LatentHeatEnum()
10	10
11		macro=302;
	11	macro=307;

issm/trunk/src/m/enum/LoadEnum.m

r7628	r7635
9	9	% macro=LoadEnum()
10	10
11		macro=73;
	11	macro=75;

issm/trunk/src/m/enum/LowmemEnum.m

r7628	r7635
9	9	% macro=LowmemEnum()
10	10
11		macro=303;
	11	macro=308;

issm/trunk/src/m/enum/MacAyeal2dIceFrontEnum.m

r7628	r7635
9	9	% macro=MacAyeal2dIceFrontEnum()
10	10
11		macro=81;
	11	macro=83;

issm/trunk/src/m/enum/MacAyeal3dIceFrontEnum.m

r7628	r7635
9	9	% macro=MacAyeal3dIceFrontEnum()
10	10
11		macro=82;
	11	macro=84;

issm/trunk/src/m/enum/MacAyealApproximationEnum.m

r7628	r7635
9	9	% macro=MacAyealApproximationEnum()
10	10
11		macro=55;
	11	macro=57;

issm/trunk/src/m/enum/MacAyealPattynApproximationEnum.m

r7628	r7635
9	9	% macro=MacAyealPattynApproximationEnum()
10	10
11		macro=56;
	11	macro=58;

issm/trunk/src/m/enum/MacAyealStokesApproximationEnum.m

r7628	r7635
9	9	% macro=MacAyealStokesApproximationEnum()
10	10
11		macro=57;
	11	macro=59;

issm/trunk/src/m/enum/MassFluxEnum.m

r7628	r7635
9	9	% macro=MassFluxEnum()
10	10
11		macro=161;
	11	macro=163;

issm/trunk/src/m/enum/MaterialEnum.m

r7628	r7635
9	9	% macro=MaterialEnum()
10	10
11		macro=85;
	11	macro=87;

issm/trunk/src/m/enum/MaticeEnum.m

r7628	r7635
9	9	% macro=MaticeEnum()
10	10
11		macro=86;
	11	macro=88;

issm/trunk/src/m/enum/MatparEnum.m

r7628	r7635
9	9	% macro=MatparEnum()
10	10
11		macro=87;
	11	macro=89;

issm/trunk/src/m/enum/MaxAbsVxEnum.m

r7628	r7635
9	9	% macro=MaxAbsVxEnum()
10	10
11		macro=252;
	11	macro=257;

issm/trunk/src/m/enum/MaxAbsVyEnum.m

r7628	r7635
9	9	% macro=MaxAbsVyEnum()
10	10
11		macro=255;
	11	macro=260;

issm/trunk/src/m/enum/MaxAbsVzEnum.m

r7628	r7635
9	9	% macro=MaxAbsVzEnum()
10	10
11		macro=258;
	11	macro=263;

issm/trunk/src/m/enum/MaxIterEnum.m

r7628	r7635
9	9	% macro=MaxIterEnum()
10	10
11		macro=304;
	11	macro=309;

issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m

r7628	r7635
9	9	% macro=MaxNonlinearIterationsEnum()
10	10
11		macro=305;
	11	macro=310;

issm/trunk/src/m/enum/MaxPenetrationEnum.m

r7628	r7635
9	9	% macro=MaxPenetrationEnum()
10	10
11		macro=168;
	11	macro=170;

issm/trunk/src/m/enum/MaxVelEnum.m

r7628	r7635
9	9	% macro=MaxVelEnum()
10	10
11		macro=249;
	11	macro=254;

issm/trunk/src/m/enum/MaxVxEnum.m

r7628	r7635
9	9	% macro=MaxVxEnum()
10	10
11		macro=251;
	11	macro=256;

issm/trunk/src/m/enum/MaxVyEnum.m

r7628	r7635
9	9	% macro=MaxVyEnum()
10	10
11		macro=254;
	11	macro=259;

issm/trunk/src/m/enum/MaxVzEnum.m

r7628	r7635
9	9	% macro=MaxVzEnum()
10	10
11		macro=257;
	11	macro=262;

issm/trunk/src/m/enum/MeanVelEnum.m

r7628	r7635
9	9	% macro=MeanVelEnum()
10	10
11		macro=169;
	11	macro=171;

issm/trunk/src/m/enum/MelangeEnum.m

r7628	r7635
9	9	% macro=MelangeEnum()
10	10
11		macro=117;
	11	macro=119;

issm/trunk/src/m/enum/MeltingAnalysisEnum.m

r7628	r7635
9	9	% macro=MeltingAnalysisEnum()
10	10
11		macro=47;
	11	macro=49;

issm/trunk/src/m/enum/MeltingOffsetEnum.m

r7628	r7635
9	9	% macro=MeltingOffsetEnum()
10	10
11		macro=170;
	11	macro=172;

issm/trunk/src/m/enum/MeltingPointEnum.m

r7628	r7635
9	9	% macro=MeltingPointEnum()
10	10
11		macro=306;
	11	macro=311;

issm/trunk/src/m/enum/MeltingRateCorrectionApplyEnum.m

r7628	r7635
9	9	% macro=MeltingRateCorrectionApplyEnum()
10	10
11		macro=271;
	11	macro=276;

issm/trunk/src/m/enum/MeltingRateCorrectionEnum.m

r7628	r7635
9	9	% macro=MeltingRateCorrectionEnum()
10	10
11		macro=270;
	11	macro=275;

issm/trunk/src/m/enum/MeltingRateEnum.m

r7628	r7635
9	9	% macro=MeltingRateEnum()
10	10
11		macro=172;
	11	macro=174;

issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m

r7628	r7635
9	9	% macro=MinMechanicalConstraintsEnum()
10	10
11		macro=307;
	11	macro=312;

issm/trunk/src/m/enum/MinThermalConstraintsEnum.m

r7628	r7635
9	9	% macro=MinThermalConstraintsEnum()
10	10
11		macro=308;
	11	macro=313;

issm/trunk/src/m/enum/MinVelEnum.m

r7628	r7635
9	9	% macro=MinVelEnum()
10	10
11		macro=248;
	11	macro=253;

issm/trunk/src/m/enum/MinVxEnum.m

r7628	r7635
9	9	% macro=MinVxEnum()
10	10
11		macro=250;
	11	macro=255;

issm/trunk/src/m/enum/MinVyEnum.m

r7628	r7635
9	9	% macro=MinVyEnum()
10	10
11		macro=253;
	11	macro=258;

issm/trunk/src/m/enum/MinVzEnum.m

r7628	r7635
9	9	% macro=MinVzEnum()
10	10
11		macro=256;
	11	macro=261;

issm/trunk/src/m/enum/MiniEnum.m

r7628	r7635
9	9	% macro=MiniEnum()
10	10
11		macro=229;
	11	macro=231;

issm/trunk/src/m/enum/MisfitEnum.m

r7628	r7635
9	9	% macro=MisfitEnum()
10	10
11		macro=173;
	11	macro=175;

issm/trunk/src/m/enum/MixedLayerCapacityEnum.m

r7628	r7635
9	9	% macro=MixedLayerCapacityEnum()
10	10
11		macro=272;
	11	macro=277;

issm/trunk/src/m/enum/NStepsEnum.m

r7628	r7635
9	9	% macro=NStepsEnum()
10	10
11		macro=309;
	11	macro=314;

issm/trunk/src/m/enum/NdtEnum.m

r7628	r7635
9	9	% macro=NdtEnum()
10	10
11		macro=310;
	11	macro=315;

issm/trunk/src/m/enum/NearestInterpEnum.m

r7628	r7635
9	9	% macro=NearestInterpEnum()
10	10
11		macro=351;
	11	macro=356;

issm/trunk/src/m/enum/NodalEnum.m

r7628	r7635
9	9	% macro=NodalEnum()
10	10
11		macro=334;
	11	macro=339;

issm/trunk/src/m/enum/NodeEnum.m

r7628	r7635
9	9	% macro=NodeEnum()
10	10
11		macro=71;
	11	macro=73;

issm/trunk/src/m/enum/NodeOnBedEnum.m

r7628	r7635
9	9	% macro=NodeOnBedEnum()
10	10
11		macro=174;
	11	macro=176;

issm/trunk/src/m/enum/NodeOnIceSheetEnum.m

r7628	r7635
9	9	% macro=NodeOnIceSheetEnum()
10	10
11		macro=175;
	11	macro=177;

issm/trunk/src/m/enum/NodeOnIceShelfEnum.m

r7628	r7635
9	9	% macro=NodeOnIceShelfEnum()
10	10
11		macro=176;
	11	macro=178;

issm/trunk/src/m/enum/NodeOnSurfaceEnum.m

r7628	r7635
9	9	% macro=NodeOnSurfaceEnum()
10	10
11		macro=177;
	11	macro=179;

issm/trunk/src/m/enum/NodePropertiesEnum.m

r7628	r7635
9	9	% macro=NodePropertiesEnum()
10	10
11		macro=68;
	11	macro=70;

issm/trunk/src/m/enum/NoneAnalysisEnum.m

r7628	r7635
9	9	% macro=NoneAnalysisEnum()
10	10
11		macro=52;
	11	macro=54;

issm/trunk/src/m/enum/NoneApproximationEnum.m

r7628	r7635
9	9	% macro=NoneApproximationEnum()
10	10
11		macro=58;
	11	macro=60;

issm/trunk/src/m/enum/NoneEnum.m

r7628	r7635
9	9	% macro=NoneEnum()
10	10
11		macro=263;
	11	macro=268;

issm/trunk/src/m/enum/NumControlsEnum.m

r7628	r7635
9	9	% macro=NumControlsEnum()
10	10
11		macro=136;
	11	macro=138;

issm/trunk/src/m/enum/NumOutputEnum.m

r7628	r7635
9	9	% macro=NumOutputEnum()
10	10
11		macro=311;
	11	macro=316;

issm/trunk/src/m/enum/NumRiftsEnum.m

r7628	r7635
9	9	% macro=NumRiftsEnum()
10	10
11		macro=312;
	11	macro=317;

issm/trunk/src/m/enum/NumberNodeToElementConnectivityEnum.m

r7628	r7635
9	9	% macro=NumberNodeToElementConnectivityEnum()
10	10
11		macro=178;
	11	macro=180;

issm/trunk/src/m/enum/NumberOfElementsEnum.m

r7628	r7635
9	9	% macro=NumberOfElementsEnum()
10	10
11		macro=313;
	11	macro=318;

issm/trunk/src/m/enum/NumberOfNodesEnum.m

r7628	r7635
9	9	% macro=NumberOfNodesEnum()
10	10
11		macro=314;
	11	macro=319;

issm/trunk/src/m/enum/NumberOfVerticesEnum.m

r7628	r7635
9	9	% macro=NumberOfVerticesEnum()
10	10
11		macro=315;
	11	macro=320;

issm/trunk/src/m/enum/NumericalfluxEnum.m

r7628	r7635
9	9	% macro=NumericalfluxEnum()
10	10
11		macro=75;
	11	macro=77;

issm/trunk/src/m/enum/ObjectEnum.m

r7628	r7635
9	9	% macro=ObjectEnum()
10	10
11		macro=62;
	11	macro=64;

issm/trunk/src/m/enum/OldGradientEnum.m

r7628	r7635
9	9	% macro=OldGradientEnum()
10	10
11		macro=288;
	11	macro=293;

issm/trunk/src/m/enum/OpenEnum.m

r7628	r7635
9	9	% macro=OpenEnum()
10	10
11		macro=119;
	11	macro=121;

issm/trunk/src/m/enum/OptScalEnum.m

r7628	r7635
9	9	% macro=OptScalEnum()
10	10
11		macro=316;
	11	macro=321;

issm/trunk/src/m/enum/OutputFileNameEnum.m

r7628	r7635
9	9	% macro=OutputFileNameEnum()
10	10
11		macro=318;
	11	macro=323;

issm/trunk/src/m/enum/OutputFilePointerEnum.m

r7628	r7635
9	9	% macro=OutputFilePointerEnum()
10	10
11		macro=317;
	11	macro=322;

issm/trunk/src/m/enum/OutputFrequencyEnum.m

r7628	r7635
9	9	% macro=OutputFrequencyEnum()
10	10
11		macro=246;
	11	macro=248;

issm/trunk/src/m/enum/P0Enum.m

r7628	r7635
9	9	% macro=P0Enum()
10	10
11		macro=226;
	11	macro=228;

issm/trunk/src/m/enum/P1DGEnum.m

r7628	r7635
9	9	% macro=P1DGEnum()
10	10
11		macro=228;
	11	macro=230;

issm/trunk/src/m/enum/P1Enum.m

r7628	r7635
9	9	% macro=P1Enum()
10	10
11		macro=227;
	11	macro=229;

issm/trunk/src/m/enum/ParamEnum.m

r7628	r7635
9	9	% macro=ParamEnum()
10	10
11		macro=95;
	11	macro=97;

issm/trunk/src/m/enum/ParameterOutputEnum.m

r7628	r7635
9	9	% macro=ParameterOutputEnum()
10	10
11		macro=319;
	11	macro=324;

issm/trunk/src/m/enum/ParametersAnalysisEnum.m

r7628	r7635
9	9	% macro=ParametersAnalysisEnum()
10	10
11		macro=49;
	11	macro=51;

issm/trunk/src/m/enum/ParametersSolutionEnum.m

r7628	r7635
9	9	% macro=ParametersSolutionEnum()
10	10
11		macro=48;
	11	macro=50;

issm/trunk/src/m/enum/PatchEnum.m

r7628	r7635
9	9	% macro=PatchEnum()
10	10
11		macro=242;
	11	macro=244;

issm/trunk/src/m/enum/PatchNodesEnum.m

r7628	r7635
9	9	% macro=PatchNodesEnum()
10	10
11		macro=244;
	11	macro=246;

issm/trunk/src/m/enum/PatchVerticesEnum.m

r7628	r7635
9	9	% macro=PatchVerticesEnum()
10	10
11		macro=243;
	11	macro=245;

issm/trunk/src/m/enum/PattynApproximationEnum.m

r7628	r7635
9	9	% macro=PattynApproximationEnum()
10	10
11		macro=59;
	11	macro=61;

issm/trunk/src/m/enum/PattynIceFrontEnum.m

r7628	r7635
9	9	% macro=PattynIceFrontEnum()
10	10
11		macro=83;
	11	macro=85;

issm/trunk/src/m/enum/PattynStokesApproximationEnum.m

r7628	r7635
9	9	% macro=PattynStokesApproximationEnum()
10	10
11		macro=60;
	11	macro=62;

issm/trunk/src/m/enum/PenaltyMeltingEnum.m

r7628	r7635
9	9	% macro=PenaltyMeltingEnum()
10	10
11		macro=320;
	11	macro=325;

issm/trunk/src/m/enum/PenaltyOffsetEnum.m

r7628	r7635
9	9	% macro=PenaltyOffsetEnum()
10	10
11		macro=179;
	11	macro=181;

issm/trunk/src/m/enum/PengridEnum.m

r7628	r7635
9	9	% macro=PengridEnum()
10	10
11		macro=76;
	11	macro=78;

issm/trunk/src/m/enum/PenpairEnum.m

r7628	r7635
9	9	% macro=PenpairEnum()
10	10
11		macro=77;
	11	macro=79;

issm/trunk/src/m/enum/PentaEnum.m

r7628	r7635
9	9	% macro=PentaEnum()
10	10
11		macro=69;
	11	macro=71;

issm/trunk/src/m/enum/PentaVertexElementResultEnum.m

r7628	r7635
9	9	% macro=PentaVertexElementResultEnum()
10	10
11		macro=232;
	11	macro=234;

issm/trunk/src/m/enum/PentaVertexInputEnum.m

r7628	r7635
9	9	% macro=PentaVertexInputEnum()
10	10
11		macro=92;
	11	macro=94;

issm/trunk/src/m/enum/PetscMatParamEnum.m

r7628	r7635
9	9	% macro=PetscMatParamEnum()
10	10
11		macro=104;
	11	macro=106;

issm/trunk/src/m/enum/PetscOptionsAnalysesEnum.m

r7628	r7635
9	9	% macro=PetscOptionsAnalysesEnum()
10	10
11		macro=343;
	11	macro=348;

issm/trunk/src/m/enum/PetscOptionsStringsEnum.m

r7628	r7635
9	9	% macro=PetscOptionsStringsEnum()
10	10
11		macro=342;
	11	macro=347;

issm/trunk/src/m/enum/PetscRcEnum.m

r7628	r7635
9	9	% macro=PetscRcEnum()
10	10
11		macro=336;
	11	macro=341;

issm/trunk/src/m/enum/PetscVecExternalResultEnum.m

r7628	r7635
9	9	% macro=PetscVecExternalResultEnum()
10	10
11		macro=239;
	11	macro=241;

issm/trunk/src/m/enum/PetscVecParamEnum.m

r7628	r7635
9	9	% macro=PetscVecParamEnum()
10	10
11		macro=105;
	11	macro=107;

issm/trunk/src/m/enum/PflagEnum.m

r7628	r7635
9	9	% macro=PflagEnum()
10	10
11		macro=180;
	11	macro=182;

issm/trunk/src/m/enum/PressureEnum.m

r7628	r7635
9	9	% macro=PressureEnum()
10	10
11		macro=181;
	11	macro=183;

issm/trunk/src/m/enum/PressureOldEnum.m

r7628	r7635
9	9	% macro=PressureOldEnum()
10	10
11		macro=183;
	11	macro=185;

issm/trunk/src/m/enum/PrognosticAnalysisEnum.m

r7628	r7635
9	9	% macro=PrognosticAnalysisEnum()
10	10
11		macro=46;
	11	macro=48;

issm/trunk/src/m/enum/PrognosticSolutionEnum.m

r7628	r7635
9	9	% macro=PrognosticSolutionEnum()
10	10
11		macro=45;
	11	macro=47;

issm/trunk/src/m/enum/QmuAnalysisEnum.m

r7628	r7635
9	9	% macro=QmuAnalysisEnum()
10	10
11		macro=321;
	11	macro=326;

issm/trunk/src/m/enum/QmuErrNameEnum.m

r7628	r7635
9	9	% macro=QmuErrNameEnum()
10	10
11		macro=322;
	11	macro=327;

issm/trunk/src/m/enum/QmuInNameEnum.m

r7628	r7635
9	9	% macro=QmuInNameEnum()
10	10
11		macro=323;
	11	macro=328;

issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m

r7628	r7635
9	9	% macro=QmuMassFluxSegmentsEnum()
10	10
11		macro=324;
	11	macro=329;

issm/trunk/src/m/enum/QmuNPartEnum.m

r7628	r7635
9	9	% macro=QmuNPartEnum()
10	10
11		macro=325;
	11	macro=330;

issm/trunk/src/m/enum/QmuNumberOfResponsesEnum.m

r7628	r7635
9	9	% macro=QmuNumberOfResponsesEnum()
10	10
11		macro=328;
	11	macro=333;

issm/trunk/src/m/enum/QmuOutNameEnum.m

r7628	r7635
9	9	% macro=QmuOutNameEnum()
10	10
11		macro=326;
	11	macro=331;

issm/trunk/src/m/enum/QmuPartEnum.m

r7628	r7635
9	9	% macro=QmuPartEnum()
10	10
11		macro=327;
	11	macro=332;

issm/trunk/src/m/enum/QmuPressureEnum.m

r7628	r7635
9	9	% macro=QmuPressureEnum()
10	10
11		macro=184;
	11	macro=186;

issm/trunk/src/m/enum/QmuSaveFemmodelEnum.m

r7628	r7635
9	9	% macro=QmuSaveFemmodelEnum()
10	10
11		macro=329;
	11	macro=334;

issm/trunk/src/m/enum/QmuVxEnum.m

r7628	r7635
9	9	% macro=QmuVxEnum()
10	10
11		macro=211;
	11	macro=213;

issm/trunk/src/m/enum/QmuVyEnum.m

r7628	r7635
9	9	% macro=QmuVyEnum()
10	10
11		macro=216;
	11	macro=218;

issm/trunk/src/m/enum/QmuVzEnum.m

r7628	r7635
9	9	% macro=QmuVzEnum()
10	10
11		macro=224;
	11	macro=226;

issm/trunk/src/m/enum/QuadRiftFrontEnum.m

r7628	r7635
9	9	% macro=QuadRiftFrontEnum()
10	10
11		macro=78;
	11	macro=80;

issm/trunk/src/m/enum/RegularEnum.m

r7628	r7635
9	9	% macro=RegularEnum()
10	10
11		macro=331;
	11	macro=336;

issm/trunk/src/m/enum/RelativeEnum.m

r7628	r7635
9	9	% macro=RelativeEnum()
10	10
11		macro=259;
	11	macro=264;

issm/trunk/src/m/enum/ResetPenaltiesEnum.m

r7628	r7635
9	9	% macro=ResetPenaltiesEnum()
10	10
11		macro=185;
	11	macro=187;

issm/trunk/src/m/enum/ResidualEnum.m

r7628	r7635
9	9	% macro=ResidualEnum()
10	10
11		macro=260;
	11	macro=265;

issm/trunk/src/m/enum/ResponseDescriptorsEnum.m

r7628	r7635
9	9	% macro=ResponseDescriptorsEnum()
10	10
11		macro=335;
	11	macro=340;

issm/trunk/src/m/enum/RheologyBEnum.m

r7628	r7635
9	9	% macro=RheologyBEnum()
10	10
11		macro=186;
	11	macro=188;

issm/trunk/src/m/enum/RheologyBbarEnum.m

r7628	r7635
9	9	% macro=RheologyBbarEnum()
10	10
11		macro=187;
	11	macro=189;

issm/trunk/src/m/enum/RheologyNEnum.m

r7628	r7635
9	9	% macro=RheologyNEnum()
10	10
11		macro=188;
	11	macro=190;

issm/trunk/src/m/enum/RhoIceEnum.m

r7628	r7635
9	9	% macro=RhoIceEnum()
10	10
11		macro=266;
	11	macro=271;

issm/trunk/src/m/enum/RhoWaterEnum.m

r7628	r7635
9	9	% macro=RhoWaterEnum()
10	10
11		macro=267;
	11	macro=272;

issm/trunk/src/m/enum/RiftfrontEnum.m

r7628	r7635
9	9	% macro=RiftfrontEnum()
10	10
11		macro=79;
	11	macro=81;

issm/trunk/src/m/enum/ScaledEnum.m

r7628	r7635
9	9	% macro=ScaledEnum()
10	10
11		macro=333;
	11	macro=338;

issm/trunk/src/m/enum/SegmentEnum.m

r7628	r7635
9	9	% macro=SegmentEnum()
10	10
11		macro=64;
	11	macro=66;

issm/trunk/src/m/enum/SegmentOnIceShelfEnum.m

r7628	r7635
9	9	% macro=SegmentOnIceShelfEnum()
10	10
11		macro=189;
	11	macro=191;

issm/trunk/src/m/enum/SegmentRiftfrontEnum.m

r7628	r7635
9	9	% macro=SegmentRiftfrontEnum()
10	10
11		macro=80;
	11	macro=82;

issm/trunk/src/m/enum/SeparateEnum.m

r7628	r7635
9	9	% macro=SeparateEnum()
10	10
11		macro=277;
	11	macro=282;

issm/trunk/src/m/enum/ShelfDampeningEnum.m

r7628	r7635
9	9	% macro=ShelfDampeningEnum()
10	10
11		macro=190;
	11	macro=192;

issm/trunk/src/m/enum/SoftMigrationEnum.m

r7628	r7635
9	9	% macro=SoftMigrationEnum()
10	10
11		macro=265;
	11	macro=270;

issm/trunk/src/m/enum/SparsityEnum.m

r7628	r7635
9	9	% macro=SparsityEnum()
10	10
11		macro=337;
	11	macro=342;

issm/trunk/src/m/enum/SpcEnum.m

r7628	r7635
9	9	% macro=SpcEnum()
10	10
11		macro=110;
	11	macro=112;

issm/trunk/src/m/enum/SsetEnum.m

r7628	r7635
9	9	% macro=SsetEnum()
10	10
11		macro=346;
	11	macro=351;

issm/trunk/src/m/enum/StabilizeConstraintsEnum.m

r7628	r7635
9	9	% macro=StabilizeConstraintsEnum()
10	10
11		macro=191;
	11	macro=193;

issm/trunk/src/m/enum/SteadyAnalysisEnum.m

r7628	r7635
9	9	% macro=SteadyAnalysisEnum()
10	10
11		macro=31;
	11	macro=33;

issm/trunk/src/m/enum/SteadystateAnalysisEnum.m

r7628	r7635
9	9	% macro=SteadystateAnalysisEnum()
10	10
11		macro=51;
	11	macro=53;

issm/trunk/src/m/enum/SteadystateSolutionEnum.m

r7628	r7635
9	9	% macro=SteadystateSolutionEnum()
10	10
11		macro=50;
	11	macro=52;

issm/trunk/src/m/enum/StokesApproximationEnum.m

r7628	r7635
9	9	% macro=StokesApproximationEnum()
10	10
11		macro=61;
	11	macro=63;

issm/trunk/src/m/enum/StokesIceFrontEnum.m

r7628	r7635
9	9	% macro=StokesIceFrontEnum()
10	10
11		macro=84;
	11	macro=86;

issm/trunk/src/m/enum/StokesReconditioningEnum.m

r7628	r7635
9	9	% macro=StokesReconditioningEnum()
10	10
11		macro=192;
	11	macro=194;

issm/trunk/src/m/enum/StokesSolverEnum.m

r7628	r7635
9	9	% macro=StokesSolverEnum()
10	10
11		macro=274;
	11	macro=279;

issm/trunk/src/m/enum/StringArrayParamEnum.m

r7628	r7635
9	9	% macro=StringArrayParamEnum()
10	10
11		macro=106;
	11	macro=108;

issm/trunk/src/m/enum/StringExternalResultEnum.m

r7628	r7635
9	9	% macro=StringExternalResultEnum()
10	10
11		macro=240;
	11	macro=242;

issm/trunk/src/m/enum/StringParamEnum.m

r7628	r7635
9	9	% macro=StringParamEnum()
10	10
11		macro=107;
	11	macro=109;

issm/trunk/src/m/enum/StringToEnum.m

-              r7628
+              r7635
                         elseif (strcmpi(name,'ThermalSolution')), enum=ThermalSolutionEnum(); return
                         elseif (strcmpi(name,'ThermalAnalysis')), enum=ThermalAnalysisEnum(); return
+                        elseif (strcmpi(name,'HydrologySolution')), enum=HydrologySolutionEnum(); return
+                        elseif (strcmpi(name,'HydrologyAnalysis')), enum=HydrologyAnalysisEnum(); return
                         elseif (strcmpi(name,'Transient2DSolution')), enum=Transient2DSolutionEnum(); return
                         elseif (strcmpi(name,'Transient2DAnalysis')), enum=Transient2DAnalysisEnum(); return
 …
                         elseif (strcmpi(name,'Time')), enum=TimeEnum(); return
                         elseif (strcmpi(name,'OutputFrequency')), enum=OutputFrequencyEnum(); return
+                        elseif (strcmpi(name,'WaterColumn')), enum=WaterColumnEnum(); return
+                        elseif (strcmpi(name,'OldWaterColumn')), enum=OldWaterColumnEnum(); return
+                        elseif (strcmpi(name,'PicardWaterColumn')), enum=PicardWaterColumnEnum(); return
                         elseif (strcmpi(name,'IoGather')), enum=IoGatherEnum(); return
                         elseif (strcmpi(name,'MinVel')), enum=MinVelEnum(); return

issm/trunk/src/m/enum/SurfaceAbsVelMisfitEnum.m

r7628	r7635
9	9	% macro=SurfaceAbsVelMisfitEnum()
10	10
11		macro=163;
	11	macro=165;

issm/trunk/src/m/enum/SurfaceAreaEnum.m

r7628	r7635
9	9	% macro=SurfaceAreaEnum()
10	10
11		macro=193;
	11	macro=195;

issm/trunk/src/m/enum/SurfaceAverageVelMisfitEnum.m

r7628	r7635
9	9	% macro=SurfaceAverageVelMisfitEnum()
10	10
11		macro=167;
	11	macro=169;

issm/trunk/src/m/enum/SurfaceEnum.m

r7628	r7635
9	9	% macro=SurfaceEnum()
10	10
11		macro=194;
	11	macro=196;

issm/trunk/src/m/enum/SurfaceLogVelMisfitEnum.m

r7628	r7635
9	9	% macro=SurfaceLogVelMisfitEnum()
10	10
11		macro=165;
	11	macro=167;

issm/trunk/src/m/enum/SurfaceLogVxVyMisfitEnum.m

r7628	r7635
9	9	% macro=SurfaceLogVxVyMisfitEnum()
10	10
11		macro=166;
	11	macro=168;

issm/trunk/src/m/enum/SurfaceRelVelMisfitEnum.m

r7628	r7635
9	9	% macro=SurfaceRelVelMisfitEnum()
10	10
11		macro=164;
	11	macro=166;

issm/trunk/src/m/enum/SurfaceSlopeAnalysisEnum.m

r7628	r7635
9	9	% macro=SurfaceSlopeAnalysisEnum()
10	10
11		macro=36;
	11	macro=38;

issm/trunk/src/m/enum/SurfaceSlopeSolutionEnum.m

r7628	r7635
9	9	% macro=SurfaceSlopeSolutionEnum()
10	10
11		macro=35;
	11	macro=37;

issm/trunk/src/m/enum/SurfaceSlopeXAnalysisEnum.m

r7628	r7635
9	9	% macro=SurfaceSlopeXAnalysisEnum()
10	10
11		macro=39;
	11	macro=41;

issm/trunk/src/m/enum/SurfaceSlopeXEnum.m

r7628	r7635
9	9	% macro=SurfaceSlopeXEnum()
10	10
11		macro=195;
	11	macro=197;

issm/trunk/src/m/enum/SurfaceSlopeYAnalysisEnum.m

r7628	r7635
9	9	% macro=SurfaceSlopeYAnalysisEnum()
10	10
11		macro=40;
	11	macro=42;

issm/trunk/src/m/enum/SurfaceSlopeYEnum.m

r7628	r7635
9	9	% macro=SurfaceSlopeYEnum()
10	10
11		macro=196;
	11	macro=198;

issm/trunk/src/m/enum/TemperatureEnum.m

r7628	r7635
9	9	% macro=TemperatureEnum()
10	10
11		macro=197;
	11	macro=199;

issm/trunk/src/m/enum/TemperatureOldEnum.m

r7628	r7635
9	9	% macro=TemperatureOldEnum()
10	10
11		macro=~~199~~;
	11	macro=201;

issm/trunk/src/m/enum/TemporaryTemperatureEnum.m

r7628	r7635
9	9	% macro=TemporaryTemperatureEnum()
10	10
11		macro=~~198~~;
	11	macro=200;

issm/trunk/src/m/enum/ThermalConductivityEnum.m

r7628	r7635
9	9	% macro=ThermalConductivityEnum()
10	10
11		macro=269;
	11	macro=274;

issm/trunk/src/m/enum/ThermalExchangeVelocityEnum.m

r7628	r7635
9	9	% macro=ThermalExchangeVelocityEnum()
10	10
11		macro=273;
	11	macro=278;

issm/trunk/src/m/enum/ThicknessAbsMisfitEnum.m

r7628	r7635
9	9	% macro=ThicknessAbsMisfitEnum()
10	10
11		macro=162;
	11	macro=164;

issm/trunk/src/m/enum/ThicknessCoeffEnum.m

r7628	r7635
9	9	% macro=ThicknessCoeffEnum()
10	10
11		macro=201;
	11	macro=203;

issm/trunk/src/m/enum/ThicknessEnum.m

r7628	r7635
9	9	% macro=ThicknessEnum()
10	10
11		macro=200;
	11	macro=202;

issm/trunk/src/m/enum/ThicknessObsEnum.m

r7628	r7635
9	9	% macro=ThicknessObsEnum()
10	10
11		macro=202;
	11	macro=204;

issm/trunk/src/m/enum/TimeAdaptEnum.m

r7628	r7635
9	9	% macro=TimeAdaptEnum()
10	10
11		macro=145;
	11	macro=147;

issm/trunk/src/m/enum/TimeEnum.m

r7628	r7635
9	9	% macro=TimeEnum()
10	10
11		macro=245;
	11	macro=247;

issm/trunk/src/m/enum/TolXEnum.m

r7628	r7635
9	9	% macro=TolXEnum()
10	10
11		macro=338;
	11	macro=343;

issm/trunk/src/m/enum/Transient2DAnalysisEnum.m

r7628	r7635
9	9	% macro=Transient2DAnalysisEnum()
10	10
11		macro=27;
	11	macro=29;

issm/trunk/src/m/enum/Transient2DSolutionEnum.m

r7628	r7635
9	9	% macro=Transient2DSolutionEnum()
10	10
11		macro=26;
	11	macro=28;

issm/trunk/src/m/enum/Transient3DAnalysisEnum.m

r7628	r7635
9	9	% macro=Transient3DAnalysisEnum()
10	10
11		macro=29;
	11	macro=31;

issm/trunk/src/m/enum/Transient3DSolutionEnum.m

r7628	r7635
9	9	% macro=Transient3DSolutionEnum()
10	10
11		macro=28;
	11	macro=30;

issm/trunk/src/m/enum/TransientAnalysisEnum.m

r7628	r7635
9	9	% macro=TransientAnalysisEnum()
10	10
11		macro=32;
	11	macro=34;

issm/trunk/src/m/enum/TriaEnum.m

r7628	r7635
9	9	% macro=TriaEnum()
10	10
11		macro=70;
	11	macro=72;

issm/trunk/src/m/enum/TriaVertexElementResultEnum.m

r7628	r7635
9	9	% macro=TriaVertexElementResultEnum()
10	10
11		macro=231;
	11	macro=233;

issm/trunk/src/m/enum/TriaVertexInputEnum.m

r7628	r7635
9	9	% macro=TriaVertexInputEnum()
10	10
11		macro=93;
	11	macro=95;

issm/trunk/src/m/enum/TriangleInterpEnum.m

r7628	r7635
9	9	% macro=TriangleInterpEnum()
10	10
11		macro=349;
	11	macro=354;

issm/trunk/src/m/enum/TypeEnum.m

r7628	r7635
9	9	% macro=TypeEnum()
10	10
11		macro=203;
	11	macro=205;

issm/trunk/src/m/enum/VariableDescriptorsEnum.m

r7628	r7635
9	9	% macro=VariableDescriptorsEnum()
10	10
11		macro=339;
	11	macro=344;

issm/trunk/src/m/enum/VelEnum.m

r7628	r7635
9	9	% macro=VelEnum()
10	10
11		macro=204;
	11	macro=206;

issm/trunk/src/m/enum/VelObsEnum.m

r7628	r7635
9	9	% macro=VelObsEnum()
10	10
11		macro=205;
	11	macro=207;

issm/trunk/src/m/enum/VelocityEnum.m

r7628	r7635
9	9	% macro=VelocityEnum()
10	10
11		macro=182;
	11	macro=184;

issm/trunk/src/m/enum/VerboseEnum.m

r7628	r7635
9	9	% macro=VerboseEnum()
10	10
11		macro=340;
	11	macro=345;

issm/trunk/src/m/enum/VertexEnum.m

r7628	r7635
9	9	% macro=VertexEnum()
10	10
11		macro=72;
	11	macro=74;

issm/trunk/src/m/enum/ViscosityOvershootEnum.m

r7628	r7635
9	9	% macro=ViscosityOvershootEnum()
10	10
11		macro=206;
	11	macro=208;

issm/trunk/src/m/enum/VxAverageEnum.m

r7628	r7635
9	9	% macro=VxAverageEnum()
10	10
11		macro=207;
	11	macro=209;

issm/trunk/src/m/enum/VxEnum.m

r7628	r7635
9	9	% macro=VxEnum()
10	10
11		macro=208;
	11	macro=210;

issm/trunk/src/m/enum/VxObsEnum.m

r7628	r7635
9	9	% macro=VxObsEnum()
10	10
11		macro=209;
	11	macro=211;

issm/trunk/src/m/enum/VxOldEnum.m

r7628	r7635
9	9	% macro=VxOldEnum()
10	10
11		macro=210;
	11	macro=212;

issm/trunk/src/m/enum/VyAverageEnum.m

r7628	r7635
9	9	% macro=VyAverageEnum()
10	10
11		macro=212;
	11	macro=214;

issm/trunk/src/m/enum/VyEnum.m

r7628	r7635
9	9	% macro=VyEnum()
10	10
11		macro=213;
	11	macro=215;

issm/trunk/src/m/enum/VyObsEnum.m

r7628	r7635
9	9	% macro=VyObsEnum()
10	10
11		macro=214;
	11	macro=216;

issm/trunk/src/m/enum/VyOldEnum.m

r7628	r7635
9	9	% macro=VyOldEnum()
10	10
11		macro=215;
	11	macro=217;

issm/trunk/src/m/enum/VzAverageEnum.m

r7628	r7635
9	9	% macro=VzAverageEnum()
10	10
11		macro=217;
	11	macro=219;

issm/trunk/src/m/enum/VzEnum.m

r7628	r7635
9	9	% macro=VzEnum()
10	10
11		macro=218;
	11	macro=220;

issm/trunk/src/m/enum/VzMacAyealEnum.m

r7628	r7635
9	9	% macro=VzMacAyealEnum()
10	10
11		macro=221;
	11	macro=223;

issm/trunk/src/m/enum/VzObsEnum.m

r7628	r7635
9	9	% macro=VzObsEnum()
10	10
11		macro=219;
	11	macro=221;

issm/trunk/src/m/enum/VzOldEnum.m

r7628	r7635
9	9	% macro=VzOldEnum()
10	10
11		macro=220;
	11	macro=222;

issm/trunk/src/m/enum/VzPattynEnum.m

r7628	r7635
9	9	% macro=VzPattynEnum()
10	10
11		macro=222;
	11	macro=224;

issm/trunk/src/m/enum/VzStokesEnum.m

r7628	r7635
9	9	% macro=VzStokesEnum()
10	10
11		macro=223;
	11	macro=225;

issm/trunk/src/m/enum/WaitOnLockEnum.m

r7628	r7635
9	9	% macro=WaitOnLockEnum()
10	10
11		macro=341;
	11	macro=346;

issm/trunk/src/m/enum/WaterEnum.m

r7628	r7635
9	9	% macro=WaterEnum()
10	10
11		macro=114;
	11	macro=116;

issm/trunk/src/m/enum/WeightsEnum.m

r7628	r7635
9	9	% macro=WeightsEnum()
10	10
11		macro=225;
	11	macro=227;

issm/trunk/src/m/enum/YtsEnum.m

r7628	r7635
9	9	% macro=YtsEnum()
10	10
11		macro=348;
	11	macro=353;

Note: See TracChangeset for help on using the changeset viewer.