Changeset 25360

Timestamp:

08/08/20 21:55:03 (5 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

Location:

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

Files:

• Enum.vim (modified) (2 diffs)
• EnumDefinitions.h (modified) (2 diffs)
• EnumToStringx.cpp (modified) (2 diffs)
• StringToEnumx.cpp (modified) (10 diffs)

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

@@ -210 +210 @@
 syn keyword cConstant InputFileNameEnum
 syn keyword cConstant DirectoryNameEnum
+syn keyword cConstant IndicesEnum
 syn keyword cConstant InputToDepthaverageInEnum
 syn keyword cConstant InputToDepthaverageOutEnum
@@ -1124 +1125 @@
 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

@@ -204 +204 @@
         InputFileNameEnum,
         DirectoryNameEnum,
+        IndicesEnum,
         InputToDepthaverageInEnum,
         InputToDepthaverageOutEnum,
@@ -1123 +1124 @@
         IcefrontMassFluxLevelsetEnum,
         IncrementalEnum,
-        IndicesEnum,
         IndexedEnum,
         IntExternalResultEnum,

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

@@ -212 +212 @@
                 case InputFileNameEnum : return "InputFileName";
                 case DirectoryNameEnum : return "DirectoryName";
+                case IndicesEnum : return "Indices";
                 case InputToDepthaverageInEnum : return "InputToDepthaverageIn";
                 case InputToDepthaverageOutEnum : return "InputToDepthaverageOut";
@@ -1126 +1127 @@
                 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

@@ -215 +215 @@
               else if (strcmp(name,"InputFileName")==0) return InputFileNameEnum;
               else if (strcmp(name,"DirectoryName")==0) return DirectoryNameEnum;
+              else if (strcmp(name,"Indices")==0) return IndicesEnum;
               else if (strcmp(name,"InputToDepthaverageIn")==0) return InputToDepthaverageInEnum;
               else if (strcmp(name,"InputToDepthaverageOut")==0) return InputToDepthaverageOutEnum;
@@ -259 +260 @@
               else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum;
               else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
-              else if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
+              if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum;
+              else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
               else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
               else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
@@ -382 +383 @@
               else if (strcmp(name,"SmbIsconstrainsurfaceT")==0) return SmbIsconstrainsurfaceTEnum;
               else if (strcmp(name,"SmbIsd18opd")==0) return SmbIsd18opdEnum;
-              else if (strcmp(name,"SmbIsdelta18o")==0) return SmbIsdelta18oEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
+              if (strcmp(name,"SmbIsdelta18o")==0) return SmbIsdelta18oEnum;
+              else if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
               else if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
               else if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum;
@@ -505 +506 @@
               else if (strcmp(name,"BasalforcingsOceanTemp")==0) return BasalforcingsOceanTempEnum;
               else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
-              else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"BasalforcingsPicoOverturningCoeff")==0) return BasalforcingsPicoOverturningCoeffEnum;
+              if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
+              else if (strcmp(name,"BasalforcingsPicoOverturningCoeff")==0) return BasalforcingsPicoOverturningCoeffEnum;
               else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
               else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
@@ -628 +629 @@
               else if (strcmp(name,"HydrologydcEplThicknessSubstep")==0) return HydrologydcEplThicknessSubstepEnum;
               else if (strcmp(name,"HydrologydcEplThicknessTransient")==0) return HydrologydcEplThicknessTransientEnum;
-              else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
+              if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
+              else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
               else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum;
               else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum;
@@ -751 +752 @@
               else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
               else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
-              else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
+              if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
+              else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
               else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
               else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
@@ -874 +875 @@
               else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
               else if (strcmp(name,"Vx")==0) return VxEnum;
-              else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"VxObs")==0) return VxObsEnum;
+              if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
+              else if (strcmp(name,"VxObs")==0) return VxObsEnum;
               else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
               else if (strcmp(name,"Vy")==0) return VyEnum;
@@ -997 +998 @@
               else if (strcmp(name,"InputsEND")==0) return InputsENDEnum;
               else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
-              else if (strcmp(name,"AdaptiveTimestepping")==0) return AdaptiveTimesteppingEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
+              if (strcmp(name,"AdaptiveTimestepping")==0) return AdaptiveTimesteppingEnum;
+              else if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
               else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
               else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
@@ -1120 +1121 @@
               else if (strcmp(name,"Gradient2")==0) return Gradient2Enum;
               else if (strcmp(name,"Gradient3")==0) return Gradient3Enum;
-              else if (strcmp(name,"GroundedArea")==0) return GroundedAreaEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum;
+              if (strcmp(name,"GroundedArea")==0) return GroundedAreaEnum;
+              else if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum;
               else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
               else if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum;
@@ -1153 +1154 @@
               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;