Ignore:
Timestamp:
09/11/14 07:07:06 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: working on sea ice model

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r18497 r18504  
    5858              else if (strcmp(name,"Base")==0) return BaseEnum;
    5959              else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum;
     60              else if (strcmp(name,"ConstantsOmega")==0) return ConstantsOmegaEnum;
    6061              else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum;
    6162              else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum;
    … …  
    136137              else if (strcmp(name,"HydrologydcSedimentlimitFlag")==0) return HydrologydcSedimentlimitFlagEnum;
    137138              else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
    138               else if (strcmp(name,"HydrologydcTransferFlag")==0) return HydrologydcTransferFlagEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
     142              if (strcmp(name,"HydrologydcTransferFlag")==0) return HydrologydcTransferFlagEnum;
     143              else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
    143144              else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
    144145              else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
    … …  
    209210              else if (strcmp(name,"DamageEvolutionNumRequestedOutputs")==0) return DamageEvolutionNumRequestedOutputsEnum;
    210211              else if (strcmp(name,"DamageEvolutionRequestedOutputs")==0) return DamageEvolutionRequestedOutputsEnum;
     212              else if (strcmp(name,"Damage")==0) return DamageEnum;
    211213              else if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
    212214              else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    … …  
    258260              else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;
    259261              else if (strcmp(name,"QmuMassFluxSegmentsPresent")==0) return QmuMassFluxSegmentsPresentEnum;
    260               else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
    261               else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
     265              if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
     266              else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
     267              else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
    266268              else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
    267269              else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
    … …  
    381383              else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
    382384              else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
    383               else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
    384               else if (strcmp(name,"SurfaceNormalVelocity")==0) return SurfaceNormalVelocityEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
     388              if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
     389              else if (strcmp(name,"SurfaceNormalVelocity")==0) return SurfaceNormalVelocityEnum;
     390              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
    389391              else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
    390392              else if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum;
    … …  
    504506              else if (strcmp(name,"Internal")==0) return InternalEnum;
    505507              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
    506               else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
    507               else if (strcmp(name,"Misfit")==0) return MisfitEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"Pressure")==0) return PressureEnum;
     511              if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
     512              else if (strcmp(name,"Misfit")==0) return MisfitEnum;
     513              else if (strcmp(name,"Pressure")==0) return PressureEnum;
    512514              else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
    513515              else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
    … …  
    627629              else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;
    628630              else if (strcmp(name,"MisfitWeightsEnum")==0) return MisfitWeightsEnumEnum;
    629               else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
    630               else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"MinVel")==0) return MinVelEnum;
     634              if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
     635              else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
     636              else if (strcmp(name,"MinVel")==0) return MinVelEnum;
    635637              else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
    636638              else if (strcmp(name,"MinVx")==0) return MinVxEnum;
    … …  
    723725              else if (strcmp(name,"SeaiceThickness")==0) return SeaiceThicknessEnum;
    724726              else if (strcmp(name,"SeaiceConcentration")==0) return SeaiceConcentrationEnum;
     727              else if (strcmp(name,"SeaiceMinConcentration")==0) return SeaiceMinConcentrationEnum;
     728              else if (strcmp(name,"SeaiceMinThickness")==0) return SeaiceMinThicknessEnum;
     729              else if (strcmp(name,"SeaiceMaxThickness")==0) return SeaiceMaxThicknessEnum;
    725730              else if (strcmp(name,"SeaiceSpcvx")==0) return SeaiceSpcvxEnum;
    726731              else if (strcmp(name,"SeaiceSpcvy")==0) return SeaiceSpcvyEnum;
    … …  
    743748              else if (strcmp(name,"MaterialsPoisson")==0) return MaterialsPoissonEnum;
    744749              else if (strcmp(name,"MaterialsYoungModulus")==0) return MaterialsYoungModulusEnum;
    745               else if (strcmp(name,"MaterialsDamage")==0) return MaterialsDamageEnum;
     750              else if (strcmp(name,"MaterialsTimeRelaxationStress")==0) return MaterialsTimeRelaxationStressEnum;
     751              else if (strcmp(name,"MaterialsTimeRelaxationDamage")==0) return MaterialsTimeRelaxationDamageEnum;
    746752              else if (strcmp(name,"MaterialsRidgingExponent")==0) return MaterialsRidgingExponentEnum;
    747753              else if (strcmp(name,"MaterialsCohesion")==0) return MaterialsCohesionEnum;
    748               else if (strcmp(name,"MaterialsInternalFrictionCoef")==0) return MaterialsInternalFrictionCoefEnum;
     754         else stage=7;
     755   }
     756   if(stage==7){
     757              if (strcmp(name,"MaterialsInternalFrictionCoef")==0) return MaterialsInternalFrictionCoefEnum;
    749758              else if (strcmp(name,"MaterialsCompressionCoef")==0) return MaterialsCompressionCoefEnum;
    750759              else if (strcmp(name,"MaterialsTractionCoef")==0) return MaterialsTractionCoefEnum;
    751760              else if (strcmp(name,"VxStar")==0) return VxStarEnum;
    752761              else if (strcmp(name,"VyStar")==0) return VyStarEnum;
     762              else if (strcmp(name,"StressTensorPredictorxx")==0) return StressTensorPredictorxxEnum;
     763              else if (strcmp(name,"StressTensorPredictoryy")==0) return StressTensorPredictoryyEnum;
     764              else if (strcmp(name,"StressTensorPredictorxy")==0) return StressTensorPredictorxyEnum;
    753765              else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
    754          else stage=7;
     766         else stage=8;
    755767   }
    756768        /*If we reach this point, the string provided has not been found*/
Note: See TracChangeset for help on using the changeset viewer.