Context Navigation

← Previous Changeset
Next Changeset →

Changeset 4971

Timestamp:

08/04/10 11:54:36 (15 years ago)

Author:

Eric.Larour

Message:

New MassFlux and Misfit enums

Location:

issm/trunk/src

Files:

: 2 added
: 4 deleted
: 140 edited

c/EnumDefinitions/EnumAsString.cpp (modified) (1 diff)
c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
c/EnumDefinitions/StringAsEnum.cpp (modified) (1 diff)
m/enum/AbsoluteEnum.m (modified) (1 diff)
m/enum/AdjointEnum.m (modified) (1 diff)
m/enum/BeamEnum.m (deleted)
m/enum/BeamVertexElementResultEnum.m (deleted)
m/enum/BeamVertexInputEnum.m (deleted)
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/EnumAsString.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/ExtrudeParamEnum.m (modified) (1 diff)
m/enum/GradientEnum.m (modified) (1 diff)
m/enum/GravityEnum.m (modified) (1 diff)
m/enum/HeatCapacityEnum.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/JEnum.m (modified) (1 diff)
m/enum/LatentHeatEnum.m (modified) (1 diff)
m/enum/LowmemEnum.m (modified) (1 diff)
m/enum/MassFluxEnum.m (added)
m/enum/MaxIterEnum.m (modified) (1 diff)
m/enum/MaxNonlinearIterationsEnum.m (modified) (1 diff)
m/enum/MaxPenetrationEnum.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/MiniEnum.m (modified) (1 diff)
m/enum/MisfitEnum.m (added)
m/enum/MixedLayerCapacityEnum.m (modified) (1 diff)
m/enum/NStepsEnum.m (modified) (1 diff)
m/enum/NdtEnum.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/NumberOfDofsPerNodeEnum.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/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/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/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/RheologyB2dEnum.m (modified) (1 diff)
m/enum/RheologyBEnum.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/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/StringAsEnum.m (modified) (1 diff)
m/enum/StringExternalResultEnum.m (modified) (1 diff)
m/enum/SurfaceAreaEnum.m (modified) (1 diff)
m/enum/SurfaceEnum.m (modified) (1 diff)
m/enum/SurfaceSlopeXEnum.m (modified) (1 diff)
m/enum/SurfaceSlopeYEnum.m (modified) (1 diff)
m/enum/TemperatureAverageEnum.m (deleted)
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/ThicknessEnum.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)

Legend:

: Unmodified
: Added
: Removed

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

-              r4935
+              r4971
                 case InternalEnum : return "Internal";
                 case KflagEnum : return "Kflag";
+                case MassFluxEnum : return "MassFlux";
                 case MaxPenetrationEnum : return "MaxPenetration";
                 case MeanVelEnum : return "MeanVel";
                 case MeltingOffsetEnum : return "MeltingOffset";
                 case MeltingRateEnum : return "MeltingRate";
+                case MisfitEnum : return "Misfit";
                 case NodeOnBedEnum : return "NodeOnBed";
                 case NodeOnIceSheetEnum : return "NodeOnIceSheet";

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

-              r4935
+              r4971
         InternalEnum,
         KflagEnum,
+        MassFluxEnum,
         MaxPenetrationEnum,
         MeanVelEnum,
         MeltingOffsetEnum,
         MeltingRateEnum,
+        MisfitEnum,
         NodeOnBedEnum,
         NodeOnIceSheetEnum,

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

-              r4935
+              r4971
         else if (strcmp(name,"Internal")==0) return InternalEnum;
         else if (strcmp(name,"Kflag")==0) return KflagEnum;
+        else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
         else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;
         else if (strcmp(name,"MeanVel")==0) return MeanVelEnum;
         else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
         else if (strcmp(name,"MeltingRate")==0) return MeltingRateEnum;
+        else if (strcmp(name,"Misfit")==0) return MisfitEnum;
         else if (strcmp(name,"NodeOnBed")==0) return NodeOnBedEnum;
         else if (strcmp(name,"NodeOnIceSheet")==0) return NodeOnIceSheetEnum;

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

r4936	r4971
9	9	% macro=AbsoluteEnum()
10	10
11		macro=223;
	11	macro=225;

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

r4936	r4971
9	9	% macro=AdjointEnum()
10	10
11		macro=238;
	11	macro=240;

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

r4936	r4971
9	9	% macro=BetaEnum()
10	10
11		macro=233;
	11	macro=235;

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

r4936	r4971
9	9	% macro=BoolExternalResultEnum()
10	10
11		macro=209;
	11	macro=211;

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

r4936	r4971
9	9	% macro=CmGradientEnum()
10	10
11		macro=234;
	11	macro=236;

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

r4936	r4971
9	9	% macro=CmJumpEnum()
10	10
11		macro=235;
	11	macro=237;

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

r4936	r4971
9	9	% macro=CmMaxEnum()
10	10
11		macro=236;
	11	macro=238;

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

r4936	r4971
9	9	% macro=CmMinEnum()
10	10
11		macro=237;
	11	macro=239;

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

r4936	r4971
9	9	% macro=ColinearEnum()
10	10
11		macro=231;
	11	macro=233;

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

r4936	r4971
9	9	% macro=ConnectivityEnum()
10	10
11		macro=241;
	11	macro=243;

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

r4936	r4971
9	9	% macro=ControlParameterEnum()
10	10
11		macro=242;
	11	macro=244;

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

r4936	r4971
9	9	% macro=ControlSteadyEnum()
10	10
11		macro=243;
	11	macro=245;

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

r4936	r4971
9	9	% macro=DakotaParameterEnum()
10	10
11		macro=244;
	11	macro=246;

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

r4936	r4971
9	9	% macro=DimEnum()
10	10
11		macro=245;
	11	macro=247;

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

r4936	r4971
9	9	% macro=DoubleElementResultEnum()
10	10
11		macro=206;
	11	macro=208;

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

r4936	r4971
9	9	% macro=DoubleExternalResultEnum()
10	10
11		macro=210;
	11	macro=212;

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

r4936	r4971
9	9	% macro=DoubleMatExternalResultEnum()
10	10
11		macro=212;
	11	macro=214;

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

r4936	r4971
9	9	% macro=DoubleVecExternalResultEnum()
10	10
11		macro=211;
	11	macro=213;

issm/trunk/src/m/enum/EnumAsString.m

-              r4936
+              r4971
         case InternalEnum(), string='Internal'; return
         case KflagEnum(), string='Kflag'; return
+        case MassFluxEnum(), string='MassFlux'; return
         case MaxPenetrationEnum(), string='MaxPenetration'; return
         case MeanVelEnum(), string='MeanVel'; return
         case MeltingOffsetEnum(), string='MeltingOffset'; return
         case MeltingRateEnum(), string='MeltingRate'; return
+        case MisfitEnum(), string='Misfit'; return
         case NodeOnBedEnum(), string='NodeOnBed'; return
         case NodeOnIceSheetEnum(), string='NodeOnIceSheet'; return

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

r4936	r4971
9	9	% macro=EpsAbsEnum()
10	10
11		macro=246;
	11	macro=248;

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

r4936	r4971
9	9	% macro=EpsCmEnum()
10	10
11		macro=247;
	11	macro=249;

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

r4936	r4971
9	9	% macro=EpsRelEnum()
10	10
11		macro=248;
	11	macro=250;

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

r4936	r4971
9	9	% macro=EpsResEnum()
10	10
11		macro=249;
	11	macro=251;

issm/trunk/src/m/enum/ExtrudeParamEnum.m

r4936	r4971
9	9	% macro=ExtrudeParamEnum()
10	10
11		macro=250;
	11	macro=252;

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

r4936	r4971
9	9	% macro=GradientEnum()
10	10
11		macro=239;
	11	macro=241;

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

r4936	r4971
9	9	% macro=GravityEnum()
10	10
11		macro=226;
	11	macro=228;

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

r4936	r4971
9	9	% macro=HeatCapacityEnum()
10	10
11		macro=251;
	11	macro=253;

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

r4936	r4971
9	9	% macro=IntExternalResultEnum()
10	10
11		macro=213;
	11	macro=215;

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

r4936	r4971
9	9	% macro=IntersectEnum()
10	10
11		macro=230;
	11	macro=232;

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

r4936	r4971
9	9	% macro=IsHutterEnum()
10	10
11		macro=252;
	11	macro=254;

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

r4936	r4971
9	9	% macro=IsMacAyealPattynEnum()
10	10
11		macro=253;
	11	macro=255;

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

r4936	r4971
9	9	% macro=IsStokesEnum()
10	10
11		macro=254;
	11	macro=256;

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

r4936	r4971
9	9	% macro=JEnum()
10	10
11		macro=216;
	11	macro=218;

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

r4936	r4971
9	9	% macro=LatentHeatEnum()
10	10
11		macro=255;
	11	macro=257;

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

r4936	r4971
9	9	% macro=LowmemEnum()
10	10
11		macro=256;
	11	macro=258;

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

r4936	r4971
9	9	% macro=MaxIterEnum()
10	10
11		macro=257;
	11	macro=259;

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

r4936	r4971
9	9	% macro=MaxNonlinearIterationsEnum()
10	10
11		macro=258;
	11	macro=260;

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

r4928	r4971
9	9	% macro=MaxPenetrationEnum()
10	10
11		macro=154;
	11	macro=155;

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

r4928	r4971
9	9	% macro=MeanVelEnum()
10	10
11		macro=155;
	11	macro=156;

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

r4928	r4971
9	9	% macro=MeltingOffsetEnum()
10	10
11		macro=156;
	11	macro=157;

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

r4936	r4971
9	9	% macro=MeltingPointEnum()
10	10
11		macro=259;
	11	macro=261;

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

r4928	r4971
9	9	% macro=MeltingRateEnum()
10	10
11		macro=157;
	11	macro=158;

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

r4936	r4971
9	9	% macro=MinMechanicalConstraintsEnum()
10	10
11		macro=260;
	11	macro=262;

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

r4936	r4971
9	9	% macro=MinThermalConstraintsEnum()
10	10
11		macro=261;
	11	macro=263;

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

r4936	r4971
9	9	% macro=MiniEnum()
10	10
11		macro=205;
	11	macro=207;

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

r4936	r4971
9	9	% macro=MixedLayerCapacityEnum()
10	10
11		macro=228;
	11	macro=230;

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

r4936	r4971
9	9	% macro=NStepsEnum()
10	10
11		macro=262;
	11	macro=264;

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

r4936	r4971
9	9	% macro=NdtEnum()
10	10
11		macro=263;
	11	macro=265;

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

r4928	r4971
9	9	% macro=NodeOnBedEnum()
10	10
11		macro=158;
	11	macro=160;

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

r4928	r4971
9	9	% macro=NodeOnIceSheetEnum()
10	10
11		macro=159;
	11	macro=161;

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

r4928	r4971
9	9	% macro=NodeOnIceShelfEnum()
10	10
11		macro=160;
	11	macro=162;

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

r4928	r4971
9	9	% macro=NodeOnSurfaceEnum()
10	10
11		macro=161;
	11	macro=163;

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

r4936	r4971
9	9	% macro=NumOutputEnum()
10	10
11		macro=264;
	11	macro=266;

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

r4936	r4971
9	9	% macro=NumRiftsEnum()
10	10
11		macro=265;
	11	macro=267;

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

r4928	r4971
9	9	% macro=NumberNodeToElementConnectivityEnum()
10	10
11		macro=162;
	11	macro=164;

issm/trunk/src/m/enum/NumberOfDofsPerNodeEnum.m

r4936	r4971
9	9	% macro=NumberOfDofsPerNodeEnum()
10	10
11		macro=266;
	11	macro=268;

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

r4936	r4971
9	9	% macro=NumberOfElementsEnum()
10	10
11		macro=267;
	11	macro=269;

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

r4936	r4971
9	9	% macro=NumberOfNodesEnum()
10	10
11		macro=268;
	11	macro=270;

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

r4936	r4971
9	9	% macro=NumberOfVerticesEnum()
10	10
11		macro=269;
	11	macro=271;

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

r4936	r4971
9	9	% macro=OldGradientEnum()
10	10
11		macro=240;
	11	macro=242;

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

r4936	r4971
9	9	% macro=OptScalEnum()
10	10
11		macro=270;
	11	macro=272;

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

r4936	r4971
9	9	% macro=OutputFilePointerEnum()
10	10
11		macro=271;
	11	macro=273;

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

r4936	r4971
9	9	% macro=P0Enum()
10	10
11		macro=202;
	11	macro=204;

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

r4936	r4971
9	9	% macro=P1DGEnum()
10	10
11		macro=204;
	11	macro=206;

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

r4936	r4971
9	9	% macro=P1Enum()
10	10
11		macro=203;
	11	macro=205;

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

r4936	r4971
9	9	% macro=ParameterOutputEnum()
10	10
11		macro=272;
	11	macro=274;

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

r4936	r4971
9	9	% macro=PatchEnum()
10	10
11		macro=217;
	11	macro=219;

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

r4936	r4971
9	9	% macro=PatchNodesEnum()
10	10
11		macro=219;
	11	macro=221;

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

r4936	r4971
9	9	% macro=PatchVerticesEnum()
10	10
11		macro=218;
	11	macro=220;

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

r4936	r4971
9	9	% macro=PenaltyMeltingEnum()
10	10
11		macro=273;
	11	macro=275;

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

r4928	r4971
9	9	% macro=PenaltyOffsetEnum()
10	10
11		macro=163;
	11	macro=165;

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

r4936	r4971
9	9	% macro=PentaVertexElementResultEnum()
10	10
11		macro=208;
	11	macro=210;

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

r4936	r4971
9	9	% macro=PetscVecExternalResultEnum()
10	10
11		macro=214;
	11	macro=216;

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

r4928	r4971
9	9	% macro=PflagEnum()
10	10
11		macro=164;
	11	macro=166;

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

r4928	r4971
9	9	% macro=PressureEnum()
10	10
11		macro=165;
	11	macro=167;

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

r4928	r4971
9	9	% macro=PressureOldEnum()
10	10
11		macro=166;
	11	macro=168;

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

r4936	r4971
9	9	% macro=QmuAnalysisEnum()
10	10
11		macro=274;
	11	macro=276;

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

r4936	r4971
9	9	% macro=QmuErrNameEnum()
10	10
11		macro=275;
	11	macro=277;

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

r4936	r4971
9	9	% macro=QmuInNameEnum()
10	10
11		macro=276;
	11	macro=278;

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

r4936	r4971
9	9	% macro=QmuMassFluxSegmentsEnum()
10	10
11		macro=277;
	11	macro=279;

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

r4936	r4971
9	9	% macro=QmuNPartEnum()
10	10
11		macro=278;
	11	macro=280;

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

r4936	r4971
9	9	% macro=QmuOutNameEnum()
10	10
11		macro=279;
	11	macro=281;

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

r4936	r4971
9	9	% macro=QmuPartEnum()
10	10
11		macro=280;
	11	macro=282;

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

r4928	r4971
9	9	% macro=QmuPressureEnum()
10	10
11		macro=167;
	11	macro=169;

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

r4936	r4971
9	9	% macro=QmuVxEnum()
10	10
11		macro=190;
	11	macro=192;

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

r4936	r4971
9	9	% macro=QmuVyEnum()
10	10
11		macro=195;
	11	macro=197;

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

r4936	r4971
9	9	% macro=QmuVzEnum()
10	10
11		macro=200;
	11	macro=202;

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

r4936	r4971
9	9	% macro=RelativeEnum()
10	10
11		macro=221;
	11	macro=223;

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

r4928	r4971
9	9	% macro=ResetPenaltiesEnum()
10	10
11		macro=168;
	11	macro=170;

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

r4936	r4971
9	9	% macro=ResidualEnum()
10	10
11		macro=222;
	11	macro=224;

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

r4936	r4971
9	9	% macro=ResponseDescriptorsEnum()
10	10
11		macro=281;
	11	macro=283;

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

r4928	r4971
9	9	% macro=RheologyB2dEnum()
10	10
11		macro=170;
	11	macro=172;

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

r4928	r4971
9	9	% macro=RheologyBEnum()
10	10
11		macro=169;
	11	macro=171;

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

r4928	r4971
9	9	% macro=RheologyNEnum()
10	10
11		macro=171;
	11	macro=173;

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

r4936	r4971
9	9	% macro=RhoIceEnum()
10	10
11		macro=224;
	11	macro=226;

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

r4936	r4971
9	9	% macro=RhoWaterEnum()
10	10
11		macro=225;
	11	macro=227;

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

r4928	r4971
9	9	% macro=SegmentOnIceShelfEnum()
10	10
11		macro=172;
	11	macro=174;

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

r4936	r4971
9	9	% macro=SeparateEnum()
10	10
11		macro=232;
	11	macro=234;

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

r4936	r4971
9	9	% macro=SolverStringEnum()
10	10
11		macro=282;
	11	macro=284;

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

r4936	r4971
9	9	% macro=SparsityEnum()
10	10
11		macro=283;
	11	macro=285;

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

r4928	r4971
9	9	% macro=StabilizeConstraintsEnum()
10	10
11		macro=173;
	11	macro=175;

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

r4928	r4971
9	9	% macro=StokesReconditioningEnum()
10	10
11		macro=174;
	11	macro=176;

issm/trunk/src/m/enum/StringAsEnum.m

-              r4936
+              r4971
 elseif (strcmpi(name,'Internal')), enum=InternalEnum(); return
 elseif (strcmpi(name,'Kflag')), enum=KflagEnum(); return
+elseif (strcmpi(name,'MassFlux')), enum=MassFluxEnum(); return
 elseif (strcmpi(name,'MaxPenetration')), enum=MaxPenetrationEnum(); return
 elseif (strcmpi(name,'MeanVel')), enum=MeanVelEnum(); return
 elseif (strcmpi(name,'MeltingOffset')), enum=MeltingOffsetEnum(); return
 elseif (strcmpi(name,'MeltingRate')), enum=MeltingRateEnum(); return
+elseif (strcmpi(name,'Misfit')), enum=MisfitEnum(); return
 elseif (strcmpi(name,'NodeOnBed')), enum=NodeOnBedEnum(); return
 elseif (strcmpi(name,'NodeOnIceSheet')), enum=NodeOnIceSheetEnum(); return

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

r4936	r4971
9	9	% macro=StringExternalResultEnum()
10	10
11		macro=215;
	11	macro=217;

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

r4928	r4971
9	9	% macro=SurfaceAreaEnum()
10	10
11		macro=175;
	11	macro=177;

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

r4928	r4971
9	9	% macro=SurfaceEnum()
10	10
11		macro=176;
	11	macro=178;

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

r4928	r4971
9	9	% macro=SurfaceSlopeXEnum()
10	10
11		macro=177;
	11	macro=179;

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

r4928	r4971
9	9	% macro=SurfaceSlopeYEnum()
10	10
11		macro=178;
	11	macro=180;

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

r4928	r4971
9	9	% macro=TemperatureEnum()
10	10
11		macro=179;
	11	macro=181;

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

r4928	r4971
9	9	% macro=TemperatureOldEnum()
10	10
11		macro=180;
	11	macro=182;

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

r4936	r4971
9	9	% macro=ThermalConductivityEnum()
10	10
11		macro=227;
	11	macro=229;

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

r4936	r4971
9	9	% macro=ThermalExchangeVelocityEnum()
10	10
11		macro=229;
	11	macro=231;

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

r4936	r4971
9	9	% macro=ThicknessEnum()
10	10
11		macro=181;
	11	macro=183;

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

r4936	r4971
9	9	% macro=TimeEnum()
10	10
11		macro=220;
	11	macro=222;

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

r4936	r4971
9	9	% macro=TolXEnum()
10	10
11		macro=284;
	11	macro=286;

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

r4936	r4971
9	9	% macro=TriaVertexElementResultEnum()
10	10
11		macro=207;
	11	macro=209;

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

r4936	r4971
9	9	% macro=TypeEnum()
10	10
11		macro=182;
	11	macro=184;

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

r4936	r4971
9	9	% macro=VariableDescriptorsEnum()
10	10
11		macro=285;
	11	macro=287;

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

r4936	r4971
9	9	% macro=VelEnum()
10	10
11		macro=183;
	11	macro=185;

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

r4936	r4971
9	9	% macro=VelObsEnum()
10	10
11		macro=184;
	11	macro=186;

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

r4936	r4971
9	9	% macro=VerboseEnum()
10	10
11		macro=286;
	11	macro=288;

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

r4936	r4971
9	9	% macro=ViscosityOvershootEnum()
10	10
11		macro=185;
	11	macro=187;

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

r4936	r4971
9	9	% macro=VxAverageEnum()
10	10
11		macro=186;
	11	macro=188;

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

r4936	r4971
9	9	% macro=VxEnum()
10	10
11		macro=187;
	11	macro=189;

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

r4936	r4971
9	9	% macro=VxObsEnum()
10	10
11		macro=188;
	11	macro=190;

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

r4936	r4971
9	9	% macro=VxOldEnum()
10	10
11		macro=189;
	11	macro=191;

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

r4936	r4971
9	9	% macro=VyAverageEnum()
10	10
11		macro=191;
	11	macro=193;

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

r4936	r4971
9	9	% macro=VyEnum()
10	10
11		macro=192;
	11	macro=194;

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

r4936	r4971
9	9	% macro=VyObsEnum()
10	10
11		macro=193;
	11	macro=195;

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

r4936	r4971
9	9	% macro=VyOldEnum()
10	10
11		macro=194;
	11	macro=196;

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

r4936	r4971
9	9	% macro=VzAverageEnum()
10	10
11		macro=196;
	11	macro=198;

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

r4936	r4971
9	9	% macro=VzEnum()
10	10
11		macro=197;
	11	macro=199;

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

r4936	r4971
9	9	% macro=VzObsEnum()
10	10
11		macro=~~198~~;
	11	macro=200;

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

r4936	r4971
9	9	% macro=VzOldEnum()
10	10
11		macro=~~199~~;
	11	macro=201;

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

r4936	r4971
9	9	% macro=WaitOnLockEnum()
10	10
11		macro=287;
	11	macro=289;

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

r4936	r4971
9	9	% macro=WeightsEnum()
10	10
11		macro=201;
	11	macro=203;

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

r4936	r4971
9	9	% macro=YtsEnum()
10	10
11		macro=288;
	11	macro=290;

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

Context Navigation

Changeset 4971

Legend:

Download in other formats: