Changeset 23061

Timestamp:

08/06/18 14:50:17 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving some enums to inputs again...

Location:

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

Files:

• EnumDefinitions.h (modified) (2 diffs)
• EnumToStringx.cpp (modified) (2 diffs)
• StringToEnumx.cpp (modified) (5 diffs)

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

@@ -470 +470 @@
         GiaLithosphereThicknessEnum,
         GiaMantleViscosityEnum,
+        GiadWdtEnum,
         GiaWEnum,
         GradientEnum,
@@ -780 +781 @@
         GenericParamEnum,
         GLheightadvectionAnalysisEnum,
-        GiadWdtEnum,
         GiaIvinsAnalysisEnum,
         GiaSolutionEnum,

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

@@ -476 +476 @@
                 case GiaLithosphereThicknessEnum : return "GiaLithosphereThickness";
                 case GiaMantleViscosityEnum : return "GiaMantleViscosity";
+                case GiadWdtEnum : return "GiadWdt";
                 case GiaWEnum : return "GiaW";
                 case GradientEnum : return "Gradient";
@@ -784 +785 @@
                 case GenericParamEnum : return "GenericParam";
                 case GLheightadvectionAnalysisEnum : return "GLheightadvectionAnalysis";
-                case GiadWdtEnum : return "GiadWdt";
                 case GiaIvinsAnalysisEnum : return "GiaIvinsAnalysis";
                 case GiaSolutionEnum : return "GiaSolution";

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

@@ -485 +485 @@
               else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
               else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum;
+              else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
               else if (strcmp(name,"GiaW")==0) return GiaWEnum;
               else if (strcmp(name,"Gradient")==0) return GradientEnum;
@@ -505 +506 @@
               else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum;
               else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum;
-              else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
+              if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
+              else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
               else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
               else if (strcmp(name,"Ice")==0) return IceEnum;
@@ -628 +629 @@
               else if (strcmp(name,"StrainRatexz")==0) return StrainRatexzEnum;
               else if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum;
-              else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
+              if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
+              else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
               else if (strcmp(name,"StressMaxPrincipal")==0) return StressMaxPrincipalEnum;
               else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
@@ -751 +752 @@
               else if (strcmp(name,"DoubleArrayInput")==0) return DoubleArrayInputEnum;
               else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
-              else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
+              if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
+              else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
               else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
               else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
@@ -802 +803 @@
               else if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
               else if (strcmp(name,"GLheightadvectionAnalysis")==0) return GLheightadvectionAnalysisEnum;
-              else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
               else if (strcmp(name,"GiaIvinsAnalysis")==0) return GiaIvinsAnalysisEnum;
               else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;