Changeset 25359

Timestamp:

08/08/20 19:31:39 (5 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

Location:

issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum

Files:

• Enum.vim (modified) (1 diff)
• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (3 diffs)

issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/Enum.vim

@@ -1124 +1124 @@
 syn keyword cConstant IcefrontMassFluxLevelsetEnum
 syn keyword cConstant IncrementalEnum
+syn keyword cConstant IndicesEnum
 syn keyword cConstant IndexedEnum
 syn keyword cConstant IntExternalResultEnum

issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/EnumDefinitions.h

@@ -1123 +1123 @@
         IcefrontMassFluxLevelsetEnum,
         IncrementalEnum,
+        IndicesEnum,
         IndexedEnum,
         IntExternalResultEnum,

issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/EnumToStringx.cpp

@@ -1126 +1126 @@
                 case IcefrontMassFluxLevelsetEnum : return "IcefrontMassFluxLevelset";
                 case IncrementalEnum : return "Incremental";
+                case IndicesEnum : return "Indices";
                 case IndexedEnum : return "Indexed";
                 case IntExternalResultEnum : return "IntExternalResult";

issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/StringToEnumx.cpp

@@ -1153 +1153 @@
               else if (strcmp(name,"IcefrontMassFluxLevelset")==0) return IcefrontMassFluxLevelsetEnum;
               else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
+              else if (strcmp(name,"Indices")==0) return IndicesEnum;
               else if (strcmp(name,"Indexed")==0) return IndexedEnum;
               else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
@@ -1243 +1244 @@
               else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
               else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
-              else if (strcmp(name,"Open")==0) return OpenEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"Option")==0) return OptionEnum;
+              if (strcmp(name,"Open")==0) return OpenEnum;
+              else if (strcmp(name,"Option")==0) return OptionEnum;
               else if (strcmp(name,"Param")==0) return ParamEnum;
               else if (strcmp(name,"Parameters")==0) return ParametersEnum;
@@ -1366 +1367 @@
               else if (strcmp(name,"Vertices")==0) return VerticesEnum;
               else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
-              else if (strcmp(name,"Water")==0) return WaterEnum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
+              if (strcmp(name,"Water")==0) return WaterEnum;
+              else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
               else if (strcmp(name,"XY")==0) return XYEnum;
               else if (strcmp(name,"XYZ")==0) return XYZEnum;