Changeset 22193

Timestamp:

10/26/17 16:25:17 (7 years ago)

Author:

jbondzio

Message:

CHG: updated enums

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -257 +257 @@
         CalvingMeltingrateEnum,
         CalvingLevermannEnum,
-        CalvingDevEnum,
+        CalvingVonmisesEnum,
         CalvingMinthicknessEnum,
         CalvingHabEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -263 +263 @@
                 case CalvingMeltingrateEnum : return "CalvingMeltingrate";
                 case CalvingLevermannEnum : return "CalvingLevermann";
-                case CalvingDevEnum : return "CalvingDev";
+                case CalvingVonmisesEnum : return "CalvingVonmises";
                 case CalvingMinthicknessEnum : return "CalvingMinthickness";
                 case CalvingHabEnum : return "CalvingHab";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -269 +269 @@
               else if (strcmp(name,"CalvingMeltingrate")==0) return CalvingMeltingrateEnum;
               else if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum;
-              else if (strcmp(name,"CalvingDev")==0) return CalvingDevEnum;
+              else if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum;
               else if (strcmp(name,"CalvingMinthickness")==0) return CalvingMinthicknessEnum;
               else if (strcmp(name,"CalvingHab")==0) return CalvingHabEnum;