Context Navigation

← Previous Changeset
Next Changeset →

Changeset 7351

Timestamp:

Feb 4, 2011, 9:20:14 PM (16 years ago)

Author:

Eric.Larour

Message:

New enums for melting rate correction.

Location:

issm/trunk/src

Files:

: 2 added
: 81 edited

c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
c/EnumDefinitions/EnumToString.cpp (modified) (1 diff)
c/EnumDefinitions/StringToEnum.cpp (modified) (1 diff)
m/enum/AdjointEnum.m (modified) (1 diff)
m/enum/BetaEnum.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/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/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/GroundingLineMigrationEnum.m (modified) (1 diff)
m/enum/GsetEnum.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/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/KffEnum.m (modified) (1 diff)
m/enum/LatentHeatEnum.m (modified) (1 diff)
m/enum/LowmemEnum.m (modified) (1 diff)
m/enum/MaxIterEnum.m (modified) (1 diff)
m/enum/MaxNonlinearIterationsEnum.m (modified) (1 diff)
m/enum/MeltingPointEnum.m (modified) (1 diff)
m/enum/MeltingRateCorrectionApplyEnum.m (added)
m/enum/MeltingRateCorrectionEnum.m (added)
m/enum/MinMechanicalConstraintsEnum.m (modified) (1 diff)
m/enum/MinThermalConstraintsEnum.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/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/ParameterOutputEnum.m (modified) (1 diff)
m/enum/PenaltyMeltingEnum.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/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/QmuSaveFemmodelEnum.m (modified) (1 diff)
m/enum/RegularEnum.m (modified) (1 diff)
m/enum/ResponseDescriptorsEnum.m (modified) (1 diff)
m/enum/ScaledEnum.m (modified) (1 diff)
m/enum/SeparateEnum.m (modified) (1 diff)
m/enum/SparsityEnum.m (modified) (1 diff)
m/enum/SsetEnum.m (modified) (1 diff)
m/enum/StringToEnum.m (modified) (1 diff)
m/enum/ThermalExchangeVelocityEnum.m (modified) (1 diff)
m/enum/TolXEnum.m (modified) (1 diff)
m/enum/VariableDescriptorsEnum.m (modified) (1 diff)
m/enum/VerboseEnum.m (modified) (1 diff)
m/enum/WaitOnLockEnum.m (modified) (1 diff)
m/enum/YtsEnum.m (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

r7302	r7351
326	326	GravityEnum,
327	327	ThermalConductivityEnum,
	328	MeltingRateCorrectionEnum,
	329	MeltingRateCorrectionApplyEnum,
328	330	MixedLayerCapacityEnum,
329	331	ThermalExchangeVelocityEnum,

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

r7302	r7351
284	284	case GravityEnum : return "Gravity";
285	285	case ThermalConductivityEnum : return "ThermalConductivity";
	286	case MeltingRateCorrectionEnum : return "MeltingRateCorrection";
	287	case MeltingRateCorrectionApplyEnum : return "MeltingRateCorrectionApply";
286	288	case MixedLayerCapacityEnum : return "MixedLayerCapacity";
287	289	case ThermalExchangeVelocityEnum : return "ThermalExchangeVelocity";

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

r7302	r7351
282	282	else if (strcmp(name,"Gravity")==0) return GravityEnum;
283	283	else if (strcmp(name,"ThermalConductivity")==0) return ThermalConductivityEnum;
	284	else if (strcmp(name,"MeltingRateCorrection")==0) return MeltingRateCorrectionEnum;
	285	else if (strcmp(name,"MeltingRateCorrectionApply")==0) return MeltingRateCorrectionApplyEnum;
284	286	else if (strcmp(name,"MixedLayerCapacity")==0) return MixedLayerCapacityEnum;
285	287	else if (strcmp(name,"ThermalExchangeVelocity")==0) return ThermalExchangeVelocityEnum;

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

r7302	r7351
9	9	% macro=AdjointEnum()
10	10
11		macro=278;
	11	macro=280;

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

r7302	r7351
9	9	% macro=BetaEnum()
10	10
11		macro=273;
	11	macro=275;

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

r7302	r7351
9	9	% macro=CmGradientEnum()
10	10
11		macro=274;
	11	macro=276;

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

r7302	r7351
9	9	% macro=CmJumpEnum()
10	10
11		macro=275;
	11	macro=277;

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

r7302	r7351
9	9	% macro=CmMaxEnum()
10	10
11		macro=276;
	11	macro=278;

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

r7302	r7351
9	9	% macro=CmMinEnum()
10	10
11		macro=277;
	11	macro=279;

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

r7302	r7351
9	9	% macro=ColinearEnum()
10	10
11		macro=271;
	11	macro=273;

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

r7302	r7351
9	9	% macro=ConnectivityEnum()
10	10
11		macro=284;
	11	macro=286;

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

r7302	r7351
9	9	% macro=ControlSteadyEnum()
10	10
11		macro=285;
	11	macro=287;

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

r7302	r7351
9	9	% macro=DakotaParameterEnum()
10	10
11		macro=286;
	11	macro=288;

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

r7302	r7351
9	9	% macro=DimEnum()
10	10
11		macro=287;
	11	macro=289;

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

r7302	r7351
279	279	case GravityEnum(), string='Gravity'; return
280	280	case ThermalConductivityEnum(), string='ThermalConductivity'; return
	281	case MeltingRateCorrectionEnum(), string='MeltingRateCorrection'; return
	282	case MeltingRateCorrectionApplyEnum(), string='MeltingRateCorrectionApply'; return
281	283	case MixedLayerCapacityEnum(), string='MixedLayerCapacity'; return
282	284	case ThermalExchangeVelocityEnum(), string='ThermalExchangeVelocity'; return

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

r7302	r7351
9	9	% macro=EpsAbsEnum()
10	10
11		macro=288;
	11	macro=290;

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

r7302	r7351
9	9	% macro=EpsCmEnum()
10	10
11		macro=289;
	11	macro=291;

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

r7302	r7351
9	9	% macro=EpsRelEnum()
10	10
11		macro=290;
	11	macro=292;

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

r7302	r7351
9	9	% macro=EpsResEnum()
10	10
11		macro=291;
	11	macro=293;

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

r7302	r7351
9	9	% macro=FsetEnum()
10	10
11		macro=340;
	11	macro=342;

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

r7302	r7351
9	9	% macro=Gradient1Enum()
10	10
11		macro=280;
	11	macro=282;

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

r7302	r7351
9	9	% macro=Gradient2Enum()
10	10
11		macro=281;
	11	macro=283;

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

r7302	r7351
9	9	% macro=Gradient3Enum()
10	10
11		macro=282;
	11	macro=284;

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

r7302	r7351
9	9	% macro=GradientEnum()
10	10
11		macro=279;
	11	macro=281;

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

r7302	r7351
9	9	% macro=GroundingLineMigrationEnum()
10	10
11		macro=342;
	11	macro=344;

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

r7302	r7351
9	9	% macro=GsetEnum()
10	10
11		macro=339;
	11	macro=341;

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

r7302	r7351
9	9	% macro=HeatCapacityEnum()
10	10
11		macro=292;
	11	macro=294;

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

r7302	r7351
9	9	% macro=IndexEnum()
10	10
11		macro=327;
	11	macro=329;

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

r7302	r7351
9	9	% macro=IndexedEnum()
10	10
11		macro=325;
	11	macro=327;

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

r7302	r7351
9	9	% macro=IntersectEnum()
10	10
11		macro=270;
	11	macro=272;

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

r7302	r7351
9	9	% macro=IsHutterEnum()
10	10
11		macro=293;
	11	macro=295;

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

r7302	r7351
9	9	% macro=IsMacAyealPattynEnum()
10	10
11		macro=294;
	11	macro=296;

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

r7302	r7351
9	9	% macro=IsStokesEnum()
10	10
11		macro=295;
	11	macro=297;

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

r7302	r7351
9	9	% macro=KffEnum()
10	10
11		macro=296;
	11	macro=298;

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

r7302	r7351
9	9	% macro=LatentHeatEnum()
10	10
11		macro=297;
	11	macro=299;

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

r7302	r7351
9	9	% macro=LowmemEnum()
10	10
11		macro=~~298~~;
	11	macro=300;

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

r7302	r7351
9	9	% macro=MaxIterEnum()
10	10
11		macro=~~299~~;
	11	macro=301;

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

r7302	r7351
9	9	% macro=MaxNonlinearIterationsEnum()
10	10
11		macro=300;
	11	macro=302;

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

r7302	r7351
9	9	% macro=MeltingPointEnum()
10	10
11		macro=301;
	11	macro=303;

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

r7302	r7351
9	9	% macro=MinMechanicalConstraintsEnum()
10	10
11		macro=302;
	11	macro=304;

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

r7302	r7351
9	9	% macro=MinThermalConstraintsEnum()
10	10
11		macro=303;
	11	macro=305;

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

r7302	r7351
9	9	% macro=MixedLayerCapacityEnum()
10	10
11		macro=268;
	11	macro=270;

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

r7302	r7351
9	9	% macro=NStepsEnum()
10	10
11		macro=304;
	11	macro=306;

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

r7302	r7351
9	9	% macro=NdtEnum()
10	10
11		macro=305;
	11	macro=307;

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

r7302	r7351
9	9	% macro=NodalEnum()
10	10
11		macro=329;
	11	macro=331;

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

r7302	r7351
9	9	% macro=NumOutputEnum()
10	10
11		macro=306;
	11	macro=308;

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

r7302	r7351
9	9	% macro=NumRiftsEnum()
10	10
11		macro=307;
	11	macro=309;

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

r7302	r7351
9	9	% macro=NumberOfElementsEnum()
10	10
11		macro=308;
	11	macro=310;

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

r7302	r7351
9	9	% macro=NumberOfNodesEnum()
10	10
11		macro=309;
	11	macro=311;

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

r7302	r7351
9	9	% macro=NumberOfVerticesEnum()
10	10
11		macro=310;
	11	macro=312;

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

r7302	r7351
9	9	% macro=OldGradientEnum()
10	10
11		macro=283;
	11	macro=285;

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

r7302	r7351
9	9	% macro=OptScalEnum()
10	10
11		macro=311;
	11	macro=313;

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

r7302	r7351
9	9	% macro=OutputFileNameEnum()
10	10
11		macro=313;
	11	macro=315;

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

r7302	r7351
9	9	% macro=OutputFilePointerEnum()
10	10
11		macro=312;
	11	macro=314;

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

r7302	r7351
9	9	% macro=ParameterOutputEnum()
10	10
11		macro=314;
	11	macro=316;

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

r7302	r7351
9	9	% macro=PenaltyMeltingEnum()
10	10
11		macro=315;
	11	macro=317;

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

r7302	r7351
9	9	% macro=PetscOptionsAnalysesEnum()
10	10
11		macro=338;
	11	macro=340;

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

r7302	r7351
9	9	% macro=PetscOptionsStringsEnum()
10	10
11		macro=337;
	11	macro=339;

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

r7302	r7351
9	9	% macro=PetscRcEnum()
10	10
11		macro=331;
	11	macro=333;

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

r7302	r7351
9	9	% macro=QmuAnalysisEnum()
10	10
11		macro=316;
	11	macro=318;

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

r7302	r7351
9	9	% macro=QmuErrNameEnum()
10	10
11		macro=317;
	11	macro=319;

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

r7302	r7351
9	9	% macro=QmuInNameEnum()
10	10
11		macro=318;
	11	macro=320;

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

r7302	r7351
9	9	% macro=QmuMassFluxSegmentsEnum()
10	10
11		macro=319;
	11	macro=321;

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

r7302	r7351
9	9	% macro=QmuNPartEnum()
10	10
11		macro=320;
	11	macro=322;

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

r7302	r7351
9	9	% macro=QmuNumberOfResponsesEnum()
10	10
11		macro=323;
	11	macro=325;

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

r7302	r7351
9	9	% macro=QmuOutNameEnum()
10	10
11		macro=321;
	11	macro=323;

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

r7302	r7351
9	9	% macro=QmuPartEnum()
10	10
11		macro=322;
	11	macro=324;

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

r7302	r7351
9	9	% macro=QmuSaveFemmodelEnum()
10	10
11		macro=324;
	11	macro=326;

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

r7302	r7351
9	9	% macro=RegularEnum()
10	10
11		macro=326;
	11	macro=328;

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

r7302	r7351
9	9	% macro=ResponseDescriptorsEnum()
10	10
11		macro=330;
	11	macro=332;

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

r7302	r7351
9	9	% macro=ScaledEnum()
10	10
11		macro=328;
	11	macro=330;

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

r7302	r7351
9	9	% macro=SeparateEnum()
10	10
11		macro=272;
	11	macro=274;

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

r7302	r7351
9	9	% macro=SparsityEnum()
10	10
11		macro=332;
	11	macro=334;

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

r7302	r7351
9	9	% macro=SsetEnum()
10	10
11		macro=341;
	11	macro=343;

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

r7302	r7351
277	277	elseif (strcmpi(name,'Gravity')), enum=GravityEnum(); return
278	278	elseif (strcmpi(name,'ThermalConductivity')), enum=ThermalConductivityEnum(); return
	279	elseif (strcmpi(name,'MeltingRateCorrection')), enum=MeltingRateCorrectionEnum(); return
	280	elseif (strcmpi(name,'MeltingRateCorrectionApply')), enum=MeltingRateCorrectionApplyEnum(); return
279	281	elseif (strcmpi(name,'MixedLayerCapacity')), enum=MixedLayerCapacityEnum(); return
280	282	elseif (strcmpi(name,'ThermalExchangeVelocity')), enum=ThermalExchangeVelocityEnum(); return

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

r7302	r7351
9	9	% macro=ThermalExchangeVelocityEnum()
10	10
11		macro=269;
	11	macro=271;

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

r7302	r7351
9	9	% macro=TolXEnum()
10	10
11		macro=333;
	11	macro=335;

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

r7302	r7351
9	9	% macro=VariableDescriptorsEnum()
10	10
11		macro=334;
	11	macro=336;

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

r7302	r7351
9	9	% macro=VerboseEnum()
10	10
11		macro=335;
	11	macro=337;

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

r7302	r7351
9	9	% macro=WaitOnLockEnum()
10	10
11		macro=336;
	11	macro=338;

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

r7302	r7351
9	9	% macro=YtsEnum()
10	10
11		macro=343;
	11	macro=345;

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

Context Navigation

Changeset 7351

Legend:

Download in other formats: