Changeset 9636 for issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

Timestamp:

09/06/11 16:53:02 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added material class

File:

• issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (5 diffs)

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -48 +48 @@
         else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
         else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
+        else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
+        else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
+        else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
+        else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
+        else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
+        else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;
+        else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum;
+        else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum;
+        else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
+        else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
+        else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
+        else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
+        else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
         else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
         else if (strcmp(name,"Elements")==0) return ElementsEnum;
@@ -201 +214 @@
         else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
         else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
-        else if (strcmp(name,"RheologyB")==0) return RheologyBEnum;
-        else if (strcmp(name,"RheologyBbar")==0) return RheologyBbarEnum;
-        else if (strcmp(name,"RheologyN")==0) return RheologyNEnum;
         else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
         else if (strcmp(name,"ShelfDampening")==0) return ShelfDampeningEnum;
@@ -276 +286 @@
         else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
         else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
-        else if (strcmp(name,"RhoIce")==0) return RhoIceEnum;
-        else if (strcmp(name,"RhoWater")==0) return RhoWaterEnum;
-        else if (strcmp(name,"Gravity")==0) return GravityEnum;
-        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;
         else if (strcmp(name,"Separate")==0) return SeparateEnum;
-        else if (strcmp(name,"Beta")==0) return BetaEnum;
         else if (strcmp(name,"CmGradient")==0) return CmGradientEnum;
         else if (strcmp(name,"CmJump")==0) return CmJumpEnum;
@@ -338 +342 @@
         else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum;
         else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum;
-        else if (strcmp(name,"RheologyLaw")==0) return RheologyLawEnum;
         else if (strcmp(name,"Paterson")==0) return PatersonEnum;
         else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
@@ -389 +392 @@
         else if (strcmp(name,"Stokesreconditioning")==0) return StokesreconditioningEnum;
         else if (strcmp(name,"Lowerelements")==0) return LowerelementsEnum;
-        else if (strcmp(name,"Heatcapacity")==0) return HeatcapacityEnum;
-        else if (strcmp(name,"Latentheat")==0) return LatentheatEnum;
-        else if (strcmp(name,"Thermalconductivity")==0) return ThermalconductivityEnum;
-        else if (strcmp(name,"Meltingpoint")==0) return MeltingpointEnum;
         else if (strcmp(name,"Dhdt")==0) return DhdtEnum;
         else if (strcmp(name,"Isprognostic")==0) return IsprognosticEnum;