Changeset 12326 for issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

Timestamp:

06/01/12 17:06:57 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -110 +110 @@
               else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
               else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;
+              else if (strcmp(name,"MaterialsRhoFreshwater")==0) return MaterialsRhoFreshwaterEnum;
               else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
               else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
@@ -138 +139 @@
               else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum;
               else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
-              else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
+              if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
+              else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
               else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
               else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
@@ -170 +171 @@
               else if (strcmp(name,"SurfaceforcingsPrecipitation")==0) return SurfaceforcingsPrecipitationEnum;
               else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
+              else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum;
+              else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum;
               else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum;
               else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;
@@ -265 +268 @@
    }
    if(stage==3){
-              if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum;
+              if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
+              else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum;
+              else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum;
               else if (strcmp(name,"Matice")==0) return MaticeEnum;
               else if (strcmp(name,"Matpar")==0) return MatparEnum;