Ignore:
Timestamp:
04/12/13 12:02:37 (12 years ago)
Author:
Mathieu Morlighem
Message:

NEW: LeBrocq's model is now hydrologyshreve, and added template for Basile's model

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r14555 r14562  
    8585              else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
    8686              else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
     87              else if (strcmp(name,"Hydrology")==0) return HydrologyEnum;
     88              else if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum;
    8789              else if (strcmp(name,"HydrologyshreveCR")==0) return HydrologyshreveCREnum;
    8890              else if (strcmp(name,"HydrologyshreveKn")==0) return HydrologyshreveKnEnum;
    … …  
    9294              else if (strcmp(name,"HydrologyshreveSpcwatercolumn")==0) return HydrologyshreveSpcwatercolumnEnum;
    9395              else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum;
     96              else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
     97              else if (strcmp(name,"Sedimenthead")==0) return SedimentheadEnum;
     98              else if (strcmp(name,"HydrologydcSedimentporosity")==0) return HydrologydcSedimentporosityEnum;
     99              else if (strcmp(name,"HydrologydcSpcsedimenthead")==0) return HydrologydcSpcsedimentheadEnum;
    94100              else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
    95101              else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
    … …  
    132138              else if (strcmp(name,"MaterialsRheologyZ")==0) return MaterialsRheologyZEnum;
    133139              else if (strcmp(name,"MaterialsRheologyZbar")==0) return MaterialsRheologyZbarEnum;
    134               else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
     140         else stage=2;
     141   }
     142   if(stage==2){
     143              if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    135144              else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;
    136145              else if (strcmp(name,"MaterialsRhoFreshwater")==0) return MaterialsRhoFreshwaterEnum;
    … …  
    138147              else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
    139148              else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
    140          else stage=2;
    141    }
    142    if(stage==2){
    143               if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
     149              else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
    144150              else if (strcmp(name,"MeshDimension")==0) return MeshDimensionEnum;
    145151              else if (strcmp(name,"MeshEdges")==0) return MeshEdgesEnum;
    … …  
    255261              else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
    256262              else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
    257               else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum;
     263         else stage=3;
     264   }
     265   if(stage==3){
     266              if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum;
    258267              else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
    259268              else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
    … …  
    261270              else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum;
    262271              else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum;
    263          else stage=3;
    264    }
    265    if(stage==3){
    266               if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
     272              else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
    267273              else if (strcmp(name,"SurfaceSlopeAnalysis")==0) return SurfaceSlopeAnalysisEnum;
    268274              else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
    … …  
    378384              else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
    379385              else if (strcmp(name,"QmuVx")==0) return QmuVxEnum;
    380               else if (strcmp(name,"QmuVy")==0) return QmuVyEnum;
     386         else stage=4;
     387   }
     388   if(stage==4){
     389              if (strcmp(name,"QmuVy")==0) return QmuVyEnum;
    381390              else if (strcmp(name,"QmuVz")==0) return QmuVzEnum;
    382391              else if (strcmp(name,"QmuThickness")==0) return QmuThicknessEnum;
    … …  
    384393              else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum;
    385394              else if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum;
    386          else stage=4;
    387    }
    388    if(stage==4){
    389               if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
     395              else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
    390396              else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
    391397              else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
    … …  
    501507              else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum;
    502508              else if (strcmp(name,"Gset")==0) return GsetEnum;
    503               else if (strcmp(name,"Index")==0) return IndexEnum;
     509         else stage=5;
     510   }
     511   if(stage==5){
     512              if (strcmp(name,"Index")==0) return IndexEnum;
    504513              else if (strcmp(name,"Indexed")==0) return IndexedEnum;
    505514              else if (strcmp(name,"Intersect")==0) return IntersectEnum;
    … …  
    507516              else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
    508517              else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
    509          else stage=5;
    510    }
    511    if(stage==5){
    512               if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
     518              else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
    513519              else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
    514520              else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum;
Note: See TracChangeset for help on using the changeset viewer.