Context Navigation

← Previous Changeset
Next Changeset →

Changeset 5127

Timestamp:

Aug 10, 2010, 2:33:55 PM (16 years ago)

Author:

seroussi

Message:

enums

Location:

issm/trunk/src/m/enum

Files:

: 1 deleted
: 182 edited

AbsoluteEnum.m (modified) (1 diff)
AccumulationRateEnum.m (modified) (1 diff)
AdjointEnum.m (modified) (1 diff)
AdjointpEnum.m (modified) (1 diff)
AdjointxEnum.m (modified) (1 diff)
AdjointyEnum.m (modified) (1 diff)
AdjointzEnum.m (modified) (1 diff)
AirEnum.m (modified) (1 diff)
ArtDiffEnum.m (modified) (1 diff)
BedEnum.m (modified) (1 diff)
BedSlopeXEnum.m (modified) (1 diff)
BedSlopeYEnum.m (modified) (1 diff)
BetaEnum.m (modified) (1 diff)
BoolExternalResultEnum.m (modified) (1 diff)
BoundaryEnum.m (modified) (1 diff)
CmGradientEnum.m (modified) (1 diff)
CmJumpEnum.m (modified) (1 diff)
CmMaxDmpSlopeEnum.m (modified) (1 diff)
CmMaxDmpValueEnum.m (modified) (1 diff)
CmMaxEnum.m (modified) (1 diff)
CmMinDmpSlopeEnum.m (modified) (1 diff)
CmMinDmpValueEnum.m (modified) (1 diff)
CmMinEnum.m (modified) (1 diff)
CmNoiseDmpEnum.m (modified) (1 diff)
ColinearEnum.m (modified) (1 diff)
CollapseEnum.m (modified) (1 diff)
ConnectivityEnum.m (modified) (1 diff)
ConstantEnum.m (modified) (1 diff)
ControlParameterEnum.m (modified) (1 diff)
ControlSteadyEnum.m (modified) (1 diff)
ControlTypeEnum.m (modified) (1 diff)
ConvergedEnum.m (modified) (1 diff)
DakotaParameterEnum.m (modified) (1 diff)
DhDtEnum.m (modified) (1 diff)
DimEnum.m (modified) (1 diff)
DoubleElementResultEnum.m (modified) (1 diff)
DoubleExternalResultEnum.m (modified) (1 diff)
DoubleMatExternalResultEnum.m (modified) (1 diff)
DoubleVecExternalResultEnum.m (modified) (1 diff)
DragCoefficientEnum.m (modified) (1 diff)
DragPEnum.m (modified) (1 diff)
DragQEnum.m (modified) (1 diff)
DragTypeEnum.m (modified) (1 diff)
DtEnum.m (modified) (1 diff)
ElementOnBedEnum.m (modified) (1 diff)
ElementOnIceShelfEnum.m (modified) (1 diff)
ElementOnSurfaceEnum.m (modified) (1 diff)
ElementOnWaterEnum.m (modified) (1 diff)
EnumToString.m (modified) (2 diffs)
EpsAbsEnum.m (modified) (1 diff)
EpsCmEnum.m (modified) (1 diff)
EpsRelEnum.m (modified) (1 diff)
EpsResEnum.m (modified) (1 diff)
EpsVelEnum.m (modified) (1 diff)
FillEnum.m (modified) (1 diff)
FitEnum.m (modified) (1 diff)
FractionIncrementEnum.m (modified) (1 diff)
FrictionEnum.m (modified) (1 diff)
GeographyEnum.m (modified) (1 diff)
GeothermalFluxEnum.m (modified) (1 diff)
GradientEnum.m (modified) (1 diff)
GravityEnum.m (modified) (1 diff)
HeatCapacityEnum.m (modified) (1 diff)
IceEnum.m (modified) (1 diff)
IceSheetEnum.m (modified) (1 diff)
IceShelfEnum.m (modified) (1 diff)
IntExternalResultEnum.m (modified) (1 diff)
InternalEnum.m (modified) (1 diff)
IntersectEnum.m (modified) (1 diff)
IsHutterEnum.m (modified) (1 diff)
IsMacAyealPattynEnum.m (modified) (1 diff)
IsStokesEnum.m (modified) (1 diff)
JEnum.m (modified) (1 diff)
KflagEnum.m (modified) (1 diff)
LatentHeatEnum.m (modified) (1 diff)
LowmemEnum.m (modified) (1 diff)
MassFluxEnum.m (modified) (1 diff)
MaxIterEnum.m (modified) (1 diff)
MaxNonlinearIterationsEnum.m (modified) (1 diff)
MaxPenetrationEnum.m (modified) (1 diff)
MeanVelEnum.m (modified) (1 diff)
MelangeEnum.m (modified) (1 diff)
MeltingOffsetEnum.m (modified) (1 diff)
MeltingPointEnum.m (modified) (1 diff)
MeltingRateEnum.m (modified) (1 diff)
MinMechanicalConstraintsEnum.m (modified) (1 diff)
MinThermalConstraintsEnum.m (modified) (1 diff)
MiniEnum.m (modified) (1 diff)
MisfitEnum.m (modified) (1 diff)
MixedLayerCapacityEnum.m (modified) (1 diff)
NStepsEnum.m (modified) (1 diff)
NdtEnum.m (modified) (1 diff)
NodeOnBedEnum.m (modified) (1 diff)
NodeOnIceSheetEnum.m (modified) (1 diff)
NodeOnIceShelfEnum.m (modified) (1 diff)
NodeOnSurfaceEnum.m (modified) (1 diff)
NumOutputEnum.m (modified) (1 diff)
NumRiftsEnum.m (modified) (1 diff)
NumberNodeToElementConnectivityEnum.m (modified) (1 diff)
NumberOfElementsEnum.m (modified) (1 diff)
NumberOfNodesEnum.m (modified) (1 diff)
NumberOfVerticesEnum.m (modified) (1 diff)
OldGradientEnum.m (modified) (1 diff)
OptScalEnum.m (modified) (1 diff)
OutputFilePointerEnum.m (modified) (1 diff)
P0Enum.m (modified) (1 diff)
P1DGEnum.m (modified) (1 diff)
P1Enum.m (modified) (1 diff)
ParameterOutputEnum.m (modified) (1 diff)
PatchEnum.m (modified) (1 diff)
PatchNodesEnum.m (modified) (1 diff)
PatchVerticesEnum.m (modified) (1 diff)
PenaltyMeltingEnum.m (modified) (1 diff)
PenaltyOffsetEnum.m (modified) (1 diff)
PentaVertexElementResultEnum.m (modified) (1 diff)
PetscVecExternalResultEnum.m (modified) (1 diff)
PflagEnum.m (modified) (1 diff)
PressureEnum.m (modified) (1 diff)
PressureOldEnum.m (modified) (1 diff)
QmuAnalysisEnum.m (modified) (1 diff)
QmuErrNameEnum.m (modified) (1 diff)
QmuInNameEnum.m (modified) (1 diff)
QmuMassFluxSegmentsEnum.m (modified) (1 diff)
QmuNPartEnum.m (modified) (1 diff)
QmuOutNameEnum.m (modified) (1 diff)
QmuPartEnum.m (modified) (1 diff)
QmuPressureEnum.m (modified) (1 diff)
QmuVxEnum.m (modified) (1 diff)
QmuVyEnum.m (modified) (1 diff)
QmuVzEnum.m (modified) (1 diff)
RelativeEnum.m (modified) (1 diff)
ResetPenaltiesEnum.m (modified) (1 diff)
ResidualEnum.m (modified) (1 diff)
ResponseDescriptorsEnum.m (modified) (1 diff)
RgbEnum.m (deleted)
RheologyB2dEnum.m (modified) (1 diff)
RheologyBEnum.m (modified) (1 diff)
RheologyNEnum.m (modified) (1 diff)
RhoIceEnum.m (modified) (1 diff)
RhoWaterEnum.m (modified) (1 diff)
SegmentOnIceShelfEnum.m (modified) (1 diff)
SeparateEnum.m (modified) (1 diff)
SolverStringEnum.m (modified) (1 diff)
SparsityEnum.m (modified) (1 diff)
SpcEnum.m (modified) (1 diff)
StabilizeConstraintsEnum.m (modified) (1 diff)
StokesReconditioningEnum.m (modified) (1 diff)
StringExternalResultEnum.m (modified) (1 diff)
StringToEnum.m (modified) (2 diffs)
SurfaceAreaEnum.m (modified) (1 diff)
SurfaceEnum.m (modified) (1 diff)
SurfaceSlopeXEnum.m (modified) (1 diff)
SurfaceSlopeYEnum.m (modified) (1 diff)
TemperatureEnum.m (modified) (1 diff)
TemperatureOldEnum.m (modified) (1 diff)
ThermalConductivityEnum.m (modified) (1 diff)
ThermalExchangeVelocityEnum.m (modified) (1 diff)
ThicknessEnum.m (modified) (1 diff)
TimeEnum.m (modified) (1 diff)
TolXEnum.m (modified) (1 diff)
TriaVertexElementResultEnum.m (modified) (1 diff)
TypeEnum.m (modified) (1 diff)
VariableDescriptorsEnum.m (modified) (1 diff)
VelEnum.m (modified) (1 diff)
VelObsEnum.m (modified) (1 diff)
VerboseEnum.m (modified) (1 diff)
ViscosityOvershootEnum.m (modified) (1 diff)
VxAverageEnum.m (modified) (1 diff)
VxEnum.m (modified) (1 diff)
VxObsEnum.m (modified) (1 diff)
VxOldEnum.m (modified) (1 diff)
VyAverageEnum.m (modified) (1 diff)
VyEnum.m (modified) (1 diff)
VyObsEnum.m (modified) (1 diff)
VyOldEnum.m (modified) (1 diff)
VzAverageEnum.m (modified) (1 diff)
VzEnum.m (modified) (1 diff)
VzObsEnum.m (modified) (1 diff)
VzOldEnum.m (modified) (1 diff)
WaitOnLockEnum.m (modified) (1 diff)
WaterEnum.m (modified) (1 diff)
WeightsEnum.m (modified) (1 diff)
YtsEnum.m (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

r5066	r5127
9	9	% macro=AbsoluteEnum()
10	10
11		macro=226;
	11	macro=225;

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

r5066	r5127
9	9	% macro=AccumulationRateEnum()
10	10
11		macro=118;
	11	macro=117;

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

r5066	r5127
9	9	% macro=AdjointEnum()
10	10
11		macro=241;
	11	macro=240;

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

r5066	r5127
9	9	% macro=AdjointpEnum()
10	10
11		macro=122;
	11	macro=121;

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

r5066	r5127
9	9	% macro=AdjointxEnum()
10	10
11		macro=119;
	11	macro=118;

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

r5066	r5127
9	9	% macro=AdjointyEnum()
10	10
11		macro=120;
	11	macro=119;

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

r5066	r5127
9	9	% macro=AdjointzEnum()
10	10
11		macro=121;
	11	macro=120;

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

r5066	r5127
9	9	% macro=AirEnum()
10	10
11		macro=116;
	11	macro=115;

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

r5066	r5127
9	9	% macro=ArtDiffEnum()
10	10
11		macro=123;
	11	macro=122;

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

r5066	r5127
9	9	% macro=BedEnum()
10	10
11		macro=124;
	11	macro=123;

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

r5066	r5127
9	9	% macro=BedSlopeXEnum()
10	10
11		macro=125;
	11	macro=124;

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

r5066	r5127
9	9	% macro=BedSlopeYEnum()
10	10
11		macro=126;
	11	macro=125;

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

r5066	r5127
9	9	% macro=BetaEnum()
10	10
11		macro=236;
	11	macro=235;

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

r5066	r5127
9	9	% macro=BoolExternalResultEnum()
10	10
11		macro=212;
	11	macro=211;

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

r5066	r5127
9	9	% macro=BoundaryEnum()
10	10
11		macro=127;
	11	macro=126;

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

r5066	r5127
9	9	% macro=CmGradientEnum()
10	10
11		macro=237;
	11	macro=236;

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

r5066	r5127
9	9	% macro=CmJumpEnum()
10	10
11		macro=238;
	11	macro=237;

issm/trunk/src/m/enum/CmMaxDmpSlopeEnum.m

r5066	r5127
9	9	% macro=CmMaxDmpSlopeEnum()
10	10
11		macro=128;
	11	macro=127;

issm/trunk/src/m/enum/CmMaxDmpValueEnum.m

r5066	r5127
9	9	% macro=CmMaxDmpValueEnum()
10	10
11		macro=129;
	11	macro=128;

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

r5066	r5127
9	9	% macro=CmMaxEnum()
10	10
11		macro=239;
	11	macro=238;

issm/trunk/src/m/enum/CmMinDmpSlopeEnum.m

r5066	r5127
9	9	% macro=CmMinDmpSlopeEnum()
10	10
11		macro=130;
	11	macro=129;

issm/trunk/src/m/enum/CmMinDmpValueEnum.m

r5066	r5127
9	9	% macro=CmMinDmpValueEnum()
10	10
11		macro=131;
	11	macro=130;

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

r5066	r5127
9	9	% macro=CmMinEnum()
10	10
11		macro=240;
	11	macro=239;

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

r5066	r5127
9	9	% macro=CmNoiseDmpEnum()
10	10
11		macro=132;
	11	macro=131;

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

r5066	r5127
9	9	% macro=ColinearEnum()
10	10
11		macro=234;
	11	macro=233;

issm/trunk/src/m/enum/CollapseEnum.m

r5066	r5127
9	9	% macro=CollapseEnum()
10	10
11		macro=133;
	11	macro=132;

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

r5066	r5127
9	9	% macro=ConnectivityEnum()
10	10
11		macro=244;
	11	macro=243;

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

r5066	r5127
9	9	% macro=ConstantEnum()
10	10
11		macro=134;
	11	macro=133;

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

r5066	r5127
9	9	% macro=ControlParameterEnum()
10	10
11		macro=245;
	11	macro=244;

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

r5066	r5127
9	9	% macro=ControlSteadyEnum()
10	10
11		macro=246;
	11	macro=245;

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

r5066	r5127
9	9	% macro=ControlTypeEnum()
10	10
11		macro=135;
	11	macro=134;

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

r5066	r5127
9	9	% macro=ConvergedEnum()
10	10
11		macro=136;
	11	macro=135;

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

r5066	r5127
9	9	% macro=DakotaParameterEnum()
10	10
11		macro=247;
	11	macro=246;

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

r5066	r5127
9	9	% macro=DhDtEnum()
10	10
11		macro=137;
	11	macro=136;

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

r5066	r5127
9	9	% macro=DimEnum()
10	10
11		macro=248;
	11	macro=247;

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

r5066	r5127
9	9	% macro=DoubleElementResultEnum()
10	10
11		macro=209;
	11	macro=208;

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

r5066	r5127
9	9	% macro=DoubleExternalResultEnum()
10	10
11		macro=213;
	11	macro=212;

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

r5066	r5127
9	9	% macro=DoubleMatExternalResultEnum()
10	10
11		macro=215;
	11	macro=214;

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

r5066	r5127
9	9	% macro=DoubleVecExternalResultEnum()
10	10
11		macro=214;
	11	macro=213;

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

r5066	r5127
9	9	% macro=DragCoefficientEnum()
10	10
11		macro=138;
	11	macro=137;

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

r5066	r5127
9	9	% macro=DragPEnum()
10	10
11		macro=139;
	11	macro=138;

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

r5066	r5127
9	9	% macro=DragQEnum()
10	10
11		macro=140;
	11	macro=139;

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

r5066	r5127
9	9	% macro=DragTypeEnum()
10	10
11		macro=141;
	11	macro=140;

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

r5066	r5127
9	9	% macro=DtEnum()
10	10
11		macro=142;
	11	macro=141;

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

r5066	r5127
9	9	% macro=ElementOnBedEnum()
10	10
11		macro=143;
	11	macro=142;

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

r5066	r5127
9	9	% macro=ElementOnIceShelfEnum()
10	10
11		macro=144;
	11	macro=143;

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

r5066	r5127
9	9	% macro=ElementOnSurfaceEnum()
10	10
11		macro=145;
	11	macro=144;

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

r5066	r5127
9	9	% macro=ElementOnWaterEnum()
10	10
11		macro=146;
	11	macro=145;

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

-              r5114
+              r5127
         case SteadystateAnalysisEnum(), string='SteadystateAnalysis'; return
         case NoneAnalysisEnum(), string='NoneAnalysis'; return
         case FormulationEnum(), string='Formulation'; return
         case HutterFormulationEnum(), string='HutterFormulation'; return
         case MacAyealFormulationEnum(), string='MacAyealFormulation'; return
         case MacAyealPattynFormulationEnum(), string='MacAyealPattynFormulation'; return
         case NoneFormulationEnum(), string='NoneFormulation'; return
         case PattynFormulationEnum(), string='PattynFormulation'; return
         case StokesFormulationEnum(), string='StokesFormulation'; return
+        case ApproximationEnum(), string='Approximation'; return
+        case HutterApproximationEnum(), string='HutterApproximation'; return
+        case MacAyealApproximationEnum(), string='MacAyealApproximation'; return
+        case MacAyealPattynApproximationEnum(), string='MacAyealPattynApproximation'; return
+        case NoneApproximationEnum(), string='NoneApproximation'; return
+        case PattynApproximationEnum(), string='PattynApproximation'; return
+        case StokesApproximationEnum(), string='StokesApproximation'; return
         case ObjectEnum(), string='Object'; return
         case HookEnum(), string='Hook'; return
 …
         case ElementResultEnum(), string='ElementResult'; return
         case ExternalResultEnum(), string='ExternalResult'; return
-        case RgbEnum(), string='Rgb'; return
         case SpcEnum(), string='Spc'; return
         case GeographyEnum(), string='Geography'; return

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

r5066	r5127
9	9	% macro=EpsAbsEnum()
10	10
11		macro=249;
	11	macro=248;

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

r5066	r5127
9	9	% macro=EpsCmEnum()
10	10
11		macro=250;
	11	macro=249;

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

r5066	r5127
9	9	% macro=EpsRelEnum()
10	10
11		macro=251;
	11	macro=250;

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

r5066	r5127
9	9	% macro=EpsResEnum()
10	10
11		macro=252;
	11	macro=251;

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

r5066	r5127
9	9	% macro=EpsVelEnum()
10	10
11		macro=147;
	11	macro=146;

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

r5066	r5127
9	9	% macro=FillEnum()
10	10
11		macro=148;
	11	macro=147;

issm/trunk/src/m/enum/FitEnum.m

r5066	r5127
9	9	% macro=FitEnum()
10	10
11		macro=149;
	11	macro=148;

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

r5066	r5127
9	9	% macro=FractionIncrementEnum()
10	10
11		macro=150;
	11	macro=149;

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

r5066	r5127
9	9	% macro=FrictionEnum()
10	10
11		macro=151;
	11	macro=150;

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

r5066	r5127
9	9	% macro=GeographyEnum()
10	10
11		macro=111;
	11	macro=110;

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

r5066	r5127
9	9	% macro=GeothermalFluxEnum()
10	10
11		macro=152;
	11	macro=151;

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

r5066	r5127
9	9	% macro=GradientEnum()
10	10
11		macro=242;
	11	macro=241;

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

r5066	r5127
9	9	% macro=GravityEnum()
10	10
11		macro=229;
	11	macro=228;

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

r5066	r5127
9	9	% macro=HeatCapacityEnum()
10	10
11		macro=253;
	11	macro=252;

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

r5066	r5127
9	9	% macro=IceEnum()
10	10
11		macro=115;
	11	macro=114;

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

r5066	r5127
9	9	% macro=IceSheetEnum()
10	10
11		macro=112;
	11	macro=111;

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

r5066	r5127
9	9	% macro=IceShelfEnum()
10	10
11		macro=113;
	11	macro=112;

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

r5066	r5127
9	9	% macro=IntExternalResultEnum()
10	10
11		macro=216;
	11	macro=215;

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

r5066	r5127
9	9	% macro=InternalEnum()
10	10
11		macro=153;
	11	macro=152;

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

r5066	r5127
9	9	% macro=IntersectEnum()
10	10
11		macro=233;
	11	macro=232;

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

r5066	r5127
9	9	% macro=IsHutterEnum()
10	10
11		macro=254;
	11	macro=253;

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

r5066	r5127
9	9	% macro=IsMacAyealPattynEnum()
10	10
11		macro=255;
	11	macro=254;

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

r5066	r5127
9	9	% macro=IsStokesEnum()
10	10
11		macro=256;
	11	macro=255;

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

r5066	r5127
9	9	% macro=JEnum()
10	10
11		macro=219;
	11	macro=218;

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

r5066	r5127
9	9	% macro=KflagEnum()
10	10
11		macro=154;
	11	macro=153;

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

r5066	r5127
9	9	% macro=LatentHeatEnum()
10	10
11		macro=257;
	11	macro=256;

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

r5066	r5127
9	9	% macro=LowmemEnum()
10	10
11		macro=258;
	11	macro=257;

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

r5066	r5127
9	9	% macro=MassFluxEnum()
10	10
11		macro=155;
	11	macro=154;

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

r5066	r5127
9	9	% macro=MaxIterEnum()
10	10
11		macro=259;
	11	macro=258;

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

r5066	r5127
9	9	% macro=MaxNonlinearIterationsEnum()
10	10
11		macro=260;
	11	macro=259;

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

r5066	r5127
9	9	% macro=MaxPenetrationEnum()
10	10
11		macro=156;
	11	macro=155;

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

r5066	r5127
9	9	% macro=MeanVelEnum()
10	10
11		macro=157;
	11	macro=156;

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

r5066	r5127
9	9	% macro=MelangeEnum()
10	10
11		macro=117;
	11	macro=116;

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

r5066	r5127
9	9	% macro=MeltingOffsetEnum()
10	10
11		macro=158;
	11	macro=157;

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

r5066	r5127
9	9	% macro=MeltingPointEnum()
10	10
11		macro=261;
	11	macro=260;

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

r5066	r5127
9	9	% macro=MeltingRateEnum()
10	10
11		macro=159;
	11	macro=158;

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

r5066	r5127
9	9	% macro=MinMechanicalConstraintsEnum()
10	10
11		macro=262;
	11	macro=261;

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

r5066	r5127
9	9	% macro=MinThermalConstraintsEnum()
10	10
11		macro=263;
	11	macro=262;

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

r5066	r5127
9	9	% macro=MiniEnum()
10	10
11		macro=208;
	11	macro=207;

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

r5066	r5127
9	9	% macro=MisfitEnum()
10	10
11		macro=160;
	11	macro=159;

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

r5066	r5127
9	9	% macro=MixedLayerCapacityEnum()
10	10
11		macro=231;
	11	macro=230;

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

r5066	r5127
9	9	% macro=NStepsEnum()
10	10
11		macro=264;
	11	macro=263;

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

r5066	r5127
9	9	% macro=NdtEnum()
10	10
11		macro=265;
	11	macro=264;

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

r5066	r5127
9	9	% macro=NodeOnBedEnum()
10	10
11		macro=161;
	11	macro=160;

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

r5066	r5127
9	9	% macro=NodeOnIceSheetEnum()
10	10
11		macro=162;
	11	macro=161;

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

r5066	r5127
9	9	% macro=NodeOnIceShelfEnum()
10	10
11		macro=163;
	11	macro=162;

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

r5066	r5127
9	9	% macro=NodeOnSurfaceEnum()
10	10
11		macro=164;
	11	macro=163;

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

r5066	r5127
9	9	% macro=NumOutputEnum()
10	10
11		macro=266;
	11	macro=265;

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

r5066	r5127
9	9	% macro=NumRiftsEnum()
10	10
11		macro=267;
	11	macro=266;

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

r5066	r5127
9	9	% macro=NumberNodeToElementConnectivityEnum()
10	10
11		macro=165;
	11	macro=164;

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

r5114	r5127
9	9	% macro=NumberOfElementsEnum()
10	10
11		macro=268;
	11	macro=267;

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

r5114	r5127
9	9	% macro=NumberOfNodesEnum()
10	10
11		macro=269;
	11	macro=268;

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

r5114	r5127
9	9	% macro=NumberOfVerticesEnum()
10	10
11		macro=270;
	11	macro=269;

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

r5066	r5127
9	9	% macro=OldGradientEnum()
10	10
11		macro=243;
	11	macro=242;

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

r5114	r5127
9	9	% macro=OptScalEnum()
10	10
11		macro=271;
	11	macro=270;

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

r5114	r5127
9	9	% macro=OutputFilePointerEnum()
10	10
11		macro=272;
	11	macro=271;

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

r5066	r5127
9	9	% macro=P0Enum()
10	10
11		macro=205;
	11	macro=204;

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

r5066	r5127
9	9	% macro=P1DGEnum()
10	10
11		macro=207;
	11	macro=206;

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

r5066	r5127
9	9	% macro=P1Enum()
10	10
11		macro=206;
	11	macro=205;

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

r5114	r5127
9	9	% macro=ParameterOutputEnum()
10	10
11		macro=273;
	11	macro=272;

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

r5066	r5127
9	9	% macro=PatchEnum()
10	10
11		macro=220;
	11	macro=219;

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

r5066	r5127
9	9	% macro=PatchNodesEnum()
10	10
11		macro=222;
	11	macro=221;

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

r5066	r5127
9	9	% macro=PatchVerticesEnum()
10	10
11		macro=221;
	11	macro=220;

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

r5114	r5127
9	9	% macro=PenaltyMeltingEnum()
10	10
11		macro=274;
	11	macro=273;

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

r5066	r5127
9	9	% macro=PenaltyOffsetEnum()
10	10
11		macro=166;
	11	macro=165;

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

r5066	r5127
9	9	% macro=PentaVertexElementResultEnum()
10	10
11		macro=211;
	11	macro=210;

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

r5066	r5127
9	9	% macro=PetscVecExternalResultEnum()
10	10
11		macro=217;
	11	macro=216;

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

r5066	r5127
9	9	% macro=PflagEnum()
10	10
11		macro=167;
	11	macro=166;

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

r5066	r5127
9	9	% macro=PressureEnum()
10	10
11		macro=168;
	11	macro=167;

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

r5066	r5127
9	9	% macro=PressureOldEnum()
10	10
11		macro=169;
	11	macro=168;

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

r5114	r5127
9	9	% macro=QmuAnalysisEnum()
10	10
11		macro=275;
	11	macro=274;

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

r5114	r5127
9	9	% macro=QmuErrNameEnum()
10	10
11		macro=276;
	11	macro=275;

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

r5114	r5127
9	9	% macro=QmuInNameEnum()
10	10
11		macro=277;
	11	macro=276;

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

r5114	r5127
9	9	% macro=QmuMassFluxSegmentsEnum()
10	10
11		macro=278;
	11	macro=277;

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

r5114	r5127
9	9	% macro=QmuNPartEnum()
10	10
11		macro=279;
	11	macro=278;

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

r5114	r5127
9	9	% macro=QmuOutNameEnum()
10	10
11		macro=280;
	11	macro=279;

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

r5114	r5127
9	9	% macro=QmuPartEnum()
10	10
11		macro=281;
	11	macro=280;

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

r5066	r5127
9	9	% macro=QmuPressureEnum()
10	10
11		macro=170;
	11	macro=169;

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

r5066	r5127
9	9	% macro=QmuVxEnum()
10	10
11		macro=193;
	11	macro=192;

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

r5066	r5127
9	9	% macro=QmuVyEnum()
10	10
11		macro=198;
	11	macro=197;

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

r5066	r5127
9	9	% macro=QmuVzEnum()
10	10
11		macro=203;
	11	macro=202;

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

r5066	r5127
9	9	% macro=RelativeEnum()
10	10
11		macro=224;
	11	macro=223;

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

r5066	r5127
9	9	% macro=ResetPenaltiesEnum()
10	10
11		macro=171;
	11	macro=170;

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

r5066	r5127
9	9	% macro=ResidualEnum()
10	10
11		macro=225;
	11	macro=224;

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

r5114	r5127
9	9	% macro=ResponseDescriptorsEnum()
10	10
11		macro=282;
	11	macro=281;

issm/trunk/src/m/enum/RheologyB2dEnum.m

r5066	r5127
9	9	% macro=RheologyB2dEnum()
10	10
11		macro=173;
	11	macro=172;

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

r5066	r5127
9	9	% macro=RheologyBEnum()
10	10
11		macro=172;
	11	macro=171;

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

r5066	r5127
9	9	% macro=RheologyNEnum()
10	10
11		macro=174;
	11	macro=173;

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

r5066	r5127
9	9	% macro=RhoIceEnum()
10	10
11		macro=227;
	11	macro=226;

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

r5066	r5127
9	9	% macro=RhoWaterEnum()
10	10
11		macro=228;
	11	macro=227;

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

r5066	r5127
9	9	% macro=SegmentOnIceShelfEnum()
10	10
11		macro=175;
	11	macro=174;

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

r5066	r5127
9	9	% macro=SeparateEnum()
10	10
11		macro=235;
	11	macro=234;

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

r5114	r5127
9	9	% macro=SolverStringEnum()
10	10
11		macro=283;
	11	macro=282;

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

r5114	r5127
9	9	% macro=SparsityEnum()
10	10
11		macro=284;
	11	macro=283;

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

r5066	r5127
9	9	% macro=SpcEnum()
10	10
11		macro=110;
	11	macro=109;

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

r5066	r5127
9	9	% macro=StabilizeConstraintsEnum()
10	10
11		macro=176;
	11	macro=175;

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

r5066	r5127
9	9	% macro=StokesReconditioningEnum()
10	10
11		macro=177;
	11	macro=176;

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

r5066	r5127
9	9	% macro=StringExternalResultEnum()
10	10
11		macro=218;
	11	macro=217;

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

-              r5114
+              r5127
 elseif (strcmpi(name,'SteadystateAnalysis')), enum=SteadystateAnalysisEnum(); return
 elseif (strcmpi(name,'NoneAnalysis')), enum=NoneAnalysisEnum(); return
 elseif (strcmpi(name,'Formulation')), enum=FormulationEnum(); return
 elseif (strcmpi(name,'HutterFormulation')), enum=HutterFormulationEnum(); return
 elseif (strcmpi(name,'MacAyealFormulation')), enum=MacAyealFormulationEnum(); return
 elseif (strcmpi(name,'MacAyealPattynFormulation')), enum=MacAyealPattynFormulationEnum(); return
 elseif (strcmpi(name,'NoneFormulation')), enum=NoneFormulationEnum(); return
 elseif (strcmpi(name,'PattynFormulation')), enum=PattynFormulationEnum(); return
 elseif (strcmpi(name,'StokesFormulation')), enum=StokesFormulationEnum(); return
+elseif (strcmpi(name,'Approximation')), enum=ApproximationEnum(); return
+elseif (strcmpi(name,'HutterApproximation')), enum=HutterApproximationEnum(); return
+elseif (strcmpi(name,'MacAyealApproximation')), enum=MacAyealApproximationEnum(); return
+elseif (strcmpi(name,'MacAyealPattynApproximation')), enum=MacAyealPattynApproximationEnum(); return
+elseif (strcmpi(name,'NoneApproximation')), enum=NoneApproximationEnum(); return
+elseif (strcmpi(name,'PattynApproximation')), enum=PattynApproximationEnum(); return
+elseif (strcmpi(name,'StokesApproximation')), enum=StokesApproximationEnum(); return
 elseif (strcmpi(name,'Object')), enum=ObjectEnum(); return
 elseif (strcmpi(name,'Hook')), enum=HookEnum(); return
 …
 elseif (strcmpi(name,'ElementResult')), enum=ElementResultEnum(); return
 elseif (strcmpi(name,'ExternalResult')), enum=ExternalResultEnum(); return
-elseif (strcmpi(name,'Rgb')), enum=RgbEnum(); return
 elseif (strcmpi(name,'Spc')), enum=SpcEnum(); return
 elseif (strcmpi(name,'Geography')), enum=GeographyEnum(); return

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

r5066	r5127
9	9	% macro=SurfaceAreaEnum()
10	10
11		macro=178;
	11	macro=177;

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

r5066	r5127
9	9	% macro=SurfaceEnum()
10	10
11		macro=179;
	11	macro=178;

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

r5066	r5127
9	9	% macro=SurfaceSlopeXEnum()
10	10
11		macro=180;
	11	macro=179;

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

r5066	r5127
9	9	% macro=SurfaceSlopeYEnum()
10	10
11		macro=181;
	11	macro=180;

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

r5066	r5127
9	9	% macro=TemperatureEnum()
10	10
11		macro=182;
	11	macro=181;

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

r5066	r5127
9	9	% macro=TemperatureOldEnum()
10	10
11		macro=183;
	11	macro=182;

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

r5066	r5127
9	9	% macro=ThermalConductivityEnum()
10	10
11		macro=230;
	11	macro=229;

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

r5066	r5127
9	9	% macro=ThermalExchangeVelocityEnum()
10	10
11		macro=232;
	11	macro=231;

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

r5066	r5127
9	9	% macro=ThicknessEnum()
10	10
11		macro=184;
	11	macro=183;

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

r5066	r5127
9	9	% macro=TimeEnum()
10	10
11		macro=223;
	11	macro=222;

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

r5114	r5127
9	9	% macro=TolXEnum()
10	10
11		macro=285;
	11	macro=284;

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

r5066	r5127
9	9	% macro=TriaVertexElementResultEnum()
10	10
11		macro=210;
	11	macro=209;

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

r5066	r5127
9	9	% macro=TypeEnum()
10	10
11		macro=185;
	11	macro=184;

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

r5114	r5127
9	9	% macro=VariableDescriptorsEnum()
10	10
11		macro=286;
	11	macro=285;

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

r5066	r5127
9	9	% macro=VelEnum()
10	10
11		macro=186;
	11	macro=185;

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

r5066	r5127
9	9	% macro=VelObsEnum()
10	10
11		macro=187;
	11	macro=186;

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

r5114	r5127
9	9	% macro=VerboseEnum()
10	10
11		macro=287;
	11	macro=286;

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

r5066	r5127
9	9	% macro=ViscosityOvershootEnum()
10	10
11		macro=188;
	11	macro=187;

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

r5066	r5127
9	9	% macro=VxAverageEnum()
10	10
11		macro=189;
	11	macro=188;

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

r5066	r5127
9	9	% macro=VxEnum()
10	10
11		macro=190;
	11	macro=189;

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

r5066	r5127
9	9	% macro=VxObsEnum()
10	10
11		macro=191;
	11	macro=190;

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

r5066	r5127
9	9	% macro=VxOldEnum()
10	10
11		macro=192;
	11	macro=191;

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

r5066	r5127
9	9	% macro=VyAverageEnum()
10	10
11		macro=194;
	11	macro=193;

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

r5066	r5127
9	9	% macro=VyEnum()
10	10
11		macro=195;
	11	macro=194;

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

r5066	r5127
9	9	% macro=VyObsEnum()
10	10
11		macro=196;
	11	macro=195;

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

r5066	r5127
9	9	% macro=VyOldEnum()
10	10
11		macro=197;
	11	macro=196;

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

r5066	r5127
9	9	% macro=VzAverageEnum()
10	10
11		macro=199;
	11	macro=198;

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

r5066	r5127
9	9	% macro=VzEnum()
10	10
11		macro=~~200~~;
	11	macro=199;

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

r5066	r5127
9	9	% macro=VzObsEnum()
10	10
11		macro=201;
	11	macro=200;

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

r5066	r5127
9	9	% macro=VzOldEnum()
10	10
11		macro=202;
	11	macro=201;

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

r5114	r5127
9	9	% macro=WaitOnLockEnum()
10	10
11		macro=288;
	11	macro=287;

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

r5066	r5127
9	9	% macro=WaterEnum()
10	10
11		macro=114;
	11	macro=113;

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

r5066	r5127
9	9	% macro=WeightsEnum()
10	10
11		macro=204;
	11	macro=203;

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

r5114	r5127
9	9	% macro=YtsEnum()
10	10
11		macro=289;
	11	macro=288;

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