Changeset 24449

Timestamp:

12/05/19 21:53:55 (5 years ago)

Author:

jdquinn

Message:

CHG: Synchronized enums

Location:

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

Files:

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

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

@@ -287 +287 @@
 syn keyword cConstant QmuNumberofpartitionsEnum
 syn keyword cConstant QmuOutNameEnum
+syn keyword cConstant QmuOutputEnum
+syn keyword cConstant QmuCurrEvalIdEnum
 syn keyword cConstant QmuEpartitionEnum
 syn keyword cConstant QmuVpartitionEnum
@@ -1310 +1312 @@
 syn keyword cConstant NearestInterpEnum
 syn keyword cConstant OutputdefinitionListEnum
-syn keyword cConstant QmuOutputEnum
-syn keyword cConstant QmuCurrEvalIdEnum
 syn keyword cConstant SealevelObsEnum
 syn keyword cConstant SealevelWeightsEnum
@@ -1333 +1333 @@
 syn keyword cType Cfsurfacesquare
 syn keyword cType Channel
-syn keyword cType classes
 syn keyword cType Constraint
 syn keyword cType Constraints
@@ -1340 +1339 @@
 syn keyword cType ControlInput2
 syn keyword cType Covertree
+syn keyword cType DataSetParam
 syn keyword cType DatasetInput2
-syn keyword cType DataSetParam
 syn keyword cType Definition
 syn keyword cType DependentObject
@@ -1353 +1352 @@
 syn keyword cType ElementInput2
 syn keyword cType ElementMatrix
+syn keyword cType ElementVector
 syn keyword cType Elements
-syn keyword cType ElementVector
 syn keyword cType ExponentialVariogram
 syn keyword cType ExternalResult
@@ -1361 +1360 @@
 syn keyword cType Friction
 syn keyword cType Gauss
-syn keyword cType GaussianVariogram
-syn keyword cType gaussobjects
 syn keyword cType GaussPenta
 syn keyword cType GaussSeg
 syn keyword cType GaussTetra
 syn keyword cType GaussTria
+syn keyword cType GaussianVariogram
 syn keyword cType GenericExternalResult
 syn keyword cType GenericOption
@@ -1381 +1379 @@
 syn keyword cType IssmDirectApplicInterface
 syn keyword cType IssmParallelDirectApplicInterface
-syn keyword cType krigingobjects
 syn keyword cType Load
 syn keyword cType Loads
@@ -1392 +1389 @@
 syn keyword cType Matice
 syn keyword cType Matlitho
-syn keyword cType matrixobjects
 syn keyword cType MatrixParam
 syn keyword cType Misfit
@@ -1405 +1401 @@
 syn keyword cType Observations
 syn keyword cType Option
+syn keyword cType OptionUtilities
 syn keyword cType Options
-syn keyword cType OptionUtilities
 syn keyword cType Param
 syn keyword cType Parameters
@@ -1420 +1416 @@
 syn keyword cType Regionaloutput
 syn keyword cType Results
+syn keyword cType RiftStruct
 syn keyword cType Riftfront
-syn keyword cType RiftStruct
 syn keyword cType Seg
 syn keyword cType SegInput2
+syn keyword cType SegRef
 syn keyword cType Segment
-syn keyword cType SegRef
 syn keyword cType SpcDynamic
 syn keyword cType SpcStatic
@@ -1444 +1440 @@
 syn keyword cType Vertex
 syn keyword cType Vertices
+syn keyword cType classes
+syn keyword cType gaussobjects
+syn keyword cType krigingobjects
+syn keyword cType matrixobjects
 syn keyword cType AdjointBalancethickness2Analysis
 syn keyword cType AdjointBalancethicknessAnalysis
@@ -1462 +1462 @@
 syn keyword cType FreeSurfaceBaseAnalysis
 syn keyword cType FreeSurfaceTopAnalysis
+syn keyword cType GLheightadvectionAnalysis
 syn keyword cType GiaIvinsAnalysis
-syn keyword cType GLheightadvectionAnalysis
 syn keyword cType HydrologyDCEfficientAnalysis
 syn keyword cType HydrologyDCInefficientAnalysis

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

@@ -281 +281 @@
         QmuNumberofpartitionsEnum,
         QmuOutNameEnum,
+        QmuOutputEnum,
+        QmuCurrEvalIdEnum,
         QmuEpartitionEnum,
         QmuVpartitionEnum,
@@ -1310 +1312 @@
         NearestInterpEnum,
         OutputdefinitionListEnum,
-        QmuOutputEnum,
-        QmuCurrEvalIdEnum,
         SealevelObsEnum,
         SealevelWeightsEnum,

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

@@ -289 +289 @@
                 case QmuNumberofpartitionsEnum : return "QmuNumberofpartitions";
                 case QmuOutNameEnum : return "QmuOutName";
+                case QmuOutputEnum : return "QmuOutput";
+                case QmuCurrEvalIdEnum : return "QmuCurrEvalId";
                 case QmuEpartitionEnum : return "QmuEpartition";
                 case QmuVpartitionEnum : return "QmuVpartition";
@@ -1312 +1314 @@
                 case NearestInterpEnum : return "NearestInterp";
                 case OutputdefinitionListEnum : return "OutputdefinitionList";
-                case QmuOutputEnum : return "QmuOutput";
-                case QmuCurrEvalIdEnum : return "QmuCurrEvalId";
                 case SealevelObsEnum : return "SealevelObs";
                 case SealevelWeightsEnum : return "SealevelWeights";

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

@@ -295 +295 @@
               else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
               else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
+              else if (strcmp(name,"QmuOutput")==0) return QmuOutputEnum;
+              else if (strcmp(name,"QmuCurrEvalId")==0) return QmuCurrEvalIdEnum;
               else if (strcmp(name,"QmuEpartition")==0) return QmuEpartitionEnum;
               else if (strcmp(name,"QmuVpartition")==0) return QmuVpartitionEnum;
@@ -381 +383 @@
               else if (strcmp(name,"SmbSealev")==0) return SmbSealevEnum;
               else if (strcmp(name,"SmbStepsPerStep")==0) return SmbStepsPerStepEnum;
-              else if (strcmp(name,"SmbSwIdx")==0) return SmbSwIdxEnum;
-              else if (strcmp(name,"SmbT0dry")==0) return SmbT0dryEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum;
+              if (strcmp(name,"SmbSwIdx")==0) return SmbSwIdxEnum;
+              else if (strcmp(name,"SmbT0dry")==0) return SmbT0dryEnum;
+              else if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum;
               else if (strcmp(name,"SmbTdiff")==0) return SmbTdiffEnum;
               else if (strcmp(name,"SmbThermoDeltaTScaling")==0) return SmbThermoDeltaTScalingEnum;
@@ -504 +506 @@
               else if (strcmp(name,"Converged")==0) return ConvergedEnum;
               else if (strcmp(name,"CrevasseDepth")==0) return CrevasseDepthEnum;
-              else if (strcmp(name,"DamageD")==0) return DamageDEnum;
-              else if (strcmp(name,"DamageDOld")==0) return DamageDOldEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
+              if (strcmp(name,"DamageD")==0) return DamageDEnum;
+              else if (strcmp(name,"DamageDOld")==0) return DamageDOldEnum;
+              else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
               else if (strcmp(name,"DamageDbarOld")==0) return DamageDbarOldEnum;
               else if (strcmp(name,"DamageF")==0) return DamageFEnum;
@@ -627 +629 @@
               else if (strcmp(name,"MaskOceanLevelset")==0) return MaskOceanLevelsetEnum;
               else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum;
-              else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
-              else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"MaterialsRheologyE")==0) return MaterialsRheologyEEnum;
+              if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
+              else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
+              else if (strcmp(name,"MaterialsRheologyE")==0) return MaterialsRheologyEEnum;
               else if (strcmp(name,"MaterialsRheologyEbar")==0) return MaterialsRheologyEbarEnum;
               else if (strcmp(name,"MaterialsRheologyEc")==0) return MaterialsRheologyEcEnum;
@@ -750 +752 @@
               else if (strcmp(name,"SmbMelt")==0) return SmbMeltEnum;
               else if (strcmp(name,"SmbMonthlytemperatures")==0) return SmbMonthlytemperaturesEnum;
-              else if (strcmp(name,"SmbNetLW")==0) return SmbNetLWEnum;
-              else if (strcmp(name,"SmbNetSW")==0) return SmbNetSWEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"SmbPAir")==0) return SmbPAirEnum;
+              if (strcmp(name,"SmbNetLW")==0) return SmbNetLWEnum;
+              else if (strcmp(name,"SmbNetSW")==0) return SmbNetSWEnum;
+              else if (strcmp(name,"SmbPAir")==0) return SmbPAirEnum;
               else if (strcmp(name,"SmbP")==0) return SmbPEnum;
               else if (strcmp(name,"SmbPddfacIce")==0) return SmbPddfacIceEnum;
@@ -873 +875 @@
               else if (strcmp(name,"Outputdefinition22")==0) return Outputdefinition22Enum;
               else if (strcmp(name,"Outputdefinition23")==0) return Outputdefinition23Enum;
-              else if (strcmp(name,"Outputdefinition24")==0) return Outputdefinition24Enum;
-              else if (strcmp(name,"Outputdefinition25")==0) return Outputdefinition25Enum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"Outputdefinition26")==0) return Outputdefinition26Enum;
+              if (strcmp(name,"Outputdefinition24")==0) return Outputdefinition24Enum;
+              else if (strcmp(name,"Outputdefinition25")==0) return Outputdefinition25Enum;
+              else if (strcmp(name,"Outputdefinition26")==0) return Outputdefinition26Enum;
               else if (strcmp(name,"Outputdefinition27")==0) return Outputdefinition27Enum;
               else if (strcmp(name,"Outputdefinition28")==0) return Outputdefinition28Enum;
@@ -996 +998 @@
               else if (strcmp(name,"CalvingDev2")==0) return CalvingDev2Enum;
               else if (strcmp(name,"CalvingHab")==0) return CalvingHabEnum;
-              else if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum;
-              else if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum;
+              if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum;
+              else if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum;
+              else if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum;
               else if (strcmp(name,"Cfsurfacelogvel")==0) return CfsurfacelogvelEnum;
               else if (strcmp(name,"Cfsurfacesquare")==0) return CfsurfacesquareEnum;
@@ -1119 +1121 @@
               else if (strcmp(name,"IntInput")==0) return IntInputEnum;
               else if (strcmp(name,"ElementInput2")==0) return ElementInput2Enum;
-              else if (strcmp(name,"SegInput2")==0) return SegInput2Enum;
-              else if (strcmp(name,"TriaInput2")==0) return TriaInput2Enum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"PentaInput2")==0) return PentaInput2Enum;
+              if (strcmp(name,"SegInput2")==0) return SegInput2Enum;
+              else if (strcmp(name,"TriaInput2")==0) return TriaInput2Enum;
+              else if (strcmp(name,"PentaInput2")==0) return PentaInput2Enum;
               else if (strcmp(name,"IntMatExternalResult")==0) return IntMatExternalResultEnum;
               else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
@@ -1242 +1244 @@
               else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
               else if (strcmp(name,"SMBd18opdd")==0) return SMBd18opddEnum;
-              else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum;
-              else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"SMBgemb")==0) return SMBgembEnum;
+              if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum;
+              else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum;
+              else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum;
               else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum;
               else if (strcmp(name,"SMBgradientscomponents")==0) return SMBgradientscomponentsEnum;
@@ -1342 +1344 @@
               else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
               else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
-              else if (strcmp(name,"QmuOutput")==0) return QmuOutputEnum;
-              else if (strcmp(name,"QmuCurrEvalId")==0) return QmuCurrEvalIdEnum;
               else if (strcmp(name,"SealevelObs")==0) return SealevelObsEnum;
               else if (strcmp(name,"SealevelWeights")==0) return SealevelWeightsEnum;