Ignore:
Timestamp:
10/28/13 14:43:03 (11 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 16554

Location:
issm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/src

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

    r16137 r16560  
    1212#include "../Exceptions/exceptions.h"
    1313
    14 int  StringToEnumx(const char* name){
     14int  StringToEnumx(const char* name,bool notfounderror){
    1515
    1616   int  stage=1;
    … …  
    3737              else if (strcmp(name,"AutodiffMassFluxSegmentsPresent")==0) return AutodiffMassFluxSegmentsPresentEnum;
    3838              else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
     39              else if (strcmp(name,"AutodiffObufsize")==0) return AutodiffObufsizeEnum;
     40              else if (strcmp(name,"AutodiffLbufsize")==0) return AutodiffLbufsizeEnum;
     41              else if (strcmp(name,"AutodiffCbufsize")==0) return AutodiffCbufsizeEnum;
     42              else if (strcmp(name,"AutodiffTbufsize")==0) return AutodiffTbufsizeEnum;
     43              else if (strcmp(name,"AutodiffGcTriggerRatio")==0) return AutodiffGcTriggerRatioEnum;
     44              else if (strcmp(name,"AutodiffGcTriggerMaxSize")==0) return AutodiffGcTriggerMaxSizeEnum;
    3945              else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
    4046              else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
    … …  
    5056              else if (strcmp(name,"DependentObject")==0) return DependentObjectEnum;
    5157              else if (strcmp(name,"StressbalanceAbstol")==0) return StressbalanceAbstolEnum;
    52               else if (strcmp(name,"StressbalanceIcefront")==0) return StressbalanceIcefrontEnum;
    5358              else if (strcmp(name,"StressbalanceIsnewton")==0) return StressbalanceIsnewtonEnum;
    5459              else if (strcmp(name,"StressbalanceMaxiter")==0) return StressbalanceMaxiterEnum;
    55               else if (strcmp(name,"StressbalanceNumRequestedOutputs")==0) return StressbalanceNumRequestedOutputsEnum;
    5660              else if (strcmp(name,"StressbalancePenaltyFactor")==0) return StressbalancePenaltyFactorEnum;
    5761              else if (strcmp(name,"StressbalanceReferential")==0) return StressbalanceReferentialEnum;
    5862              else if (strcmp(name,"StressbalanceReltol")==0) return StressbalanceReltolEnum;
     63              else if (strcmp(name,"StressbalanceNumRequestedOutputs")==0) return StressbalanceNumRequestedOutputsEnum;
    5964              else if (strcmp(name,"StressbalanceRequestedOutputs")==0) return StressbalanceRequestedOutputsEnum;
    6065              else if (strcmp(name,"StressbalanceRestol")==0) return StressbalanceRestolEnum;
    … …  
    126131              else if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum;
    127132              else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum;
    128               else if (strcmp(name,"BasisIntegral")==0) return BasisIntegralEnum;
    129133              else if (strcmp(name,"WaterTransfer")==0) return WaterTransferEnum;
    130134              else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
    … …  
    133137              else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
    134138              else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum;
    135               else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum;
    136               else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;
    137               else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
    138               else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
     142              if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;
     143              else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
     144              else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
     145              else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
    143146              else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
    144147              else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
    … …  
    149152              else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum;
    150153              else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum;
    151               else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;
    152154              else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum;
    153155              else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
    154156              else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum;
    155157              else if (strcmp(name,"MaskIceLevelset")==0) return MaskIceLevelsetEnum;
     158              else if (strcmp(name,"QmuMaskIceLevelset")==0) return QmuMaskIceLevelsetEnum;
    156159              else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
    157160              else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum;
    … …  
    163166              else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
    164167              else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
    165               else if (strcmp(name,"MaterialsRheologyZ")==0) return MaterialsRheologyZEnum;
    166               else if (strcmp(name,"MaterialsRheologyZbar")==0) return MaterialsRheologyZbarEnum;
     168              else if (strcmp(name,"DamageD")==0) return DamageDEnum;
     169              else if (strcmp(name,"QmuDamageD")==0) return QmuDamageDEnum;
     170              else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
     171              else if (strcmp(name,"DamageLaw")==0) return DamageLawEnum;
     172              else if (strcmp(name,"DamageC1")==0) return DamageC1Enum;
     173              else if (strcmp(name,"DamageC2")==0) return DamageC2Enum;
     174              else if (strcmp(name,"DamageC3")==0) return DamageC3Enum;
     175              else if (strcmp(name,"DamageC4")==0) return DamageC4Enum;
     176              else if (strcmp(name,"DamageHealing")==0) return DamageHealingEnum;
     177              else if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum;
     178              else if (strcmp(name,"DamageStabilization")==0) return DamageStabilizationEnum;
     179              else if (strcmp(name,"DamagePenaltyThreshold")==0) return DamagePenaltyThresholdEnum;
     180              else if (strcmp(name,"DamagePenaltyLock")==0) return DamagePenaltyLockEnum;
     181              else if (strcmp(name,"DamagePenaltyFactor")==0) return DamagePenaltyFactorEnum;
     182              else if (strcmp(name,"DamageMaxiter")==0) return DamageMaxiterEnum;
     183              else if (strcmp(name,"DamageSpcdamage")==0) return DamageSpcdamageEnum;
     184              else if (strcmp(name,"DamageMaxDamage")==0) return DamageMaxDamageEnum;
    167185              else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    168186              else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;
    … …  
    176194              else if (strcmp(name,"MaterialsMantleDensity")==0) return MaterialsMantleDensityEnum;
    177195              else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
    178               else if (strcmp(name,"MeshDimension")==0) return MeshDimensionEnum;
    179196              else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum;
    180197              else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum;
    … …  
    193210              else if (strcmp(name,"MeshY")==0) return MeshYEnum;
    194211              else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
     212              else if (strcmp(name,"MeshType")==0) return MeshTypeEnum;
     213              else if (strcmp(name,"Mesh2Dhorizontal")==0) return Mesh2DhorizontalEnum;
     214              else if (strcmp(name,"Mesh2Dvertical")==0) return Mesh2DverticalEnum;
     215              else if (strcmp(name,"Mesh3D")==0) return Mesh3DEnum;
    195216              else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
    196217              else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
    … …  
    218239              else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
    219240              else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
    220               else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum;
    221241              else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
    222242              else if (strcmp(name,"SurfaceforcingsDelta18o")==0) return SurfaceforcingsDelta18oEnum;
    … …  
    240260              else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum;
    241261              else if (strcmp(name,"SurfaceforcingsDesfac")==0) return SurfaceforcingsDesfacEnum;
    242               else if (strcmp(name,"SurfaceforcingsS0p")==0) return SurfaceforcingsS0pEnum;
     262         else stage=3;
     263   }
     264   if(stage==3){
     265              if (strcmp(name,"SurfaceforcingsS0p")==0) return SurfaceforcingsS0pEnum;
    243266              else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum;
    244267              else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum;
    … …  
    255278              else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
    256279              else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
     280              else if (strcmp(name,"ThermalNumRequestedOutputs")==0) return ThermalNumRequestedOutputsEnum;
     281              else if (strcmp(name,"ThermalRequestedOutputs")==0) return ThermalRequestedOutputsEnum;
    257282              else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum;
    258283              else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
    … …  
    260285              else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
    261286              else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
    262          else stage=3;
    263    }
    264    if(stage==3){
    265               if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
     287              else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
    266288              else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
    267289              else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
    … …  
    271293              else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum;
    272294              else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum;
     295              else if (strcmp(name,"TransientIsdamage")==0) return TransientIsdamageEnum;
    273296              else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
    274297              else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
    … …  
    278301              else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
    279302              else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
    280               else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum;
    281303              else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum;
    282               else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum;
    283304              else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
    284305              else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
    … …  
    288309              else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
    289310              else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
    290               else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum;
     311              else if (strcmp(name,"L2ProjectionBaseAnalysis")==0) return L2ProjectionBaseAnalysisEnum;
    291312              else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
    292               else if (strcmp(name,"BedSlopeXAnalysis")==0) return BedSlopeXAnalysisEnum;
    293               else if (strcmp(name,"BedSlopeYAnalysis")==0) return BedSlopeYAnalysisEnum;
     313              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
     314              else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
    294315              else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
    295316              else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
    … …  
    297318              else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;
    298319              else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
    299               else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum;
    300320              else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum;
    301321              else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
    … …  
    309329              else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
    310330              else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
     331              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
     332              else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
    311333              else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
    312               else if (strcmp(name,"SurfaceSlopeAnalysis")==0) return SurfaceSlopeAnalysisEnum;
     334              else if (strcmp(name,"L2ProjectionTopAnalysis")==0) return L2ProjectionTopAnalysisEnum;
    313335              else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
    314               else if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum;
    315               else if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum;
    316336              else if (strcmp(name,"SmoothedSurfaceSlopeXAnalysis")==0) return SmoothedSurfaceSlopeXAnalysisEnum;
    317337              else if (strcmp(name,"SmoothedSurfaceSlopeYAnalysis")==0) return SmoothedSurfaceSlopeYAnalysisEnum;
    … …  
    321341              else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
    322342              else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
     343              else if (strcmp(name,"MeshdeformationSolution")==0) return MeshdeformationSolutionEnum;
     344              else if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
    323345              else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
    324346              else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
    … …  
    348370              else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
    349371              else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
    350               else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
    351372              else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
    352373              else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum;
    … …  
    356377              else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
    357378              else if (strcmp(name,"Element")==0) return ElementEnum;
    358               else if (strcmp(name,"ElementResult")==0) return ElementResultEnum;
    359379              else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
    360380              else if (strcmp(name,"FileParam")==0) return FileParamEnum;
    361               else if (strcmp(name,"Hook")==0) return HookEnum;
    362               else if (strcmp(name,"Icefront")==0) return IcefrontEnum;
    363381              else if (strcmp(name,"Input")==0) return InputEnum;
    364382              else if (strcmp(name,"IntInput")==0) return IntInputEnum;
    365               else if (strcmp(name,"IntParam")==0) return IntParamEnum;
     383              else if (strcmp(name,"InputToExtrude")==0) return InputToExtrudeEnum;
     384              else if (strcmp(name,"InputToL2Project")==0) return InputToL2ProjectEnum;
     385         else stage=4;
     386   }
     387   if(stage==4){
     388              if (strcmp(name,"IntParam")==0) return IntParamEnum;
    366389              else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
    367390              else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
    368               else if (strcmp(name,"IceFrontType")==0) return IceFrontTypeEnum;
    369               else if (strcmp(name,"SSA2dIceFront")==0) return SSA2dIceFrontEnum;
    370               else if (strcmp(name,"SSA3dIceFront")==0) return SSA3dIceFrontEnum;
    371391              else if (strcmp(name,"Matice")==0) return MaticeEnum;
    372               else if (strcmp(name,"Matdamageice")==0) return MatdamageiceEnum;
    373392              else if (strcmp(name,"Matpar")==0) return MatparEnum;
    374393              else if (strcmp(name,"Node")==0) return NodeEnum;
    … …  
    376395              else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum;
    377396              else if (strcmp(name,"Param")==0) return ParamEnum;
    378               else if (strcmp(name,"L1L2IceFront")==0) return L1L2IceFrontEnum;
    379               else if (strcmp(name,"HOIceFront")==0) return HOIceFrontEnum;
    380397              else if (strcmp(name,"Pengrid")==0) return PengridEnum;
    381398              else if (strcmp(name,"Penpair")==0) return PenpairEnum;
    … …  
    383400              else if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
    384401              else if (strcmp(name,"Profiler")==0) return ProfilerEnum;
    385          else stage=4;
    386    }
    387    if(stage==4){
    388               if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
     402              else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
    389403              else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
    390404              else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
    … …  
    396410              else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
    397411              else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
    398               else if (strcmp(name,"FSIceFront")==0) return FSIceFrontEnum;
    399412              else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
    400413              else if (strcmp(name,"StringParam")==0) return StringParamEnum;
     414              else if (strcmp(name,"Seg")==0) return SegEnum;
     415              else if (strcmp(name,"SegInput")==0) return SegInputEnum;
    401416              else if (strcmp(name,"Tria")==0) return TriaEnum;
    402417              else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
    … …  
    419434              else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum;
    420435              else if (strcmp(name,"Boundary")==0) return BoundaryEnum;
    421               else if (strcmp(name,"Constant")==0) return ConstantEnum;
    422436              else if (strcmp(name,"Converged")==0) return ConvergedEnum;
    423437              else if (strcmp(name,"Fill")==0) return FillEnum;
    … …  
    427441              else if (strcmp(name,"Internal")==0) return InternalEnum;
    428442              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
    429               else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;
    430443              else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
    431444              else if (strcmp(name,"Misfit")==0) return MisfitEnum;
    432               else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum;
    433445              else if (strcmp(name,"Pressure")==0) return PressureEnum;
    434446              else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
    … …  
    456468              else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
    457469              else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
    458               else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum;
    459470              else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
    460471              else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
    … …  
    480491              else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
    481492              else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
    482               else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
    483493              else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
    484494              else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
    … …  
    496506              else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
    497507              else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
    498               else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
     508         else stage=5;
     509   }
     510   if(stage==5){
     511              if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
    499512              else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
    500513              else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
    … …  
    506519              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
    507520              else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
    508          else stage=5;
    509    }
    510    if(stage==5){
    511               if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
     521              else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
    512522              else if (strcmp(name,"P2")==0) return P2Enum;
    513523              else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
    … …  
    519529              else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
    520530              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
    521               else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
    522531              else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
    523               else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
    524532              else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
    525533              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
    526534              else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
    527535              else if (strcmp(name,"J")==0) return JEnum;
    528               else if (strcmp(name,"Patch")==0) return PatchEnum;
    529               else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum;
    530               else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
    531               else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum;
    532536              else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
    533537              else if (strcmp(name,"Step")==0) return StepEnum;
    534538              else if (strcmp(name,"Time")==0) return TimeEnum;
    535               else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum;
    536539              else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
     540              else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
     541              else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
     542              else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
     543              else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
     544              else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
    537545              else if (strcmp(name,"MinVel")==0) return MinVelEnum;
    538546              else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
    … …  
    547555              else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
    548556              else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
     557              else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
    549558              else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
    550559              else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
    … …  
    556565              else if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum;
    557566              else if (strcmp(name,"MaskGroundediceLevelset")==0) return MaskGroundediceLevelsetEnum;
     567              else if (strcmp(name,"QmuMaskGroundediceLevelset")==0) return QmuMaskGroundediceLevelsetEnum;
    558568              else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
    559569              else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
    … …  
    592602              else if (strcmp(name,"Dense")==0) return DenseEnum;
    593603              else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
     604              else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
    594605              else if (strcmp(name,"Seq")==0) return SeqEnum;
    595606              else if (strcmp(name,"Mpi")==0) return MpiEnum;
     607              else if (strcmp(name,"Mumps")==0) return MumpsEnum;
     608              else if (strcmp(name,"Gsl")==0) return GslEnum;
    596609              else if (strcmp(name,"Option")==0) return OptionEnum;
    597610              else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
    598611              else if (strcmp(name,"OptionCell")==0) return OptionCellEnum;
    599               else if (strcmp(name,"OptionChar")==0) return OptionCharEnum;
    600612              else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
    601               else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum;
    602               else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum;
    603613              else if (strcmp(name,"Paterson")==0) return PatersonEnum;
    604614              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
    … …  
    608618   }
    609619        /*If we reach this point, the string provided has not been found*/
    610         _error_("Enum " << name << " not found");
     620        if(notfounderror)
     621                _error_("Enum " << name << " not found");
     622        else
     623                return -1;
    611624}
Note: See TracChangeset for help on using the changeset viewer.