Context Navigation

← Previous Changeset
Next Changeset →

Changeset 7390

Timestamp:

02/08/11 21:09:53 (14 years ago)

Author:

Eric.Larour

Message:

New Stokes solver related enums

Location:

issm/trunk/src

Files:

: 2 added
: 169 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/AdjointEnum.m (modified) (1 diff)
m/enum/AgressiveMigrationEnum.m (modified) (1 diff)
m/enum/BetaEnum.m (modified) (1 diff)
m/enum/BoolElementResultEnum.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/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/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/FsetEnum.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/GroundingLineMigrationEnum.m (modified) (1 diff)
m/enum/GsetEnum.m (modified) (1 diff)
m/enum/HeatCapacityEnum.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/IntExternalResultEnum.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/JEnum.m (modified) (1 diff)
m/enum/KffEnum.m (modified) (1 diff)
m/enum/LatentHeatEnum.m (modified) (1 diff)
m/enum/LowmemEnum.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/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/MeltingPointEnum.m (modified) (1 diff)
m/enum/MeltingRateCorrectionApplyEnum.m (modified) (1 diff)
m/enum/MeltingRateCorrectionEnum.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/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/NoneEnum.m (modified) (1 diff)
m/enum/NumOutputEnum.m (modified) (1 diff)
m/enum/NumRiftsEnum.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/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/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/PentaVertexElementResultEnum.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/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/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/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/SoftMigrationEnum.m (modified) (1 diff)
m/enum/SparsityEnum.m (modified) (1 diff)
m/enum/SsetEnum.m (modified) (1 diff)
m/enum/StabilizeConstraintsEnum.m (modified) (1 diff)
m/enum/StokesReconditioningEnum.m (modified) (1 diff)
m/enum/StokesSolverEnum.m (added)
m/enum/StringExternalResultEnum.m (modified) (1 diff)
m/enum/StringToEnum.m (modified) (2 diffs)
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/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/ThicknessCoeffEnum.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/VelocityEnum.m (added)
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/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/WeightsEnum.m (modified) (1 diff)
m/enum/YtsEnum.m (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

-              r7355
+              r7390
         PflagEnum,
         PressureEnum,
+        VelocityEnum,
         PressureOldEnum,
         QmuPressureEnum,
 …
         MixedLayerCapacityEnum,
         ThermalExchangeVelocityEnum,
+        /*}}}*/
+        /*Solver{{{1*/
+        StokesSolverEnum,
         /*}}}*/
         /*Parameters{{{1*/

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

-              r7355
+              r7390
                 case PflagEnum : return "Pflag";
                 case PressureEnum : return "Pressure";
+                case VelocityEnum : return "Velocity";
                 case PressureOldEnum : return "PressureOld";
                 case QmuPressureEnum : return "QmuPressure";
 …
                 case MixedLayerCapacityEnum : return "MixedLayerCapacity";
                 case ThermalExchangeVelocityEnum : return "ThermalExchangeVelocity";
+                case StokesSolverEnum : return "StokesSolver";
                 case IntersectEnum : return "Intersect";
                 case ColinearEnum : return "Colinear";

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

-              r7355
+              r7390
         else if (strcmp(name,"Pflag")==0) return PflagEnum;
         else if (strcmp(name,"Pressure")==0) return PressureEnum;
+        else if (strcmp(name,"Velocity")==0) return VelocityEnum;
         else if (strcmp(name,"PressureOld")==0) return PressureOldEnum;
         else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
 …
         else if (strcmp(name,"MixedLayerCapacity")==0) return MixedLayerCapacityEnum;
         else if (strcmp(name,"ThermalExchangeVelocity")==0) return ThermalExchangeVelocityEnum;
+        else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum;
         else if (strcmp(name,"Intersect")==0) return IntersectEnum;
         else if (strcmp(name,"Colinear")==0) return ColinearEnum;

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

r7355	r7390
9	9	% macro=AbsoluteEnum()
10	10
11		macro=260;
	11	macro=261;

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

r7355	r7390
9	9	% macro=AdjointEnum()
10	10
11		macro=281;
	11	macro=283;

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

r7355	r7390
9	9	% macro=AgressiveMigrationEnum()
10	10
11		macro=263;
	11	macro=264;

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

r7355	r7390
9	9	% macro=BetaEnum()
10	10
11		macro=276;
	11	macro=278;

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

r7355	r7390
9	9	% macro=BoolElementResultEnum()
10	10
11		macro=232;
	11	macro=233;

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

r7355	r7390
9	9	% macro=BoolExternalResultEnum()
10	10
11		macro=233;
	11	macro=234;

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

r7355	r7390
9	9	% macro=CmGradientEnum()
10	10
11		macro=277;
	11	macro=279;

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

r7355	r7390
9	9	% macro=CmJumpEnum()
10	10
11		macro=278;
	11	macro=280;

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

r7355	r7390
9	9	% macro=CmMaxEnum()
10	10
11		macro=279;
	11	macro=281;

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

r7355	r7390
9	9	% macro=CmMinEnum()
10	10
11		macro=280;
	11	macro=282;

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

r7355	r7390
9	9	% macro=ColinearEnum()
10	10
11		macro=274;
	11	macro=276;

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

r7355	r7390
9	9	% macro=ConnectivityEnum()
10	10
11		macro=287;
	11	macro=289;

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

r7355	r7390
9	9	% macro=ControlSteadyEnum()
10	10
11		macro=288;
	11	macro=290;

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

r7355	r7390
9	9	% macro=DakotaParameterEnum()
10	10
11		macro=289;
	11	macro=291;

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

r7355	r7390
9	9	% macro=DimEnum()
10	10
11		macro=290;
	11	macro=292;

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

r7355	r7390
9	9	% macro=DoubleElementResultEnum()
10	10
11		macro=229;
	11	macro=230;

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

r7355	r7390
9	9	% macro=DoubleExternalResultEnum()
10	10
11		macro=234;
	11	macro=235;

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

r7355	r7390
9	9	% macro=DoubleMatExternalResultEnum()
10	10
11		macro=236;
	11	macro=237;

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

r7355	r7390
9	9	% macro=DoubleVecExternalResultEnum()
10	10
11		macro=235;
	11	macro=236;

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

-              r7355
+              r7390
 case PflagEnum(), string='Pflag'; return
 case PressureEnum(), string='Pressure'; return
+case VelocityEnum(), string='Velocity'; return
 case PressureOldEnum(), string='PressureOld'; return
 case QmuPressureEnum(), string='QmuPressure'; return
 …
 case MixedLayerCapacityEnum(), string='MixedLayerCapacity'; return
 case ThermalExchangeVelocityEnum(), string='ThermalExchangeVelocity'; return
+case StokesSolverEnum(), string='StokesSolver'; return
 case IntersectEnum(), string='Intersect'; return
 case ColinearEnum(), string='Colinear'; return

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

r7355	r7390
9	9	% macro=EpsAbsEnum()
10	10
11		macro=291;
	11	macro=293;

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

r7355	r7390
9	9	% macro=EpsCmEnum()
10	10
11		macro=292;
	11	macro=294;

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

r7355	r7390
9	9	% macro=EpsRelEnum()
10	10
11		macro=293;
	11	macro=295;

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

r7355	r7390
9	9	% macro=EpsResEnum()
10	10
11		macro=294;
	11	macro=296;

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

r7355	r7390
9	9	% macro=FsetEnum()
10	10
11		macro=343;
	11	macro=345;

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

r7355	r7390
9	9	% macro=Gradient1Enum()
10	10
11		macro=283;
	11	macro=285;

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

r7355	r7390
9	9	% macro=Gradient2Enum()
10	10
11		macro=284;
	11	macro=286;

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

r7355	r7390
9	9	% macro=Gradient3Enum()
10	10
11		macro=285;
	11	macro=287;

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

r7355	r7390
9	9	% macro=GradientEnum()
10	10
11		macro=282;
	11	macro=284;

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

r7355	r7390
9	9	% macro=GravityEnum()
10	10
11		macro=267;
	11	macro=268;

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

r7355	r7390
9	9	% macro=GroundingLineMigrationEnum()
10	10
11		macro=345;
	11	macro=347;

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

r7355	r7390
9	9	% macro=GsetEnum()
10	10
11		macro=342;
	11	macro=344;

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

r7355	r7390
9	9	% macro=HeatCapacityEnum()
10	10
11		macro=295;
	11	macro=297;

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

r7355	r7390
9	9	% macro=IncrementalEnum()
10	10
11		macro=261;
	11	macro=262;

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

r7355	r7390
9	9	% macro=IndexEnum()
10	10
11		macro=330;
	11	macro=332;

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

r7355	r7390
9	9	% macro=IndexedEnum()
10	10
11		macro=328;
	11	macro=330;

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

r7355	r7390
9	9	% macro=IntExternalResultEnum()
10	10
11		macro=237;
	11	macro=238;

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

r7355	r7390
9	9	% macro=IntersectEnum()
10	10
11		macro=273;
	11	macro=275;

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

r7355	r7390
9	9	% macro=IoGatherEnum()
10	10
11		macro=246;
	11	macro=247;

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

r7355	r7390
9	9	% macro=IsHutterEnum()
10	10
11		macro=296;
	11	macro=298;

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

r7355	r7390
9	9	% macro=IsMacAyealPattynEnum()
10	10
11		macro=297;
	11	macro=299;

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

r7355	r7390
9	9	% macro=IsStokesEnum()
10	10
11		macro=~~298~~;
	11	macro=300;

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

r7355	r7390
9	9	% macro=JEnum()
10	10
11		macro=240;
	11	macro=241;

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

r7355	r7390
9	9	% macro=KffEnum()
10	10
11		macro=~~299~~;
	11	macro=301;

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

r7355	r7390
9	9	% macro=LatentHeatEnum()
10	10
11		macro=300;
	11	macro=302;

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

r7355	r7390
9	9	% macro=LowmemEnum()
10	10
11		macro=301;
	11	macro=303;

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

r7355	r7390
9	9	% macro=MaxAbsVxEnum()
10	10
11		macro=251;
	11	macro=252;

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

r7355	r7390
9	9	% macro=MaxAbsVyEnum()
10	10
11		macro=254;
	11	macro=255;

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

r7355	r7390
9	9	% macro=MaxAbsVzEnum()
10	10
11		macro=257;
	11	macro=258;

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

r7355	r7390
9	9	% macro=MaxIterEnum()
10	10
11		macro=302;
	11	macro=304;

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

r7355	r7390
9	9	% macro=MaxNonlinearIterationsEnum()
10	10
11		macro=303;
	11	macro=305;

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

r7355	r7390
9	9	% macro=MaxVelEnum()
10	10
11		macro=248;
	11	macro=249;

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

r7355	r7390
9	9	% macro=MaxVxEnum()
10	10
11		macro=250;
	11	macro=251;

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

r7355	r7390
9	9	% macro=MaxVyEnum()
10	10
11		macro=253;
	11	macro=254;

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

r7355	r7390
9	9	% macro=MaxVzEnum()
10	10
11		macro=256;
	11	macro=257;

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

r7355	r7390
9	9	% macro=MeltingPointEnum()
10	10
11		macro=304;
	11	macro=306;

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

r7355	r7390
9	9	% macro=MeltingRateCorrectionApplyEnum()
10	10
11		macro=270;
	11	macro=271;

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

r7355	r7390
9	9	% macro=MeltingRateCorrectionEnum()
10	10
11		macro=269;
	11	macro=270;

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

r7355	r7390
9	9	% macro=MinMechanicalConstraintsEnum()
10	10
11		macro=305;
	11	macro=307;

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

r7355	r7390
9	9	% macro=MinThermalConstraintsEnum()
10	10
11		macro=306;
	11	macro=308;

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

r7355	r7390
9	9	% macro=MinVelEnum()
10	10
11		macro=247;
	11	macro=248;

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

r7355	r7390
9	9	% macro=MinVxEnum()
10	10
11		macro=249;
	11	macro=250;

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

r7355	r7390
9	9	% macro=MinVyEnum()
10	10
11		macro=252;
	11	macro=253;

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

r7355	r7390
9	9	% macro=MinVzEnum()
10	10
11		macro=255;
	11	macro=256;

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

r7355	r7390
9	9	% macro=MiniEnum()
10	10
11		macro=228;
	11	macro=229;

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

r7355	r7390
9	9	% macro=MixedLayerCapacityEnum()
10	10
11		macro=271;
	11	macro=272;

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

r7355	r7390
9	9	% macro=NStepsEnum()
10	10
11		macro=307;
	11	macro=309;

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

r7355	r7390
9	9	% macro=NdtEnum()
10	10
11		macro=308;
	11	macro=310;

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

r7355	r7390
9	9	% macro=NodalEnum()
10	10
11		macro=332;
	11	macro=334;

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

r7355	r7390
9	9	% macro=NoneEnum()
10	10
11		macro=262;
	11	macro=263;

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

r7355	r7390
9	9	% macro=NumOutputEnum()
10	10
11		macro=309;
	11	macro=311;

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

r7355	r7390
9	9	% macro=NumRiftsEnum()
10	10
11		macro=310;
	11	macro=312;

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

r7355	r7390
9	9	% macro=NumberOfElementsEnum()
10	10
11		macro=311;
	11	macro=313;

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

r7355	r7390
9	9	% macro=NumberOfNodesEnum()
10	10
11		macro=312;
	11	macro=314;

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

r7355	r7390
9	9	% macro=NumberOfVerticesEnum()
10	10
11		macro=313;
	11	macro=315;

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

r7355	r7390
9	9	% macro=OldGradientEnum()
10	10
11		macro=286;
	11	macro=288;

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

r7355	r7390
9	9	% macro=OptScalEnum()
10	10
11		macro=314;
	11	macro=316;

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

r7355	r7390
9	9	% macro=OutputFileNameEnum()
10	10
11		macro=316;
	11	macro=318;

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

r7355	r7390
9	9	% macro=OutputFilePointerEnum()
10	10
11		macro=315;
	11	macro=317;

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

r7355	r7390
9	9	% macro=OutputFrequencyEnum()
10	10
11		macro=245;
	11	macro=246;

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

r7355	r7390
9	9	% macro=P0Enum()
10	10
11		macro=225;
	11	macro=226;

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

r7355	r7390
9	9	% macro=P1DGEnum()
10	10
11		macro=227;
	11	macro=228;

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

r7355	r7390
9	9	% macro=P1Enum()
10	10
11		macro=226;
	11	macro=227;

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

r7355	r7390
9	9	% macro=ParameterOutputEnum()
10	10
11		macro=317;
	11	macro=319;

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

r7355	r7390
9	9	% macro=PatchEnum()
10	10
11		macro=241;
	11	macro=242;

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

r7355	r7390
9	9	% macro=PatchNodesEnum()
10	10
11		macro=243;
	11	macro=244;

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

r7355	r7390
9	9	% macro=PatchVerticesEnum()
10	10
11		macro=242;
	11	macro=243;

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

r7355	r7390
9	9	% macro=PenaltyMeltingEnum()
10	10
11		macro=318;
	11	macro=320;

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

r7355	r7390
9	9	% macro=PentaVertexElementResultEnum()
10	10
11		macro=231;
	11	macro=232;

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

r7355	r7390
9	9	% macro=PetscOptionsAnalysesEnum()
10	10
11		macro=341;
	11	macro=343;

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

r7355	r7390
9	9	% macro=PetscOptionsStringsEnum()
10	10
11		macro=340;
	11	macro=342;

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

r7355	r7390
9	9	% macro=PetscRcEnum()
10	10
11		macro=334;
	11	macro=336;

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

r7355	r7390
9	9	% macro=PetscVecExternalResultEnum()
10	10
11		macro=238;
	11	macro=239;

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

r7355	r7390
9	9	% macro=PressureOldEnum()
10	10
11		macro=183;
	11	macro=184;

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

r7355	r7390
9	9	% macro=QmuAnalysisEnum()
10	10
11		macro=319;
	11	macro=321;

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

r7355	r7390
9	9	% macro=QmuErrNameEnum()
10	10
11		macro=320;
	11	macro=322;

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

r7355	r7390
9	9	% macro=QmuInNameEnum()
10	10
11		macro=321;
	11	macro=323;

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

r7355	r7390
9	9	% macro=QmuMassFluxSegmentsEnum()
10	10
11		macro=322;
	11	macro=324;

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

r7355	r7390
9	9	% macro=QmuNPartEnum()
10	10
11		macro=323;
	11	macro=325;

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

r7355	r7390
9	9	% macro=QmuNumberOfResponsesEnum()
10	10
11		macro=326;
	11	macro=328;

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

r7355	r7390
9	9	% macro=QmuOutNameEnum()
10	10
11		macro=324;
	11	macro=326;

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

r7355	r7390
9	9	% macro=QmuPartEnum()
10	10
11		macro=325;
	11	macro=327;

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

r7355	r7390
9	9	% macro=QmuPressureEnum()
10	10
11		macro=184;
	11	macro=185;

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

r7355	r7390
9	9	% macro=QmuSaveFemmodelEnum()
10	10
11		macro=327;
	11	macro=329;

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

r7355	r7390
9	9	% macro=QmuVxEnum()
10	10
11		macro=210;
	11	macro=211;

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

r7355	r7390
9	9	% macro=QmuVyEnum()
10	10
11		macro=215;
	11	macro=216;

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

r7355	r7390
9	9	% macro=QmuVzEnum()
10	10
11		macro=223;
	11	macro=224;

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

r7355	r7390
9	9	% macro=RegularEnum()
10	10
11		macro=329;
	11	macro=331;

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

r7355	r7390
9	9	% macro=RelativeEnum()
10	10
11		macro=258;
	11	macro=259;

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

r7355	r7390
9	9	% macro=ResetPenaltiesEnum()
10	10
11		macro=185;
	11	macro=186;

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

r7355	r7390
9	9	% macro=ResidualEnum()
10	10
11		macro=259;
	11	macro=260;

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

r7355	r7390
9	9	% macro=ResponseDescriptorsEnum()
10	10
11		macro=333;
	11	macro=335;

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

r7355	r7390
9	9	% macro=RheologyBEnum()
10	10
11		macro=186;
	11	macro=187;

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

r7355	r7390
9	9	% macro=RheologyBbarEnum()
10	10
11		macro=187;
	11	macro=188;

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

r7355	r7390
9	9	% macro=RheologyNEnum()
10	10
11		macro=188;
	11	macro=189;

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

r7355	r7390
9	9	% macro=RhoIceEnum()
10	10
11		macro=265;
	11	macro=266;

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

r7355	r7390
9	9	% macro=RhoWaterEnum()
10	10
11		macro=266;
	11	macro=267;

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

r7355	r7390
9	9	% macro=ScaledEnum()
10	10
11		macro=331;
	11	macro=333;

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

r7355	r7390
9	9	% macro=SegmentOnIceShelfEnum()
10	10
11		macro=189;
	11	macro=190;

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

r7355	r7390
9	9	% macro=SeparateEnum()
10	10
11		macro=275;
	11	macro=277;

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

r7355	r7390
9	9	% macro=SoftMigrationEnum()
10	10
11		macro=264;
	11	macro=265;

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

r7355	r7390
9	9	% macro=SparsityEnum()
10	10
11		macro=335;
	11	macro=337;

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

r7355	r7390
9	9	% macro=SsetEnum()
10	10
11		macro=344;
	11	macro=346;

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

r7355	r7390
9	9	% macro=StabilizeConstraintsEnum()
10	10
11		macro=190;
	11	macro=191;

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

r7355	r7390
9	9	% macro=StokesReconditioningEnum()
10	10
11		macro=191;
	11	macro=192;

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

r7355	r7390
9	9	% macro=StringExternalResultEnum()
10	10
11		macro=239;
	11	macro=240;

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

-              r7355
+              r7390
                         elseif (strcmpi(name,'Pflag')), enum=PflagEnum(); return
                         elseif (strcmpi(name,'Pressure')), enum=PressureEnum(); return
+                        elseif (strcmpi(name,'Velocity')), enum=VelocityEnum(); return
                         elseif (strcmpi(name,'PressureOld')), enum=PressureOldEnum(); return
                         elseif (strcmpi(name,'QmuPressure')), enum=QmuPressureEnum(); return
 …
                         elseif (strcmpi(name,'MixedLayerCapacity')), enum=MixedLayerCapacityEnum(); return
                         elseif (strcmpi(name,'ThermalExchangeVelocity')), enum=ThermalExchangeVelocityEnum(); return
+                        elseif (strcmpi(name,'StokesSolver')), enum=StokesSolverEnum(); return
                         elseif (strcmpi(name,'Intersect')), enum=IntersectEnum(); return
                         elseif (strcmpi(name,'Colinear')), enum=ColinearEnum(); return

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

r7355	r7390
9	9	% macro=SurfaceAreaEnum()
10	10
11		macro=192;
	11	macro=193;

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

r7355	r7390
9	9	% macro=SurfaceEnum()
10	10
11		macro=193;
	11	macro=194;

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

r7355	r7390
9	9	% macro=SurfaceSlopeXEnum()
10	10
11		macro=194;
	11	macro=195;

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

r7355	r7390
9	9	% macro=SurfaceSlopeYEnum()
10	10
11		macro=195;
	11	macro=196;

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

r7355	r7390
9	9	% macro=TemperatureEnum()
10	10
11		macro=196;
	11	macro=197;

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

r7355	r7390
9	9	% macro=TemperatureOldEnum()
10	10
11		macro=198;
	11	macro=199;

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

r7355	r7390
9	9	% macro=TemporaryTemperatureEnum()
10	10
11		macro=197;
	11	macro=198;

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

r7355	r7390
9	9	% macro=ThermalConductivityEnum()
10	10
11		macro=268;
	11	macro=269;

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

r7355	r7390
9	9	% macro=ThermalExchangeVelocityEnum()
10	10
11		macro=272;
	11	macro=273;

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

r7355	r7390
9	9	% macro=ThicknessCoeffEnum()
10	10
11		macro=200;
	11	macro=201;

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

r7355	r7390
9	9	% macro=ThicknessEnum()
10	10
11		macro=~~199~~;
	11	macro=200;

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

r7355	r7390
9	9	% macro=ThicknessObsEnum()
10	10
11		macro=201;
	11	macro=202;

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

r7355	r7390
9	9	% macro=TimeEnum()
10	10
11		macro=244;
	11	macro=245;

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

r7355	r7390
9	9	% macro=TolXEnum()
10	10
11		macro=336;
	11	macro=338;

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

r7355	r7390
9	9	% macro=TriaVertexElementResultEnum()
10	10
11		macro=230;
	11	macro=231;

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

r7355	r7390
9	9	% macro=TypeEnum()
10	10
11		macro=202;
	11	macro=203;

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

r7355	r7390
9	9	% macro=VariableDescriptorsEnum()
10	10
11		macro=337;
	11	macro=339;

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

r7355	r7390
9	9	% macro=VelEnum()
10	10
11		macro=203;
	11	macro=204;

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

r7355	r7390
9	9	% macro=VelObsEnum()
10	10
11		macro=204;
	11	macro=205;

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

r7355	r7390
9	9	% macro=VerboseEnum()
10	10
11		macro=338;
	11	macro=340;

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

r7355	r7390
9	9	% macro=ViscosityOvershootEnum()
10	10
11		macro=205;
	11	macro=206;

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

r7355	r7390
9	9	% macro=VxAverageEnum()
10	10
11		macro=206;
	11	macro=207;

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

r7355	r7390
9	9	% macro=VxEnum()
10	10
11		macro=207;
	11	macro=208;

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

r7355	r7390
9	9	% macro=VxObsEnum()
10	10
11		macro=208;
	11	macro=209;

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

r7355	r7390
9	9	% macro=VxOldEnum()
10	10
11		macro=209;
	11	macro=210;

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

r7355	r7390
9	9	% macro=VyAverageEnum()
10	10
11		macro=211;
	11	macro=212;

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

r7355	r7390
9	9	% macro=VyEnum()
10	10
11		macro=212;
	11	macro=213;

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

r7355	r7390
9	9	% macro=VyObsEnum()
10	10
11		macro=213;
	11	macro=214;

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

r7355	r7390
9	9	% macro=VyOldEnum()
10	10
11		macro=214;
	11	macro=215;

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

r7355	r7390
9	9	% macro=VzAverageEnum()
10	10
11		macro=216;
	11	macro=217;

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

r7355	r7390
9	9	% macro=VzEnum()
10	10
11		macro=217;
	11	macro=218;

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

r7355	r7390
9	9	% macro=VzMacAyealEnum()
10	10
11		macro=220;
	11	macro=221;

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

r7355	r7390
9	9	% macro=VzObsEnum()
10	10
11		macro=218;
	11	macro=219;

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

r7355	r7390
9	9	% macro=VzOldEnum()
10	10
11		macro=219;
	11	macro=220;

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

r7355	r7390
9	9	% macro=VzPattynEnum()
10	10
11		macro=221;
	11	macro=222;

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

r7355	r7390
9	9	% macro=VzStokesEnum()
10	10
11		macro=222;
	11	macro=223;

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

r7355	r7390
9	9	% macro=WaitOnLockEnum()
10	10
11		macro=339;
	11	macro=341;

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

r7355	r7390
9	9	% macro=WeightsEnum()
10	10
11		macro=224;
	11	macro=225;

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

r7355	r7390
9	9	% macro=YtsEnum()
10	10
11		macro=346;
	11	macro=348;

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