Changeset 21722

Timestamp:

05/18/17 14:24:49 (8 years ago)

Author:

jbondzio

Message:

CHG: minor: removal of superfluous enum and function call

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (7 diffs)

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

@@ -1082 +1082 @@
                 IssmDouble* drainage= xNew<IssmDouble>(numnodes);
 
-                element->GetInputListOnNodes(enthalpies,EnthalpyEnum);
                 element->GetInputListOnNodes(pressures,PressureEnum);
                 element->GetInputListOnNodes(temperatures,TemperatureEnum);

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

@@ -265 +265 @@
         StrainRateperpendicularEnum,
         StrainRateeffectiveEnum,
-        EffectiveViscosityEnum,
         MaterialsRhoIceEnum,
         MaterialsRhoSeawaterEnum,

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

@@ -271 +271 @@
                 case StrainRateperpendicularEnum : return "StrainRateperpendicular";
                 case StrainRateeffectiveEnum : return "StrainRateeffective";
-                case EffectiveViscosityEnum : return "EffectiveViscosity";
                 case MaterialsRhoIceEnum : return "MaterialsRhoIce";
                 case MaterialsRhoSeawaterEnum : return "MaterialsRhoSeawater";

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

@@ -277 +277 @@
               else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
               else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum;
-              else if (strcmp(name,"EffectiveViscosity")==0) return EffectiveViscosityEnum;
               else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
               else if (strcmp(name,"MaterialsRhoSeawater")==0) return MaterialsRhoSeawaterEnum;
@@ -383 +382 @@
               else if (strcmp(name,"SmbNumRequestedOutputs")==0) return SmbNumRequestedOutputsEnum;
               else if (strcmp(name,"SmbRequestedOutputs")==0) return SmbRequestedOutputsEnum;
+              else if (strcmp(name,"SmbIsInitialized")==0) return SmbIsInitializedEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SmbIsInitialized")==0) return SmbIsInitializedEnum;
-              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
+              if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
               else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
               else if (strcmp(name,"SmbReini")==0) return SmbReiniEnum;
@@ -506 +505 @@
               else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
               else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
+              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
-              else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
+              if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
               else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
               else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
@@ -629 +628 @@
               else if (strcmp(name,"Outputdefinition26")==0) return Outputdefinition26Enum;
               else if (strcmp(name,"Outputdefinition27")==0) return Outputdefinition27Enum;
+              else if (strcmp(name,"Outputdefinition28")==0) return Outputdefinition28Enum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Outputdefinition28")==0) return Outputdefinition28Enum;
-              else if (strcmp(name,"Outputdefinition29")==0) return Outputdefinition29Enum;
+              if (strcmp(name,"Outputdefinition29")==0) return Outputdefinition29Enum;
               else if (strcmp(name,"Outputdefinition30")==0) return Outputdefinition30Enum;
               else if (strcmp(name,"Outputdefinition31")==0) return Outputdefinition31Enum;
@@ -752 +751 @@
               else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
               else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
+              else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
-              else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
+              if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
               else if (strcmp(name,"Regular")==0) return RegularEnum;
               else if (strcmp(name,"Scaled")==0) return ScaledEnum;
@@ -875 +874 @@
               else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
               else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
+              else if (strcmp(name,"StringParam")==0) return StringParamEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"StringParam")==0) return StringParamEnum;
-              else if (strcmp(name,"Seg")==0) return SegEnum;
+              if (strcmp(name,"Seg")==0) return SegEnum;
               else if (strcmp(name,"SegInput")==0) return SegInputEnum;
               else if (strcmp(name,"Tria")==0) return TriaEnum;
@@ -998 +997 @@
               else if (strcmp(name,"P1P1")==0) return P1P1Enum;
               else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
+              else if (strcmp(name,"MINI")==0) return MINIEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"MINI")==0) return MINIEnum;
-              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
+              if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
               else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
               else if (strcmp(name,"LATaylorHood")==0) return LATaylorHoodEnum;