Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23060) +++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23061) @@ -469,6 +469,7 @@ GeometryHydrostaticRatioEnum, GiaLithosphereThicknessEnum, GiaMantleViscosityEnum, + GiadWdtEnum, GiaWEnum, GradientEnum, GroundinglineHeightEnum, @@ -779,7 +780,6 @@ GenericOptionEnum, GenericParamEnum, GLheightadvectionAnalysisEnum, - GiadWdtEnum, GiaIvinsAnalysisEnum, GiaSolutionEnum, Gradient1Enum, Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23060) +++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23061) @@ -475,6 +475,7 @@ case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio"; case GiaLithosphereThicknessEnum : return "GiaLithosphereThickness"; case GiaMantleViscosityEnum : return "GiaMantleViscosity"; + case GiadWdtEnum : return "GiadWdt"; case GiaWEnum : return "GiaW"; case GradientEnum : return "Gradient"; case GroundinglineHeightEnum : return "GroundinglineHeight"; @@ -783,7 +784,6 @@ case GenericOptionEnum : return "GenericOption"; case GenericParamEnum : return "GenericParam"; case GLheightadvectionAnalysisEnum : return "GLheightadvectionAnalysis"; - case GiadWdtEnum : return "GiadWdt"; case GiaIvinsAnalysisEnum : return "GiaIvinsAnalysis"; case GiaSolutionEnum : return "GiaSolution"; case Gradient1Enum : return "Gradient1"; Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23060) +++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23061) @@ -484,6 +484,7 @@ else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum; else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum; else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum; + else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; else if (strcmp(name,"GiaW")==0) return GiaWEnum; else if (strcmp(name,"Gradient")==0) return GradientEnum; else if (strcmp(name,"GroundinglineHeight")==0) return GroundinglineHeightEnum; @@ -504,11 +505,11 @@ else if (strcmp(name,"HydrologyMoulinInput")==0) return HydrologyMoulinInputEnum; else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum; else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum; - else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; + if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; + else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum; else if (strcmp(name,"Ice")==0) return IceEnum; else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum; @@ -627,11 +628,11 @@ else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum; else if (strcmp(name,"StrainRatexz")==0) return StrainRatexzEnum; else if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum; - else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum; + if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum; + else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum; else if (strcmp(name,"StressMaxPrincipal")==0) return StressMaxPrincipalEnum; else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum; else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; @@ -750,11 +751,11 @@ else if (strcmp(name,"Domain3Dsurface")==0) return Domain3DsurfaceEnum; else if (strcmp(name,"DoubleArrayInput")==0) return DoubleArrayInputEnum; else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum; - else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum; + if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum; + else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum; else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum; else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum; @@ -801,7 +802,6 @@ else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum; else if (strcmp(name,"GenericParam")==0) return GenericParamEnum; else if (strcmp(name,"GLheightadvectionAnalysis")==0) return GLheightadvectionAnalysisEnum; - else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; else if (strcmp(name,"GiaIvinsAnalysis")==0) return GiaIvinsAnalysisEnum; else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum; else if (strcmp(name,"Gradient1")==0) return Gradient1Enum;