Ignore:
Timestamp:
07/19/18 14:22:19 (7 years ago)
Author:
tpelle
Message:

CHG: working on getting groundingline height to work

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r22951 r22974  
    412412              else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
    413413              else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
    414               else if (strcmp(name,"BasalforcingsPicoGroundingLineDepth")==0) return BasalforcingsPicoGroundingLineDepthEnum;
    415               else if (strcmp(name,"BasalforcingsPicoShelfSlope")==0) return BasalforcingsPicoShelfSlopeEnum;
    416414              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
    417415              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
    … …  
    506504              else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;
    507505              else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum;
     506              else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
     507              else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
    512               else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
    513               else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
     511              if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
    514512              else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
    515513              else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
    … …  
    629627              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
    630628              else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
     629              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
     630              else if (strcmp(name,"Surface")==0) return SurfaceEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
    635               else if (strcmp(name,"Surface")==0) return SurfaceEnum;
    636               else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
     634              if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
    637635              else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
    638636              else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
    … …  
    752750              else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum;
    753751              else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
     752              else if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum;
     753              else if (strcmp(name,"EplHead")==0) return EplHeadEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum;
    758               else if (strcmp(name,"EplHead")==0) return EplHeadEnum;
    759               else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
     757              if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
    760758              else if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum;
    761759              else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum;
    … …  
    875873              else if (strcmp(name,"Masscon")==0) return MassconEnum;
    876874              else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
     875              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
     876              else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
    881               else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
    882               else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
     880              if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
    883881              else if (strcmp(name,"Matdamageice")==0) return MatdamageiceEnum;
    884882              else if (strcmp(name,"Matenhancedice")==0) return MatenhancediceEnum;
    … …  
    998996              else if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum;
    999997              else if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum;
     998              else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum;
     999              else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum;
    1004               else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
    1005               else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
     1003              if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
    10061004              else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
    10071005              else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
    … …  
    11211119              else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
    11221120              else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
     1121              else if (strcmp(name,"Sset")==0) return SsetEnum;
     1122              else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"Sset")==0) return SsetEnum;
    1127               else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
    1128               else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
     1126              if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
    11291127              else if (strcmp(name,"StressbalanceConvergenceNumSteps")==0) return StressbalanceConvergenceNumStepsEnum;
    11301128              else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
Note: See TracChangeset for help on using the changeset viewer.