Changeset 23055

Timestamp:

08/06/18 14:15:13 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving some Enums back to inputs

Location:

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

Files:

• Enum.h (modified) (1 diff)
• EnumDefinitions.h (modified) (4 diffs)
• EnumToStringx.cpp (modified) (5 diffs)
• StringToEnumx.cpp (modified) (7 diffs)
• Synchronize.sh (modified) (1 diff)

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

@@ -7 +7 @@
 void        EnumToStringx(char** string,int enum_in);
 int         StringToEnumx(const char* string_in,bool notfounderror=true);
+bool        IsInput(int enum_in);
+bool        IsParam(int enum_in);
 
 #endif

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

@@ -449 +449 @@
         EplHeadSlopeYEnum,
         EsaDeltathicknessEnum,
+        EsaUmotionEnum,
         EsaXmotionEnum,
         EsaYmotionEnum,
@@ -467 +468 @@
         GiaLithosphereThicknessEnum,
         GiaMantleViscosityEnum,
+        GiaWEnum,
         GradientEnum,
         GroundinglineHeightEnum,
@@ -751 +753 @@
         EsaStrainrateyyEnum,
         EsaTransitionsEnum,
-        EsaUmotionEnum,
         ExternalResultEnum,
         ExtrapolationAnalysisEnum,
@@ -782 +783 @@
         GiaIvinsAnalysisEnum,
         GiaSolutionEnum,
-        GiaWEnum,
         Gradient1Enum,
         Gradient2Enum,

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

@@ -455 +455 @@
                 case EplHeadSlopeYEnum : return "EplHeadSlopeY";
                 case EsaDeltathicknessEnum : return "EsaDeltathickness";
+                case EsaUmotionEnum : return "EsaUmotion";
                 case EsaXmotionEnum : return "EsaXmotion";
                 case EsaYmotionEnum : return "EsaYmotion";
@@ -473 +474 @@
                 case GiaLithosphereThicknessEnum : return "GiaLithosphereThickness";
                 case GiaMantleViscosityEnum : return "GiaMantleViscosity";
+                case GiaWEnum : return "GiaW";
                 case GradientEnum : return "Gradient";
                 case GroundinglineHeightEnum : return "GroundinglineHeight";
@@ -755 +757 @@
                 case EsaStrainrateyyEnum : return "EsaStrainrateyy";
                 case EsaTransitionsEnum : return "EsaTransitions";
-                case EsaUmotionEnum : return "EsaUmotion";
                 case ExternalResultEnum : return "ExternalResult";
                 case ExtrapolationAnalysisEnum : return "ExtrapolationAnalysis";
@@ -786 +787 @@
                 case GiaIvinsAnalysisEnum : return "GiaIvinsAnalysis";
                 case GiaSolutionEnum : return "GiaSolution";
-                case GiaWEnum : return "GiaW";
                 case Gradient1Enum : return "Gradient1";
                 case Gradient2Enum : return "Gradient2";
@@ -1192 +1192 @@
         *pstring=string;
 }
+
+bool IsInput(int enum_in){
+        if(enum_in>InputsSTARTEnum && enum_in<InputsENDEnum) return true;
+        return false;
+}
+
+bool IsParam(int enum_in){
+        if(enum_in>ParametersSTARTEnum && enum_in<ParametersENDEnum) return true;
+        return false;
+}

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

@@ -464 +464 @@
               else if (strcmp(name,"EplHeadSlopeY")==0) return EplHeadSlopeYEnum;
               else if (strcmp(name,"EsaDeltathickness")==0) return EsaDeltathicknessEnum;
+              else if (strcmp(name,"EsaUmotion")==0) return EsaUmotionEnum;
               else if (strcmp(name,"EsaXmotion")==0) return EsaXmotionEnum;
               else if (strcmp(name,"EsaYmotion")==0) return EsaYmotionEnum;
@@ -482 +483 @@
               else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
               else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum;
+              else if (strcmp(name,"GiaW")==0) return GiaWEnum;
               else if (strcmp(name,"Gradient")==0) return GradientEnum;
               else if (strcmp(name,"GroundinglineHeight")==0) return GroundinglineHeightEnum;
@@ -504 +506 @@
               else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
               else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
-              else if (strcmp(name,"Ice")==0) return IceEnum;
-              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Input")==0) return InputEnum;
+              if (strcmp(name,"Ice")==0) return IceEnum;
+              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
+              else if (strcmp(name,"Input")==0) return InputEnum;
               else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
               else if (strcmp(name,"InversionSurfaceObs")==0) return InversionSurfaceObsEnum;
@@ -627 +629 @@
               else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
               else if (strcmp(name,"StressMaxPrincipal")==0) return StressMaxPrincipalEnum;
-              else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
-              else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
+              if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
+              else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
+              else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
               else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
               else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
@@ -750 +752 @@
               else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
               else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
-              else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
-              else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
+              if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
+              else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
+              else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
               else if (strcmp(name,"EffectivePressureStacked")==0) return EffectivePressureStackedEnum;
               else if (strcmp(name,"EffectivePressure")==0) return EffectivePressureEnum;
@@ -773 +775 @@
               else if (strcmp(name,"EsaStrainrateyy")==0) return EsaStrainrateyyEnum;
               else if (strcmp(name,"EsaTransitions")==0) return EsaTransitionsEnum;
-              else if (strcmp(name,"EsaUmotion")==0) return EsaUmotionEnum;
               else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
               else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
@@ -804 +805 @@
               else if (strcmp(name,"GiaIvinsAnalysis")==0) return GiaIvinsAnalysisEnum;
               else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
-              else if (strcmp(name,"GiaW")==0) return GiaWEnum;
               else if (strcmp(name,"Gradient1")==0) return Gradient1Enum;
               else if (strcmp(name,"Gradient2")==0) return Gradient2Enum;

issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh

@@ -130 +130 @@
         *pstring=string;
 }
+
+bool IsInput(int enum_in){
+        if(enum_in>InputsSTARTEnum && enum_in<InputsENDEnum) return true;
+        return false;
+}
+
+bool IsParam(int enum_in){
+        if(enum_in>ParametersSTARTEnum && enum_in<ParametersENDEnum) return true;
+        return false;
+}
 END
 #}}}