Changeset 26948

Timestamp:

04/09/22 07:11:42 (3 years ago)

Author:

vverjans

Message:

CHG: forgot to synchronize Enums in last commit

Location:

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

Files:

• Enum.vim (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• Enumjl.vim (modified) (1 diff)
• StringToEnumx.cpp (modified) (6 diffs)

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

@@ -1087 +1087 @@
 syn keyword cConstant TransientAccumulatedDeltaIceThicknessEnum
 syn keyword cConstant VelEnum
-syn keyword cConstant VVmismipglposinputEnum
 syn keyword cConstant VxAverageEnum
 syn keyword cConstant VxBaseEnum

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

@@ -1089 +1089 @@
                 case TransientAccumulatedDeltaIceThicknessEnum : return "TransientAccumulatedDeltaIceThickness";
                 case VelEnum : return "Vel";
-                case VVmismipglposinputEnum : return "VVmismipglposinput";
                 case VxAverageEnum : return "VxAverage";
                 case VxBaseEnum : return "VxBase";

issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim

@@ -1080 +1080 @@
 syn keyword juliaConstC TransientAccumulatedDeltaIceThicknessEnum
 syn keyword juliaConstC VelEnum
-syn keyword juliaConstC VVmismipglposinputEnum
 syn keyword juliaConstC VxAverageEnum
 syn keyword juliaConstC VxBaseEnum

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

@@ -1113 +1113 @@
               else if (strcmp(name,"TransientAccumulatedDeltaIceThickness")==0) return TransientAccumulatedDeltaIceThicknessEnum;
               else if (strcmp(name,"Vel")==0) return VelEnum;
-              else if (strcmp(name,"VVmismipglposinput")==0) return VVmismipglposinputEnum;
               else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
               else if (strcmp(name,"VxBase")==0) return VxBaseEnum;
@@ -1121 +1120 @@
               else if (strcmp(name,"VxShear")==0) return VxShearEnum;
               else if (strcmp(name,"VxSurface")==0) return VxSurfaceEnum;
+              else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
-              else if (strcmp(name,"VyBase")==0) return VyBaseEnum;
+              if (strcmp(name,"VyBase")==0) return VyBaseEnum;
               else if (strcmp(name,"Vy")==0) return VyEnum;
               else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
@@ -1244 +1243 @@
               else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
               else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;
+              else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
-              else if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum;
+              if (strcmp(name,"Outputdefinition98")==0) return Outputdefinition98Enum;
               else if (strcmp(name,"Outputdefinition99")==0) return Outputdefinition99Enum;
               else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum;
@@ -1367 +1366 @@
               else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
               else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
+              else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
-              else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
+              if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
               else if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
               else if (strcmp(name,"GenericExternalResult")==0) return GenericExternalResultEnum;
@@ -1490 +1489 @@
               else if (strcmp(name,"NoMeltOnPartiallyFloating")==0) return NoMeltOnPartiallyFloatingEnum;
               else if (strcmp(name,"Nodal")==0) return NodalEnum;
+              else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
          else stage=13;
    }
    if(stage==13){
-              if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
-              else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
+              if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
               else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
               else if (strcmp(name,"None")==0) return NoneEnum;
@@ -1613 +1612 @@
               else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
               else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum;
+              else if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;
          else stage=14;
    }
    if(stage==14){
-              if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;
-              else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
+              if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
               else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;