Ignore:
Timestamp:
07/30/14 14:22:43 (11 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 18299

Location:
issm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/src

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

    r17989 r18301  
    4646              else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
    4747              else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
     48              else if (strcmp(name,"Basalforcings")==0) return BasalforcingsEnum;
    4849              else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
    49               else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum;
    50               else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum;
     50              else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum;
     51              else if (strcmp(name,"BasalforcingsFloatingiceMeltingRate")==0) return BasalforcingsFloatingiceMeltingRateEnum;
     52              else if (strcmp(name,"BasalforcingsDeepwaterMeltingRate")==0) return BasalforcingsDeepwaterMeltingRateEnum;
     53              else if (strcmp(name,"BasalforcingsDeepwaterElevation")==0) return BasalforcingsDeepwaterElevationEnum;
     54              else if (strcmp(name,"BasalforcingsUpperwaterElevation")==0) return BasalforcingsUpperwaterElevationEnum;
     55              else if (strcmp(name,"FloatingMeltRate")==0) return FloatingMeltRateEnum;
     56              else if (strcmp(name,"LinearFloatingMeltRate")==0) return LinearFloatingMeltRateEnum;
    5157              else if (strcmp(name,"Bed")==0) return BedEnum;
    5258              else if (strcmp(name,"Base")==0) return BaseEnum;
    … …  
    131137              else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
    132138              else if (strcmp(name,"HydrologydcTransferFlag")==0) return HydrologydcTransferFlagEnum;
    133               else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
     139         else stage=2;
     140   }
     141   if(stage==2){
     142              if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
    134143              else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
    135144              else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
    … …  
    137146              else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum;
    138147              else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum;
    139          else stage=2;
    140    }
    141    if(stage==2){
    142               if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum;
     148              else if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum;
    143149              else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum;
    144150              else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
    … …  
    172178              else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum;
    173179              else if (strcmp(name,"MaskIceLevelset")==0) return MaskIceLevelsetEnum;
    174               else if (strcmp(name,"QmuMaskIceLevelset")==0) return QmuMaskIceLevelsetEnum;
    175180              else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
    176181              else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum;
    … …  
    185190              else if (strcmp(name,"DamageD")==0) return DamageDEnum;
    186191              else if (strcmp(name,"DamageF")==0) return DamageFEnum;
    187               else if (strcmp(name,"QmuDamageD")==0) return QmuDamageDEnum;
    188192              else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
    189193              else if (strcmp(name,"DamageLaw")==0) return DamageLawEnum;
    … …  
    205209              else if (strcmp(name,"DamageEvolutionNumRequestedOutputs")==0) return DamageEvolutionNumRequestedOutputsEnum;
    206210              else if (strcmp(name,"DamageEvolutionRequestedOutputs")==0) return DamageEvolutionRequestedOutputsEnum;
     211              else if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
    207212              else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    208213              else if (strcmp(name,"MaterialsRhoSeawater")==0) return MaterialsRhoSeawaterEnum;
    … …  
    255260              else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
    256261              else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum;
    257               else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
    258               else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
    259               else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
    260               else if (strcmp(name,"QmuMaterialsRheologyB")==0) return QmuMaterialsRheologyBEnum;
    261               else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
     265              if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
     266              else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
     267              else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
     268              else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
     269              else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
    266270              else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum;
    267271              else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
    … …  
    336340              else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum;
    337341              else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
     342              else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
     343              else if (strcmp(name,"SurfaceforcingsAccumulation")==0) return SurfaceforcingsAccumulationEnum;
     344              else if (strcmp(name,"SurfaceforcingsEvaporation")==0) return SurfaceforcingsEvaporationEnum;
     345              else if (strcmp(name,"SurfaceforcingsRunoff")==0) return SurfaceforcingsRunoffEnum;
     346              else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
     347              else if (strcmp(name,"SurfaceforcingsMelt")==0) return SurfaceforcingsMeltEnum;
     348              else if (strcmp(name,"SurfaceforcingsRefreeze")==0) return SurfaceforcingsRefreezeEnum;
    338349              else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum;
    339350              else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum;
    … …  
    372383              else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
    373384              else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
    374               else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
     385         else stage=4;
     386   }
     387   if(stage==4){
     388              if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
    375389              else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
    376390              else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
    … …  
    383397              else if (strcmp(name,"SmoothedSurfaceSlopeXAnalysis")==0) return SmoothedSurfaceSlopeXAnalysisEnum;
    384398              else if (strcmp(name,"SmoothedSurfaceSlopeYAnalysis")==0) return SmoothedSurfaceSlopeYAnalysisEnum;
    385          else stage=4;
    386    }
    387    if(stage==4){
    388               if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
     399              else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
    389400              else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
    390401              else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
     402              else if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum;
    391403              else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
    392404              else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
    … …  
    492504              else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
    493505              else if (strcmp(name,"Friction")==0) return FrictionEnum;
    494               else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum;
    495506              else if (strcmp(name,"Internal")==0) return InternalEnum;
    496507              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
    497               else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
     508         else stage=5;
     509   }
     510   if(stage==5){
     511              if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
    498512              else if (strcmp(name,"Misfit")==0) return MisfitEnum;
    499513              else if (strcmp(name,"Pressure")==0) return PressureEnum;
    500514              else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
    501               else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
    502               else if (strcmp(name,"QmuVx")==0) return QmuVxEnum;
    503               else if (strcmp(name,"QmuVy")==0) return QmuVyEnum;
    504               else if (strcmp(name,"QmuVz")==0) return QmuVzEnum;
    505               else if (strcmp(name,"QmuThickness")==0) return QmuThicknessEnum;
    506               else if (strcmp(name,"QmuBase")==0) return QmuBaseEnum;
    507               else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum;
    508          else stage=5;
    509    }
    510    if(stage==5){
    511               if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum;
    512               else if (strcmp(name,"QmuVxMesh")==0) return QmuVxMeshEnum;
    513               else if (strcmp(name,"QmuVyMesh")==0) return QmuVyMeshEnum;
    514               else if (strcmp(name,"QmuVzMesh")==0) return QmuVzMeshEnum;
    515515              else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
    516516              else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
    … …  
    556556              else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
    557557              else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
    558               else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
    559558              else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
    560559              else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
    … …  
    591590              else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
    592591              else if (strcmp(name,"P2")==0) return P2Enum;
     592              else if (strcmp(name,"P2bubble")==0) return P2bubbleEnum;
     593              else if (strcmp(name,"P2bubblecondensed")==0) return P2bubblecondensedEnum;
    593594              else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
    594595              else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
    … …  
    600601              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
    601602              else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
     603              else if (strcmp(name,"LATaylorHood")==0) return LATaylorHoodEnum;
    602604              else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
    603605              else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
     606              else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
    604607              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
    605608              else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
    … …  
    626629              else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
    627630              else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
    628               else if (strcmp(name,"MinVel")==0) return MinVelEnum;
    629               else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
    630               else if (strcmp(name,"MinVx")==0) return MinVxEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
     634              if (strcmp(name,"MinVel")==0) return MinVelEnum;
     635              else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
     636              else if (strcmp(name,"MinVx")==0) return MinVxEnum;
     637              else if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
    635638              else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum;
    636639              else if (strcmp(name,"MinVy")==0) return MinVyEnum;
    … …  
    646649              else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
    647650              else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
     651              else if (strcmp(name,"AugmentedLagrangianRhop")==0) return AugmentedLagrangianRhopEnum;
     652              else if (strcmp(name,"AugmentedLagrangianRlambda")==0) return AugmentedLagrangianRlambdaEnum;
     653              else if (strcmp(name,"AugmentedLagrangianRholambda")==0) return AugmentedLagrangianRholambdaEnum;
    648654              else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
    649655              else if (strcmp(name,"None")==0) return NoneEnum;
    … …  
    654660              else if (strcmp(name,"Contact")==0) return ContactEnum;
    655661              else if (strcmp(name,"MaskGroundediceLevelset")==0) return MaskGroundediceLevelsetEnum;
    656               else if (strcmp(name,"QmuMaskGroundediceLevelset")==0) return QmuMaskGroundediceLevelsetEnum;
    657662              else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
    658663              else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
Note: See TracChangeset for help on using the changeset viewer.