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

Timestamp:

10/04/13 15:57:44 (11 years ago)

Author:

Eric.Larour

Message:

CHG: reworking the mass flux gate within the qmu solution.

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (5 diffs)

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

@@ -223 +223 @@
               else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
               else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
-              else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;
-              else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;
-              else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
-              else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
               else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
               else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
@@ -260 +256 @@
               else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
               else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum;
+              else if (strcmp(name,"SurfaceforcingsDesfac")==0) return SurfaceforcingsDesfacEnum;
+              else if (strcmp(name,"SurfaceforcingsS0p")==0) return SurfaceforcingsS0pEnum;
+              else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum;
+              else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"SurfaceforcingsDesfac")==0) return SurfaceforcingsDesfacEnum;
-              else if (strcmp(name,"SurfaceforcingsS0p")==0) return SurfaceforcingsS0pEnum;
-              else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum;
-              else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum;
-              else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum;
+              if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum;
               else if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum;
               else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum;
@@ -383 +379 @@
               else if (strcmp(name,"Input")==0) return InputEnum;
               else if (strcmp(name,"IntInput")==0) return IntInputEnum;
+              else if (strcmp(name,"IntParam")==0) return IntParamEnum;
+              else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
+              else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
+              else if (strcmp(name,"Matice")==0) return MaticeEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"IntParam")==0) return IntParamEnum;
-              else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
-              else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
-              else if (strcmp(name,"Matice")==0) return MaticeEnum;
-              else if (strcmp(name,"Matpar")==0) return MatparEnum;
+              if (strcmp(name,"Matpar")==0) return MatparEnum;
               else if (strcmp(name,"Node")==0) return NodeEnum;
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
@@ -506 +502 @@
               else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
               else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
+              else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
+              else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
+              else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
+              else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
-              else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
-              else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
-              else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
-              else if (strcmp(name,"GiaW")==0) return GiaWEnum;
+              if (strcmp(name,"GiaW")==0) return GiaWEnum;
               else if (strcmp(name,"P0")==0) return P0Enum;
               else if (strcmp(name,"P1")==0) return P1Enum;
@@ -544 +540 @@
               else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum;
               else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
+              else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
+              else if (strcmp(name,"OutputdefinitionEnums")==0) return OutputdefinitionEnumsEnum;
+              else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
+              else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
+              else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
               else if (strcmp(name,"MinVel")==0) return MinVelEnum;
               else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;