Ignore:
Timestamp:
09/29/20 10:35:39 (5 years ago)
Author:
Mathieu Morlighem
Message:

CHG: preparing ground to new MLHO model

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r25522 r25609  
    151151              else if (strcmp(name,"FlowequationIsHO")==0) return FlowequationIsHOEnum;
    152152              else if (strcmp(name,"FlowequationIsL1L2")==0) return FlowequationIsL1L2Enum;
     153              else if (strcmp(name,"FlowequationIsMLHO")==0) return FlowequationIsMLHOEnum;
    153154              else if (strcmp(name,"FlowequationIsSIA")==0) return FlowequationIsSIAEnum;
    154155              else if (strcmp(name,"FlowequationIsSSA")==0) return FlowequationIsSSAEnum;
    … …  
    259260              else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum;
    260261              else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum;
    261               else if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
     265              if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum;
     266              else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
    266267              else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
    267268              else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
    … …  
    382383              else if (strcmp(name,"SmbIsd18opd")==0) return SmbIsd18opdEnum;
    383384              else if (strcmp(name,"SmbIsdelta18o")==0) return SmbIsdelta18oEnum;
    384               else if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
     388              if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
     389              else if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
    389390              else if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum;
    390391              else if (strcmp(name,"SmbIsmelt")==0) return SmbIsmeltEnum;
    … …  
    505506              else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
    506507              else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
    507               else if (strcmp(name,"BasalforcingsPicoOverturningCoeff")==0) return BasalforcingsPicoOverturningCoeffEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
     511              if (strcmp(name,"BasalforcingsPicoOverturningCoeff")==0) return BasalforcingsPicoOverturningCoeffEnum;
     512              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
    512513              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
    513514              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum;
    … …  
    628629              else if (strcmp(name,"HydrologydcEplThicknessTransient")==0) return HydrologydcEplThicknessTransientEnum;
    629630              else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
    630               else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum;
     634              if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
     635              else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum;
    635636              else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum;
    636637              else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
    … …  
    751752              else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
    752753              else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
    753               else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
     757              if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum;
     758              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
    758759              else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
    759760              else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
    … …  
    874875              else if (strcmp(name,"Vx")==0) return VxEnum;
    875876              else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
    876               else if (strcmp(name,"VxObs")==0) return VxObsEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
     880              if (strcmp(name,"VxObs")==0) return VxObsEnum;
     881              else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    881882              else if (strcmp(name,"Vy")==0) return VyEnum;
    882883              else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
    … …  
    997998              else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
    998999              else if (strcmp(name,"AdaptiveTimestepping")==0) return AdaptiveTimesteppingEnum;
    999               else if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
     1003              if (strcmp(name,"AdjointBalancethickness2Analysis")==0) return AdjointBalancethickness2AnalysisEnum;
     1004              else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
    10041005              else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
    10051006              else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
    … …  
    11201121              else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
    11211122              else if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum;
    1122               else if (strcmp(name,"Gset")==0) return GsetEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"Gsl")==0) return GslEnum;
     1126              if (strcmp(name,"Gset")==0) return GsetEnum;
     1127              else if (strcmp(name,"Gsl")==0) return GslEnum;
    11271128              else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
    11281129              else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
    … …  
    11621163              else if (strcmp(name,"J")==0) return JEnum;
    11631164              else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
     1165              else if (strcmp(name,"MLHOApproximation")==0) return MLHOApproximationEnum;
    11641166              else if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum;
    11651167              else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum;
    … …  
    12421244              else if (strcmp(name,"P0DG")==0) return P0DGEnum;
    12431245              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
    1244               else if (strcmp(name,"P1P1")==0) return P1P1Enum;
    1245               else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
     1249              if (strcmp(name,"P1P1")==0) return P1P1Enum;
     1250              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
     1251              else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
    12501252              else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
    12511253              else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
    … …  
    13651367              else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
    13661368              else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum;
    1367               else if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum;
    1368               else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
     1372              if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum;
     1373              else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
     1374              else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
    13731375              else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
    13741376              else if (strcmp(name,"SealevelObs")==0) return SealevelObsEnum;
Note: See TracChangeset for help on using the changeset viewer.