Ignore:
Timestamp:
07/04/18 07:48:56 (7 years ago)
Author:
bdef
Message:

NEW:deactivation of hydrologydc for frozen elements

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r22856 r22898  
    456456              else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
    457457              else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
     458              else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum;
     459              else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum;
    458460              else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
    459461              else if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum;
    … …  
    504506              else if (strcmp(name,"Pressure")==0) return PressureEnum;
    505507              else if (strcmp(name,"RheologyBAbsGradient")==0) return RheologyBAbsGradientEnum;
    506               else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
    507               else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
     511              if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
     512              else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
     513              else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
    512514              else if (strcmp(name,"SedimentHeadHydrostep")==0) return SedimentHeadHydrostepEnum;
    513515              else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum;
    … …  
    627629              else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
    628630              else if (strcmp(name,"VzSSA")==0) return VzSSAEnum;
    629               else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
    630               else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"WaterfractionDrainage")==0) return WaterfractionDrainageEnum;
     634              if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
     635              else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
     636              else if (strcmp(name,"WaterfractionDrainage")==0) return WaterfractionDrainageEnum;
    635637              else if (strcmp(name,"WaterfractionDrainageIntegrated")==0) return WaterfractionDrainageIntegratedEnum;
    636638              else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
    … …  
    750752              else if (strcmp(name,"FSpressure")==0) return FSpressureEnum;
    751753              else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
    752               else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
    753               else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
     757              if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
     758              else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
     759              else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
    758760              else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
    759761              else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
    … …  
    873875              else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
    874876              else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum;
    875               else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
    876               else if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
     880              if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
     881              else if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
     882              else if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
    881883              else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
    882884              else if (strcmp(name,"Melange")==0) return MelangeEnum;
    … …  
    996998              else if (strcmp(name,"Outputdefinition88")==0) return Outputdefinition88Enum;
    997999              else if (strcmp(name,"Outputdefinition89")==0) return Outputdefinition89Enum;
    998               else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
    999               else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
     1003              if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
     1004              else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
     1005              else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
    10041006              else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
    10051007              else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
    … …  
    11191121              else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum;
    11201122              else if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;
    1121               else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
    1122               else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
     1126              if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
     1127              else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
     1128              else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
    11271129              else if (strcmp(name,"Tria")==0) return TriaEnum;
    11281130              else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
Note: See TracChangeset for help on using the changeset viewer.