Changeset 4490

Timestamp:

07/08/10 19:03:24 (15 years ago)

Author:

Eric.Larour

Message:

New EnumAsModelField routine, to convert an enum into a model field.

Location:

issm/trunk/src/c/EnumDefinitions

Files:

• EnumAsModelField.cpp (added)
• EnumAsString.cpp (modified) (1 diff)
• EnumDefinitions.h (modified) (2 diffs)
• StringAsEnum.cpp (modified) (1 diff)

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

@@ -247 +247 @@
                 case ResidualEnum : return "Residual";
                 case AbsoluteEnum : return "Absolute";
+                case RhoIceEnum : return "RhoIce";
+                case RhoWaterEnum : return "RhoWater";
+                case GravityEnum : return "Gravity";
                 case BetaEnum : return "Beta";
                 case CmGradientEnum : return "CmGradient";

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

@@ -282 +282 @@
         AbsoluteEnum,
         /*}}}*/
+        /*Material{{{1*/
+        RhoIceEnum,
+        RhoWaterEnum,
+        GravityEnum,
+        /*}}}*/
         /*Parameters{{{1*/
         BetaEnum,
@@ -349 +354 @@
 char* EnumAsString(int enum_type);
 int StringAsEnum(char* string);
+char* EnumAsModelField(int en);
 
 #endif

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

@@ -245 +245 @@
         else if (strcmp(name,"Residual")==0) return ResidualEnum;
         else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
+        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,"Beta")==0) return BetaEnum;
         else if (strcmp(name,"CmGradient")==0) return CmGradientEnum;