Changeset 5526

Timestamp:

08/23/10 17:30:40 (15 years ago)

Author:

Eric.Larour

Message:

Added IuToExtEnum and ExtToIuEnum, used in UnitConversion.

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/EnumDefinitions/EnumToString.cpp (modified) (1 diff)
• c/EnumDefinitions/StringToEnum.cpp (modified) (1 diff)
• m/enum/AbsoluteEnum.m (modified) (1 diff)
• m/enum/AdjointEnum.m (modified) (1 diff)
• m/enum/BetaEnum.m (modified) (1 diff)
• m/enum/BoolExternalResultEnum.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/ColinearEnum.m (modified) (1 diff)
• m/enum/ConnectivityEnum.m (modified) (1 diff)
• m/enum/ControlParameterEnum.m (modified) (1 diff)
• m/enum/ControlSteadyEnum.m (modified) (1 diff)
• m/enum/DakotaParameterEnum.m (modified) (1 diff)
• m/enum/DimEnum.m (modified) (1 diff)
• m/enum/DoubleElementResultEnum.m (modified) (1 diff)
• m/enum/DoubleExternalResultEnum.m (modified) (1 diff)
• m/enum/DoubleMatExternalResultEnum.m (modified) (1 diff)
• m/enum/DoubleVecExternalResultEnum.m (modified) (1 diff)
• m/enum/EnumToModelField.m (modified) (1 diff)
• m/enum/EnumToString.m (modified) (1 diff)
• 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/ExtToIuEnum.m (added)
• m/enum/GradientEnum.m (modified) (1 diff)
• m/enum/GravityEnum.m (modified) (1 diff)
• m/enum/HeatCapacityEnum.m (modified) (1 diff)
• m/enum/IndexEnum.m (modified) (1 diff)
• m/enum/IndexedEnum.m (modified) (1 diff)
• m/enum/IntExternalResultEnum.m (modified) (1 diff)
• m/enum/IntersectEnum.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 (added)
• m/enum/JEnum.m (modified) (1 diff)
• m/enum/LatentHeatEnum.m (modified) (1 diff)
• m/enum/LowmemEnum.m (modified) (1 diff)
• m/enum/MassFluxEnum.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/MeltingOffsetEnum.m (modified) (1 diff)
• m/enum/MeltingPointEnum.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/NodalEnum.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/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/OldGradientEnum.m (modified) (1 diff)
• m/enum/OptScalEnum.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/ParameterOutputEnum.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/PenaltyMeltingEnum.m (modified) (1 diff)
• m/enum/PenaltyOffsetEnum.m (modified) (1 diff)
• m/enum/PentaVertexElementResultEnum.m (modified) (1 diff)
• m/enum/PetscVecExternalResultEnum.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/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/QmuVxEnum.m (modified) (1 diff)
• m/enum/QmuVyEnum.m (modified) (1 diff)
• m/enum/QmuVzEnum.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/ScaledEnum.m (modified) (1 diff)
• m/enum/SegmentOnIceShelfEnum.m (modified) (1 diff)
• m/enum/SeparateEnum.m (modified) (1 diff)
• m/enum/SolverStringEnum.m (modified) (1 diff)
• m/enum/SparsityEnum.m (modified) (1 diff)
• m/enum/StabilizeConstraintsEnum.m (modified) (1 diff)
• m/enum/StokesReconditioningEnum.m (modified) (1 diff)
• m/enum/StringExternalResultEnum.m (modified) (1 diff)
• m/enum/StringToEnum.m (modified) (1 diff)
• 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/SurfaceSlopeXEnum.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/ThermalConductivityEnum.m (modified) (1 diff)
• m/enum/ThermalExchangeVelocityEnum.m (modified) (1 diff)
• m/enum/ThicknessAbsMisfitEnum.m (modified) (1 diff)
• m/enum/ThicknessEnum.m (modified) (1 diff)
• m/enum/ThicknessObsEnum.m (modified) (1 diff)
• m/enum/TimeEnum.m (modified) (1 diff)
• m/enum/TolXEnum.m (modified) (1 diff)
• m/enum/TriaVertexElementResultEnum.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/VerboseEnum.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/VzObsEnum.m (modified) (1 diff)
• m/enum/VzOldEnum.m (modified) (1 diff)
• m/enum/WaitOnLockEnum.m (modified) (1 diff)
• m/enum/WeightsEnum.m (modified) (1 diff)
• m/enum/YtsEnum.m (modified) (1 diff)

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

@@ -197 +197 @@
         InternalEnum,
         KflagEnum,
+        IuToExtEnum,
+        ExtToIuEnum,
         MassFluxEnum,
         ThicknessAbsMisfitEnum,

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

@@ -171 +171 @@
                 case InternalEnum : return "Internal";
                 case KflagEnum : return "Kflag";
+                case IuToExtEnum : return "IuToExt";
+                case ExtToIuEnum : return "ExtToIu";
                 case MassFluxEnum : return "MassFlux";
                 case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit";

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

@@ -169 +169 @@
         else if (strcmp(name,"Internal")==0) return InternalEnum;
         else if (strcmp(name,"Kflag")==0) return KflagEnum;
+        else if (strcmp(name,"IuToExt")==0) return IuToExtEnum;
+        else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum;
         else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
         else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;

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

@@ -9 +9 @@
 %      macro=AbsoluteEnum()
 
-macro=245;
+macro=247;

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

@@ -9 +9 @@
 %      macro=AdjointEnum()
 
-macro=260;
+macro=262;

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

@@ -9 +9 @@
 %      macro=BetaEnum()
 
-macro=255;
+macro=257;

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

@@ -9 +9 @@
 %      macro=BoolExternalResultEnum()
 
-macro=219;
+macro=221;

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

@@ -9 +9 @@
 %      macro=CmGradientEnum()
 
-macro=256;
+macro=258;

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

@@ -9 +9 @@
 %      macro=CmJumpEnum()
 
-macro=257;
+macro=259;

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

@@ -9 +9 @@
 %      macro=CmMaxEnum()
 
-macro=258;
+macro=260;

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

@@ -9 +9 @@
 %      macro=CmMinEnum()
 
-macro=259;
+macro=261;

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

@@ -9 +9 @@
 %      macro=ColinearEnum()
 
-macro=253;
+macro=255;

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

@@ -9 +9 @@
 %      macro=ConnectivityEnum()
 
-macro=263;
+macro=265;

issm/trunk/src/m/enum/ControlParameterEnum.m

@@ -9 +9 @@
 %      macro=ControlParameterEnum()
 
-macro=264;
+macro=266;

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

@@ -9 +9 @@
 %      macro=ControlSteadyEnum()
 
-macro=265;
+macro=267;

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

@@ -9 +9 @@
 %      macro=DakotaParameterEnum()
 
-macro=266;
+macro=268;

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

@@ -9 +9 @@
 %      macro=DimEnum()
 
-macro=267;
+macro=269;

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

@@ -9 +9 @@
 %      macro=DoubleElementResultEnum()
 
-macro=216;
+macro=218;

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

@@ -9 +9 @@
 %      macro=DoubleExternalResultEnum()
 
-macro=220;
+macro=222;

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

@@ -9 +9 @@
 %      macro=DoubleMatExternalResultEnum()
 
-macro=222;
+macro=224;

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

@@ -9 +9 @@
 %      macro=DoubleVecExternalResultEnum()
 
-macro=221;
+macro=223;

issm/trunk/src/m/enum/EnumToModelField.m

@@ -16 +16 @@
                 case RheologyBbarEnum(), string='rheology_B'; return
                 case DhDtEnum(), string='dhdt'; return
+                case VxObsEnum(), string='vx_obs'; return
+                case VyObsEnum(), string='vy_obs'; return
                 otherwise, error(['Enum ' num2str(enum)  ' not found associated to any model field']);
 

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

@@ -166 +166 @@
 case InternalEnum(), string='Internal'; return
 case KflagEnum(), string='Kflag'; return
+case IuToExtEnum(), string='IuToExt'; return
+case ExtToIuEnum(), string='ExtToIu'; return
 case MassFluxEnum(), string='MassFlux'; return
 case ThicknessAbsMisfitEnum(), string='ThicknessAbsMisfit'; return

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

@@ -9 +9 @@
 %      macro=EpsAbsEnum()
 
-macro=268;
+macro=270;

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

@@ -9 +9 @@
 %      macro=EpsCmEnum()
 
-macro=269;
+macro=271;

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

@@ -9 +9 @@
 %      macro=EpsRelEnum()
 
-macro=270;
+macro=272;

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

@@ -9 +9 @@
 %      macro=EpsResEnum()
 
-macro=271;
+macro=273;

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

@@ -9 +9 @@
 %      macro=GradientEnum()
 
-macro=261;
+macro=263;

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

@@ -9 +9 @@
 %      macro=GravityEnum()
 
-macro=248;
+macro=250;

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

@@ -9 +9 @@
 %      macro=HeatCapacityEnum()
 
-macro=272;
+macro=274;

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

@@ -9 +9 @@
 %      macro=IndexEnum()
 
-macro=304;
+macro=306;

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

@@ -9 +9 @@
 %      macro=IndexedEnum()
 
-macro=302;
+macro=304;

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

@@ -9 +9 @@
 %      macro=IntExternalResultEnum()
 
-macro=223;
+macro=225;

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

@@ -9 +9 @@
 %      macro=IntersectEnum()
 
-macro=252;
+macro=254;

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

@@ -9 +9 @@
 %      macro=IsHutterEnum()
 
-macro=273;
+macro=275;

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

@@ -9 +9 @@
 %      macro=IsMacAyealPattynEnum()
 
-macro=274;
+macro=276;

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

@@ -9 +9 @@
 %      macro=IsStokesEnum()
 
-macro=275;
+macro=277;

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

@@ -9 +9 @@
 %      macro=JEnum()
 
-macro=226;
+macro=228;

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

@@ -9 +9 @@
 %      macro=LatentHeatEnum()
 
-macro=276;
+macro=278;

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

@@ -9 +9 @@
 %      macro=LowmemEnum()
 
-macro=277;
+macro=279;

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

@@ -9 +9 @@
 %      macro=MassFluxEnum()
 
-macro=155;
+macro=157;

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

@@ -9 +9 @@
 %      macro=MaxAbsVxEnum()
 
-macro=236;
+macro=238;

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

@@ -9 +9 @@
 %      macro=MaxAbsVyEnum()
 
-macro=239;
+macro=241;

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

@@ -9 +9 @@
 %      macro=MaxAbsVzEnum()
 
-macro=242;
+macro=244;

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

@@ -9 +9 @@
 %      macro=MaxIterEnum()
 
-macro=278;
+macro=280;

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

@@ -9 +9 @@
 %      macro=MaxNonlinearIterationsEnum()
 
-macro=279;
+macro=281;

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

@@ -9 +9 @@
 %      macro=MaxPenetrationEnum()
 
-macro=162;
+macro=164;

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

@@ -9 +9 @@
 %      macro=MaxVelEnum()
 
-macro=233;
+macro=235;

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

@@ -9 +9 @@
 %      macro=MaxVxEnum()
 
-macro=235;
+macro=237;

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

@@ -9 +9 @@
 %      macro=MaxVyEnum()
 
-macro=238;
+macro=240;

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

@@ -9 +9 @@
 %      macro=MaxVzEnum()
 
-macro=241;
+macro=243;

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

@@ -9 +9 @@
 %      macro=MeanVelEnum()
 
-macro=163;
+macro=165;

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

@@ -9 +9 @@
 %      macro=MeltingOffsetEnum()
 
-macro=164;
+macro=166;

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

@@ -9 +9 @@
 %      macro=MeltingPointEnum()
 
-macro=280;
+macro=282;

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

@@ -9 +9 @@
 %      macro=MeltingRateEnum()
 
-macro=165;
+macro=167;

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

@@ -9 +9 @@
 %      macro=MinMechanicalConstraintsEnum()
 
-macro=281;
+macro=283;

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

@@ -9 +9 @@
 %      macro=MinThermalConstraintsEnum()
 
-macro=282;
+macro=284;

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

@@ -9 +9 @@
 %      macro=MinVelEnum()
 
-macro=232;
+macro=234;

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

@@ -9 +9 @@
 %      macro=MinVxEnum()
 
-macro=234;
+macro=236;

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

@@ -9 +9 @@
 %      macro=MinVyEnum()
 
-macro=237;
+macro=239;

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

@@ -9 +9 @@
 %      macro=MinVzEnum()
 
-macro=240;
+macro=242;

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

@@ -9 +9 @@
 %      macro=MiniEnum()
 
-macro=215;
+macro=217;

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

@@ -9 +9 @@
 %      macro=MisfitEnum()
 
-macro=166;
+macro=168;

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

@@ -9 +9 @@
 %      macro=MixedLayerCapacityEnum()
 
-macro=250;
+macro=252;

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

@@ -9 +9 @@
 %      macro=NStepsEnum()
 
-macro=283;
+macro=285;

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

@@ -9 +9 @@
 %      macro=NdtEnum()
 
-macro=284;
+macro=286;

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

@@ -9 +9 @@
 %      macro=NodalEnum()
 
-macro=306;
+macro=308;

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

@@ -9 +9 @@
 %      macro=NodeOnBedEnum()
 
-macro=167;
+macro=169;

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

@@ -9 +9 @@
 %      macro=NodeOnIceSheetEnum()
 
-macro=168;
+macro=170;

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

@@ -9 +9 @@
 %      macro=NodeOnIceShelfEnum()
 
-macro=169;
+macro=171;

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

@@ -9 +9 @@
 %      macro=NodeOnSurfaceEnum()
 
-macro=170;
+macro=172;

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

@@ -9 +9 @@
 %      macro=NumOutputEnum()
 
-macro=285;
+macro=287;

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

@@ -9 +9 @@
 %      macro=NumRiftsEnum()
 
-macro=286;
+macro=288;

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

@@ -9 +9 @@
 %      macro=NumberNodeToElementConnectivityEnum()
 
-macro=171;
+macro=173;

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

@@ -9 +9 @@
 %      macro=NumberOfElementsEnum()
 
-macro=287;
+macro=289;

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

@@ -9 +9 @@
 %      macro=NumberOfNodesEnum()
 
-macro=288;
+macro=290;

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

@@ -9 +9 @@
 %      macro=NumberOfVerticesEnum()
 
-macro=289;
+macro=291;

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

@@ -9 +9 @@
 %      macro=OldGradientEnum()
 
-macro=262;
+macro=264;

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

@@ -9 +9 @@
 %      macro=OptScalEnum()
 
-macro=290;
+macro=292;

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

@@ -9 +9 @@
 %      macro=OutputFilePointerEnum()
 
-macro=291;
+macro=293;

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

@@ -9 +9 @@
 %      macro=OutputFrequencyEnum()
 
-macro=231;
+macro=233;

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

@@ -9 +9 @@
 %      macro=P0Enum()
 
-macro=212;
+macro=214;

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

@@ -9 +9 @@
 %      macro=P1DGEnum()
 
-macro=214;
+macro=216;

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

@@ -9 +9 @@
 %      macro=P1Enum()
 
-macro=213;
+macro=215;

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

@@ -9 +9 @@
 %      macro=ParameterOutputEnum()
 
-macro=292;
+macro=294;

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

@@ -9 +9 @@
 %      macro=PatchEnum()
 
-macro=227;
+macro=229;

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

@@ -9 +9 @@
 %      macro=PatchNodesEnum()
 
-macro=229;
+macro=231;

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

@@ -9 +9 @@
 %      macro=PatchVerticesEnum()
 
-macro=228;
+macro=230;

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

@@ -9 +9 @@
 %      macro=PenaltyMeltingEnum()
 
-macro=293;
+macro=295;

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

@@ -9 +9 @@
 %      macro=PenaltyOffsetEnum()
 
-macro=172;
+macro=174;

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

@@ -9 +9 @@
 %      macro=PentaVertexElementResultEnum()
 
-macro=218;
+macro=220;

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

@@ -9 +9 @@
 %      macro=PetscVecExternalResultEnum()
 
-macro=224;
+macro=226;

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

@@ -9 +9 @@
 %      macro=PflagEnum()
 
-macro=173;
+macro=175;

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

@@ -9 +9 @@
 %      macro=PressureEnum()
 
-macro=174;
+macro=176;

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

@@ -9 +9 @@
 %      macro=PressureOldEnum()
 
-macro=175;
+macro=177;

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

@@ -9 +9 @@
 %      macro=QmuAnalysisEnum()
 
-macro=294;
+macro=296;

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

@@ -9 +9 @@
 %      macro=QmuErrNameEnum()
 
-macro=295;
+macro=297;

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

@@ -9 +9 @@
 %      macro=QmuInNameEnum()
 
-macro=296;
+macro=298;

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

@@ -9 +9 @@
 %      macro=QmuMassFluxSegmentsEnum()
 
-macro=297;
+macro=299;

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

@@ -9 +9 @@
 %      macro=QmuNPartEnum()
 
-macro=298;
+macro=300;

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

@@ -9 +9 @@
 %      macro=QmuNumberOfResponsesEnum()
 
-macro=301;
+macro=303;

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

@@ -9 +9 @@
 %      macro=QmuOutNameEnum()
 
-macro=299;
+macro=301;

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

@@ -9 +9 @@
 %      macro=QmuPartEnum()
 
-macro=300;
+macro=302;

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

@@ -9 +9 @@
 %      macro=QmuPressureEnum()
 
-macro=176;
+macro=178;

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

@@ -9 +9 @@
 %      macro=QmuVxEnum()
 
-macro=200;
+macro=202;

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

@@ -9 +9 @@
 %      macro=QmuVyEnum()
 
-macro=205;
+macro=207;

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

@@ -9 +9 @@
 %      macro=QmuVzEnum()
 
-macro=210;
+macro=212;

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

@@ -9 +9 @@
 %      macro=RegularEnum()
 
-macro=303;
+macro=305;

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

@@ -9 +9 @@
 %      macro=RelativeEnum()
 
-macro=243;
+macro=245;

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

@@ -9 +9 @@
 %      macro=ResetPenaltiesEnum()
 
-macro=177;
+macro=179;

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

@@ -9 +9 @@
 %      macro=ResidualEnum()
 
-macro=244;
+macro=246;

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

@@ -9 +9 @@
 %      macro=ResponseDescriptorsEnum()
 
-macro=307;
+macro=309;

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

@@ -9 +9 @@
 %      macro=RheologyBEnum()
 
-macro=178;
+macro=180;

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

@@ -9 +9 @@
 %      macro=RheologyBbarEnum()
 
-macro=179;
+macro=181;

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

@@ -9 +9 @@
 %      macro=RheologyNEnum()
 
-macro=180;
+macro=182;

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

@@ -9 +9 @@
 %      macro=RhoIceEnum()
 
-macro=246;
+macro=248;

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

@@ -9 +9 @@
 %      macro=RhoWaterEnum()
 
-macro=247;
+macro=249;

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

@@ -9 +9 @@
 %      macro=ScaledEnum()
 
-macro=305;
+macro=307;

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

@@ -9 +9 @@
 %      macro=SegmentOnIceShelfEnum()
 
-macro=181;
+macro=183;

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

@@ -9 +9 @@
 %      macro=SeparateEnum()
 
-macro=254;
+macro=256;

issm/trunk/src/m/enum/SolverStringEnum.m

@@ -9 +9 @@
 %      macro=SolverStringEnum()
 
-macro=308;
+macro=310;

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

@@ -9 +9 @@
 %      macro=SparsityEnum()
 
-macro=309;
+macro=311;

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

@@ -9 +9 @@
 %      macro=StabilizeConstraintsEnum()
 
-macro=182;
+macro=184;

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

@@ -9 +9 @@
 %      macro=StokesReconditioningEnum()
 
-macro=183;
+macro=185;

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

@@ -9 +9 @@
 %      macro=StringExternalResultEnum()
 
-macro=225;
+macro=227;

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

@@ -164 +164 @@
                         elseif (strcmpi(name,'Internal')), enum=InternalEnum(); return
                         elseif (strcmpi(name,'Kflag')), enum=KflagEnum(); return
+                        elseif (strcmpi(name,'IuToExt')), enum=IuToExtEnum(); return
+                        elseif (strcmpi(name,'ExtToIu')), enum=ExtToIuEnum(); return
                         elseif (strcmpi(name,'MassFlux')), enum=MassFluxEnum(); return
                         elseif (strcmpi(name,'ThicknessAbsMisfit')), enum=ThicknessAbsMisfitEnum(); return

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

@@ -9 +9 @@
 %      macro=SurfaceAbsVelMisfitEnum()
 
-macro=157;
+macro=159;

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

@@ -9 +9 @@
 %      macro=SurfaceAreaEnum()
 
-macro=184;
+macro=186;

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

@@ -9 +9 @@
 %      macro=SurfaceAverageVelMisfitEnum()
 
-macro=161;
+macro=163;

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

@@ -9 +9 @@
 %      macro=SurfaceEnum()
 
-macro=185;
+macro=187;

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

@@ -9 +9 @@
 %      macro=SurfaceLogVelMisfitEnum()
 
-macro=159;
+macro=161;

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

@@ -9 +9 @@
 %      macro=SurfaceLogVxVyMisfitEnum()
 
-macro=160;
+macro=162;

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

@@ -9 +9 @@
 %      macro=SurfaceRelVelMisfitEnum()
 
-macro=158;
+macro=160;

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

@@ -9 +9 @@
 %      macro=SurfaceSlopeXEnum()
 
-macro=186;
+macro=188;

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

@@ -9 +9 @@
 %      macro=SurfaceSlopeYEnum()
 
-macro=187;
+macro=189;

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

@@ -9 +9 @@
 %      macro=TemperatureEnum()
 
-macro=188;
+macro=190;

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

@@ -9 +9 @@
 %      macro=TemperatureOldEnum()
 
-macro=189;
+macro=191;

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

@@ -9 +9 @@
 %      macro=ThermalConductivityEnum()
 
-macro=249;
+macro=251;

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

@@ -9 +9 @@
 %      macro=ThermalExchangeVelocityEnum()
 
-macro=251;
+macro=253;

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

@@ -9 +9 @@
 %      macro=ThicknessAbsMisfitEnum()
 
-macro=156;
+macro=158;

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

@@ -9 +9 @@
 %      macro=ThicknessEnum()
 
-macro=190;
+macro=192;

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

@@ -9 +9 @@
 %      macro=ThicknessObsEnum()
 
-macro=191;
+macro=193;

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

@@ -9 +9 @@
 %      macro=TimeEnum()
 
-macro=230;
+macro=232;

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

@@ -9 +9 @@
 %      macro=TolXEnum()
 
-macro=310;
+macro=312;

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

@@ -9 +9 @@
 %      macro=TriaVertexElementResultEnum()
 
-macro=217;
+macro=219;

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

@@ -9 +9 @@
 %      macro=TypeEnum()
 
-macro=192;
+macro=194;

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

@@ -9 +9 @@
 %      macro=VariableDescriptorsEnum()
 
-macro=311;
+macro=313;

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

@@ -9 +9 @@
 %      macro=VelEnum()
 
-macro=193;
+macro=195;

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

@@ -9 +9 @@
 %      macro=VelObsEnum()
 
-macro=194;
+macro=196;

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

@@ -9 +9 @@
 %      macro=VerboseEnum()
 
-macro=312;
+macro=314;

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

@@ -9 +9 @@
 %      macro=ViscosityOvershootEnum()
 
-macro=195;
+macro=197;

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

@@ -9 +9 @@
 %      macro=VxAverageEnum()
 
-macro=196;
+macro=198;

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

@@ -9 +9 @@
 %      macro=VxEnum()
 
-macro=197;
+macro=199;

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

@@ -9 +9 @@
 %      macro=VxObsEnum()
 
-macro=198;
+macro=200;

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

@@ -9 +9 @@
 %      macro=VxOldEnum()
 
-macro=199;
+macro=201;

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

@@ -9 +9 @@
 %      macro=VyAverageEnum()
 
-macro=201;
+macro=203;

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

@@ -9 +9 @@
 %      macro=VyEnum()
 
-macro=202;
+macro=204;

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

@@ -9 +9 @@
 %      macro=VyObsEnum()
 
-macro=203;
+macro=205;

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

@@ -9 +9 @@
 %      macro=VyOldEnum()
 
-macro=204;
+macro=206;

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

@@ -9 +9 @@
 %      macro=VzAverageEnum()
 
-macro=206;
+macro=208;

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

@@ -9 +9 @@
 %      macro=VzEnum()
 
-macro=207;
+macro=209;

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

@@ -9 +9 @@
 %      macro=VzObsEnum()
 
-macro=208;
+macro=210;

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

@@ -9 +9 @@
 %      macro=VzOldEnum()
 
-macro=209;
+macro=211;

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

@@ -9 +9 @@
 %      macro=WaitOnLockEnum()
 
-macro=313;
+macro=315;

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

@@ -9 +9 @@
 %      macro=WeightsEnum()
 
-macro=211;
+macro=213;

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

@@ -9 +9 @@
 %      macro=YtsEnum()
 
-macro=314;
+macro=316;