source: issm/oecreview/Archive/22819-23185/ISSM-23060-23061.diff@ 23186

Last change on this file since 23186 was 23186, checked in by Mathieu Morlighem, 7 years ago

CHG: added Archive/22819-23185
File size: 5.5 KB
RevLine 
[23186]1Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
2===================================================================
3--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23060)
4+++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23061)
5@@ -469,6 +469,7 @@
6 GeometryHydrostaticRatioEnum,
7 GiaLithosphereThicknessEnum,
8 GiaMantleViscosityEnum,
9+ GiadWdtEnum,
10 GiaWEnum,
11 GradientEnum,
12 GroundinglineHeightEnum,
13@@ -779,7 +780,6 @@
14 GenericOptionEnum,
15 GenericParamEnum,
16 GLheightadvectionAnalysisEnum,
17- GiadWdtEnum,
18 GiaIvinsAnalysisEnum,
19 GiaSolutionEnum,
20 Gradient1Enum,
21Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
22===================================================================
23--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23060)
24+++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23061)
25@@ -475,6 +475,7 @@
26 case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
27 case GiaLithosphereThicknessEnum : return "GiaLithosphereThickness";
28 case GiaMantleViscosityEnum : return "GiaMantleViscosity";
29+ case GiadWdtEnum : return "GiadWdt";
30 case GiaWEnum : return "GiaW";
31 case GradientEnum : return "Gradient";
32 case GroundinglineHeightEnum : return "GroundinglineHeight";
33@@ -783,7 +784,6 @@
34 case GenericOptionEnum : return "GenericOption";
35 case GenericParamEnum : return "GenericParam";
36 case GLheightadvectionAnalysisEnum : return "GLheightadvectionAnalysis";
37- case GiadWdtEnum : return "GiadWdt";
38 case GiaIvinsAnalysisEnum : return "GiaIvinsAnalysis";
39 case GiaSolutionEnum : return "GiaSolution";
40 case Gradient1Enum : return "Gradient1";
41Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
42===================================================================
43--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23060)
44+++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23061)
45@@ -484,6 +484,7 @@
46 else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
47 else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
48 else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum;
49+ else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
50 else if (strcmp(name,"GiaW")==0) return GiaWEnum;
51 else if (strcmp(name,"Gradient")==0) return GradientEnum;
52 else if (strcmp(name,"GroundinglineHeight")==0) return GroundinglineHeightEnum;
53@@ -504,11 +505,11 @@
54 else if (strcmp(name,"HydrologyMoulinInput")==0) return HydrologyMoulinInputEnum;
55 else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum;
56 else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum;
57- else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
58 else stage=5;
59 }
60 if(stage==5){
61- if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
62+ if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
63+ else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
64 else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
65 else if (strcmp(name,"Ice")==0) return IceEnum;
66 else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
67@@ -627,11 +628,11 @@
68 else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum;
69 else if (strcmp(name,"StrainRatexz")==0) return StrainRatexzEnum;
70 else if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum;
71- else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
72 else stage=6;
73 }
74 if(stage==6){
75- if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
76+ if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
77+ else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
78 else if (strcmp(name,"StressMaxPrincipal")==0) return StressMaxPrincipalEnum;
79 else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
80 else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
81@@ -750,11 +751,11 @@
82 else if (strcmp(name,"Domain3Dsurface")==0) return Domain3DsurfaceEnum;
83 else if (strcmp(name,"DoubleArrayInput")==0) return DoubleArrayInputEnum;
84 else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
85- else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
86 else stage=7;
87 }
88 if(stage==7){
89- if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
90+ if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
91+ else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
92 else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
93 else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
94 else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
95@@ -801,7 +802,6 @@
96 else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
97 else if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
98 else if (strcmp(name,"GLheightadvectionAnalysis")==0) return GLheightadvectionAnalysisEnum;
99- else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
100 else if (strcmp(name,"GiaIvinsAnalysis")==0) return GiaIvinsAnalysisEnum;
101 else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
102 else if (strcmp(name,"Gradient1")==0) return Gradient1Enum;
Note: See TracBrowser for help on using the repository browser.