Changeset 25479

Timestamp:

08/26/20 16:37:55 (5 years ago)

Author:

Eric.Larour

Message:

CHG: number of bins.

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) (10 diffs)

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

@@ -283 +283 @@
 syn keyword cConstant MeshNumberofverticesEnum
 syn keyword cConstant ModelIdEnum
+syn keyword cConstant NbinsEnum
 syn keyword cConstant NodesEnum
 syn keyword cConstant NumModelsEnum

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

@@ -277 +277 @@
         MeshNumberofverticesEnum,
         ModelIdEnum,
+        NbinsEnum,
         NodesEnum,
         NumModelsEnum,

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

@@ -285 +285 @@
                 case MeshNumberofverticesEnum : return "MeshNumberofvertices";
                 case ModelIdEnum : return "ModelId";
+                case NbinsEnum : return "Nbins";
                 case NodesEnum : return "Nodes";
                 case NumModelsEnum : return "NumModels";

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

@@ -291 +291 @@
               else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
               else if (strcmp(name,"ModelId")==0) return ModelIdEnum;
+              else if (strcmp(name,"Nbins")==0) return NbinsEnum;
               else if (strcmp(name,"Nodes")==0) return NodesEnum;
               else if (strcmp(name,"NumModels")==0) return NumModelsEnum;
@@ -382 +383 @@
               else if (strcmp(name,"SmbIsclimatology")==0) return SmbIsclimatologyEnum;
               else if (strcmp(name,"SmbIsconstrainsurfaceT")==0) return SmbIsconstrainsurfaceTEnum;
-              else if (strcmp(name,"SmbIsd18opd")==0) return SmbIsd18opdEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SmbIsdelta18o")==0) return SmbIsdelta18oEnum;
+              if (strcmp(name,"SmbIsd18opd")==0) return SmbIsd18opdEnum;
+              else if (strcmp(name,"SmbIsdelta18o")==0) return SmbIsdelta18oEnum;
               else if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
               else if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
@@ -505 +506 @@
               else if (strcmp(name,"BasalforcingsOceanSalinity")==0) return BasalforcingsOceanSalinityEnum;
               else if (strcmp(name,"BasalforcingsOceanTemp")==0) return BasalforcingsOceanTempEnum;
-              else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
+              if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
+              else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
               else if (strcmp(name,"BasalforcingsPicoOverturningCoeff")==0) return BasalforcingsPicoOverturningCoeffEnum;
               else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
@@ -628 +629 @@
               else if (strcmp(name,"HydrologydcEplThicknessOld")==0) return HydrologydcEplThicknessOldEnum;
               else if (strcmp(name,"HydrologydcEplThicknessSubstep")==0) return HydrologydcEplThicknessSubstepEnum;
-              else if (strcmp(name,"HydrologydcEplThicknessTransient")==0) return HydrologydcEplThicknessTransientEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
+              if (strcmp(name,"HydrologydcEplThicknessTransient")==0) return HydrologydcEplThicknessTransientEnum;
+              else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
               else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
               else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum;
@@ -751 +752 @@
               else if (strcmp(name,"SmbDailywindspeed")==0) return SmbDailywindspeedEnum;
               else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
-              else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
+              if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
+              else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
               else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
               else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
@@ -874 +875 @@
               else if (strcmp(name,"Vel")==0) return VelEnum;
               else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
-              else if (strcmp(name,"Vx")==0) return VxEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
+              if (strcmp(name,"Vx")==0) return VxEnum;
+              else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
               else if (strcmp(name,"VxObs")==0) return VxObsEnum;
               else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
@@ -997 +998 @@
               else if (strcmp(name,"Outputdefinition100")==0) return Outputdefinition100Enum;
               else if (strcmp(name,"InputsEND")==0) return InputsENDEnum;
-              else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"AdaptiveTimestepping")==0) return AdaptiveTimesteppingEnum;
+              if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
+              else if (strcmp(name,"AdaptiveTimestepping")==0) return AdaptiveTimesteppingEnum;
               else if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
               else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
@@ -1120 +1121 @@
               else if (strcmp(name,"Gradient1")==0) return Gradient1Enum;
               else if (strcmp(name,"Gradient2")==0) return Gradient2Enum;
-              else if (strcmp(name,"Gradient3")==0) return Gradient3Enum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"GroundedArea")==0) return GroundedAreaEnum;
+              if (strcmp(name,"Gradient3")==0) return Gradient3Enum;
+              else if (strcmp(name,"GroundedArea")==0) return GroundedAreaEnum;
               else if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum;
               else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
@@ -1243 +1244 @@
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
               else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
-              else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"Open")==0) return OpenEnum;
+              if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
+              else if (strcmp(name,"Open")==0) return OpenEnum;
               else if (strcmp(name,"Option")==0) return OptionEnum;
               else if (strcmp(name,"Param")==0) return ParamEnum;
@@ -1366 +1367 @@
               else if (strcmp(name,"VertexSId")==0) return VertexSIdEnum;
               else if (strcmp(name,"Vertices")==0) return VerticesEnum;
-              else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"Water")==0) return WaterEnum;
+              if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
+              else if (strcmp(name,"Water")==0) return WaterEnum;
               else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
               else if (strcmp(name,"XY")==0) return XYEnum;