Ignore:
Timestamp:
07/20/18 20:44:55 (7 years ago)
Author:
seroussi
Message:

CHG: new grounding line class, with migration, melt_interpolation and friction_interpolation

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r22974 r22993  
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum;
     142              if (strcmp(name,"GroundinglineFrictionInterpolation")==0) return GroundinglineFrictionInterpolationEnum;
     143              else if (strcmp(name,"GroundinglineMeltInterpolation")==0) return GroundinglineMeltInterpolationEnum;
     144              else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum;
    143145              else if (strcmp(name,"HydrologydcEplThickComp")==0) return HydrologydcEplThickCompEnum;
    144146              else if (strcmp(name,"HydrologydcIsefficientlayer")==0) return HydrologydcIsefficientlayerEnum;
    … …  
    258260              else if (strcmp(name,"SealevelRSLEustatic")==0) return SealevelRSLEustaticEnum;
    259261              else if (strcmp(name,"SealevelUNorthEsa")==0) return SealevelUNorthEsaEnum;
    260               else if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum;
    261               else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
     265              if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum;
     266              else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
     267              else if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
    266268              else if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
    267269              else if (strcmp(name,"SealevelriseAngularVelocity")==0) return SealevelriseAngularVelocityEnum;
    … …  
    381383              else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
    382384              else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum;
    383               else if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum;
    384               else if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum;
     388              if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum;
     389              else if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum;
     390              else if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum;
    389391              else if (strcmp(name,"TransientIsslr")==0) return TransientIsslrEnum;
    390392              else if (strcmp(name,"TransientIssmb")==0) return TransientIssmbEnum;
    … …  
    504506              else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;
    505507              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,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
     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;
    512514              else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
    513515              else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
    … …  
    627629              else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
    628630              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,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
     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;
    635637              else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
    636638              else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
    … …  
    750752              else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum;
    751753              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,"EsaAnalysis")==0) return EsaAnalysisEnum;
     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;
    758760              else if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum;
    759761              else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum;
    … …  
    784786              else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
    785787              else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
     788              else if (strcmp(name,"FullMeltOnPartiallyFloating")==0) return FullMeltOnPartiallyFloatingEnum;
    786789              else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
    787790              else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
    … …  
    872875              else if (strcmp(name,"Massconaxpby")==0) return MassconaxpbyEnum;
    873876              else if (strcmp(name,"Masscon")==0) return MassconEnum;
    874               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,"MasstransportSolution")==0) return MasstransportSolutionEnum;
     880              if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
     881              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
     882              else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
     883              else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
    881884              else if (strcmp(name,"Matdamageice")==0) return MatdamageiceEnum;
    882885              else if (strcmp(name,"Matenhancedice")==0) return MatenhancediceEnum;
    … …  
    933936              else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
    934937              else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
     938              else if (strcmp(name,"NoFrictionOnPartiallyFloating")==0) return NoFrictionOnPartiallyFloatingEnum;
     939              else if (strcmp(name,"NoMeltOnPartiallyFloating")==0) return NoMeltOnPartiallyFloatingEnum;
    935940              else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
    936941              else if (strcmp(name,"None")==0) return NoneEnum;
    … …  
    993998              else if (strcmp(name,"Outputdefinition56")==0) return Outputdefinition56Enum;
    994999              else if (strcmp(name,"Outputdefinition57")==0) return Outputdefinition57Enum;
    995               else if (strcmp(name,"Outputdefinition58")==0) return Outputdefinition58Enum;
     1000         else stage=9;
     1001   }
     1002   if(stage==9){
     1003              if (strcmp(name,"Outputdefinition58")==0) return Outputdefinition58Enum;
    9961004              else if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum;
    9971005              else if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum;
    9981006              else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum;
    9991007              else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
    1000          else stage=9;
    1001    }
    1002    if(stage==9){
    1003               if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
     1008              else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
    10041009              else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
    10051010              else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
    … …  
    11161121              else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
    11171122              else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
    1118               else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
     1123         else stage=10;
     1124   }
     1125   if(stage==10){
     1126              if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
    11191127              else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
    11201128              else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
    11211129              else if (strcmp(name,"Sset")==0) return SsetEnum;
    11221130              else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
    1123          else stage=10;
    1124    }
    1125    if(stage==10){
    1126               if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
     1131              else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
    11271132              else if (strcmp(name,"StressbalanceConvergenceNumSteps")==0) return StressbalanceConvergenceNumStepsEnum;
    11281133              else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
    … …  
    11331138              else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
    11341139              else if (strcmp(name,"StringParam")==0) return StringParamEnum;
    1135               else if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum;
    1136               else if (strcmp(name,"SubelementMigration3")==0) return SubelementMigration3Enum;
     1140              else if (strcmp(name,"SubelementFriction1")==0) return SubelementFriction1Enum;
     1141              else if (strcmp(name,"SubelementFriction2")==0) return SubelementFriction2Enum;
    11371142              else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum;
     1143              else if (strcmp(name,"SubelementMelt1")==0) return SubelementMelt1Enum;
     1144              else if (strcmp(name,"SubelementMelt2")==0) return SubelementMelt2Enum;
    11381145              else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum;
    11391146              else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
Note: See TracChangeset for help on using the changeset viewer.