Ignore:
Timestamp:
05/18/17 14:11:53 (8 years ago)
Author:
jbondzio
Message:

CHG: more consistent treatment of englacial water content drainage

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r21709 r21721  
    277277              else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
    278278              else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum;
     279              else if (strcmp(name,"EffectiveViscosity")==0) return EffectiveViscosityEnum;
    279280              else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    280281              else if (strcmp(name,"MaterialsRhoSeawater")==0) return MaterialsRhoSeawaterEnum;
    … …  
    382383              else if (strcmp(name,"SmbNumRequestedOutputs")==0) return SmbNumRequestedOutputsEnum;
    383384              else if (strcmp(name,"SmbRequestedOutputs")==0) return SmbRequestedOutputsEnum;
    384               else if (strcmp(name,"SmbIsInitialized")==0) return SmbIsInitializedEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
     388              if (strcmp(name,"SmbIsInitialized")==0) return SmbIsInitializedEnum;
     389              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
    389390              else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
    390391              else if (strcmp(name,"SmbReini")==0) return SmbReiniEnum;
    … …  
    505506              else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
    506507              else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
    507               else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
     511              if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
     512              else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
    512513              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
    513514              else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
    … …  
    549550              else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
    550551              else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
     552              else if (strcmp(name,"WaterfractionDrainage")==0) return WaterfractionDrainageEnum;
     553              else if (strcmp(name,"WaterfractionDrainageIntegrated")==0) return WaterfractionDrainageIntegratedEnum;
    551554              else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
    552555              else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
    … …  
    626629              else if (strcmp(name,"Outputdefinition26")==0) return Outputdefinition26Enum;
    627630              else if (strcmp(name,"Outputdefinition27")==0) return Outputdefinition27Enum;
    628               else if (strcmp(name,"Outputdefinition28")==0) return Outputdefinition28Enum;
    629               else if (strcmp(name,"Outputdefinition29")==0) return Outputdefinition29Enum;
    630               else if (strcmp(name,"Outputdefinition30")==0) return Outputdefinition30Enum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"Outputdefinition31")==0) return Outputdefinition31Enum;
     634              if (strcmp(name,"Outputdefinition28")==0) return Outputdefinition28Enum;
     635              else if (strcmp(name,"Outputdefinition29")==0) return Outputdefinition29Enum;
     636              else if (strcmp(name,"Outputdefinition30")==0) return Outputdefinition30Enum;
     637              else if (strcmp(name,"Outputdefinition31")==0) return Outputdefinition31Enum;
    635638              else if (strcmp(name,"Outputdefinition32")==0) return Outputdefinition32Enum;
    636639              else if (strcmp(name,"Outputdefinition33")==0) return Outputdefinition33Enum;
    … …  
    749752              else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
    750753              else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
    751               else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
    752               else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
    753               else if (strcmp(name,"Regular")==0) return RegularEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"Scaled")==0) return ScaledEnum;
     757              if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
     758              else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
     759              else if (strcmp(name,"Regular")==0) return RegularEnum;
     760              else if (strcmp(name,"Scaled")==0) return ScaledEnum;
    758761              else if (strcmp(name,"Separate")==0) return SeparateEnum;
    759762              else if (strcmp(name,"Sset")==0) return SsetEnum;
    … …  
    872875              else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
    873876              else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
    874               else if (strcmp(name,"StringParam")==0) return StringParamEnum;
    875               else if (strcmp(name,"Seg")==0) return SegEnum;
    876               else if (strcmp(name,"SegInput")==0) return SegInputEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Tria")==0) return TriaEnum;
     880              if (strcmp(name,"StringParam")==0) return StringParamEnum;
     881              else if (strcmp(name,"Seg")==0) return SegEnum;
     882              else if (strcmp(name,"SegInput")==0) return SegInputEnum;
     883              else if (strcmp(name,"Tria")==0) return TriaEnum;
    881884              else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
    882885              else if (strcmp(name,"Tetra")==0) return TetraEnum;
    … …  
    995998              else if (strcmp(name,"P1P1")==0) return P1P1Enum;
    996999              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
    997               else if (strcmp(name,"MINI")==0) return MINIEnum;
    998               else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
    999               else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"LATaylorHood")==0) return LATaylorHoodEnum;
     1003              if (strcmp(name,"MINI")==0) return MINIEnum;
     1004              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
     1005              else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
     1006              else if (strcmp(name,"LATaylorHood")==0) return LATaylorHoodEnum;
    10041007              else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
    10051008              else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
Note: See TracChangeset for help on using the changeset viewer.