source: issm/oecreview/Archive/17802-17983/ISSM-17909-17910.diff

Last change on this file was 17986, checked in by Mathieu Morlighem, 11 years ago

New release
File size: 9.8 KB
RevLine 
[17986]1Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
2===================================================================
3--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17909)
4+++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17910)
5@@ -140,6 +140,8 @@
6 InversionMaxiterPerStepEnum,
7 InversionMinParametersEnum,
8 InversionNstepsEnum,
9+ InversionDxminEnum,
10+ InversionEpsrelEnum,
11 InversionNumControlParametersEnum,
12 InversionNumCostFunctionsEnum,
13 InversionStepThresholdEnum,
14Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
15===================================================================
16--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17909)
17+++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17910)
18@@ -148,6 +148,8 @@
19 case InversionMaxiterPerStepEnum : return "InversionMaxiterPerStep";
20 case InversionMinParametersEnum : return "InversionMinParameters";
21 case InversionNstepsEnum : return "InversionNsteps";
22+ case InversionDxminEnum : return "InversionDxmin";
23+ case InversionEpsrelEnum : return "InversionEpsrel";
24 case InversionNumControlParametersEnum : return "InversionNumControlParameters";
25 case InversionNumCostFunctionsEnum : return "InversionNumCostFunctions";
26 case InversionStepThresholdEnum : return "InversionStepThreshold";
27Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
28===================================================================
29--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17909)
30+++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17910)
31@@ -151,6 +151,8 @@
32 else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
33 else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
34 else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
35+ else if (strcmp(name,"InversionDxmin")==0) return InversionDxminEnum;
36+ else if (strcmp(name,"InversionEpsrel")==0) return InversionEpsrelEnum;
37 else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum;
38 else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum;
39 else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum;
40@@ -257,12 +259,12 @@
41 else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
42 else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;
43 else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
44- else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
45- else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
46 else stage=3;
47 }
48 if(stage==3){
49- if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
50+ if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
51+ else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
52+ else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
53 else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
54 else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
55 else if (strcmp(name,"Surface")==0) return SurfaceEnum;
56@@ -380,12 +382,12 @@
57 else if (strcmp(name,"LsfReinitializationAnalysis")==0) return LsfReinitializationAnalysisEnum;
58 else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
59 else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
60- else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
61- else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
62 else stage=4;
63 }
64 if(stage==4){
65- if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
66+ if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
67+ else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
68+ else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
69 else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
70 else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
71 else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
72@@ -503,12 +505,12 @@
73 else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
74 else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
75 else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
76- else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
77- else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
78 else stage=5;
79 }
80 if(stage==5){
81- if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
82+ if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
83+ else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
84+ else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
85 else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
86 else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
87 else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
88@@ -626,12 +628,12 @@
89 else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
90 else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
91 else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
92- else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
93- else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
94 else stage=6;
95 }
96 if(stage==6){
97- if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
98+ if (strcmp(name,"Incremental")==0) return IncrementalEnum;
99+ else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
100+ else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
101 else if (strcmp(name,"None")==0) return NoneEnum;
102 else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
103 else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
104Index: ../trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp
105===================================================================
106--- ../trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp (revision 17909)
107+++ ../trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp (revision 17910)
108@@ -36,43 +36,36 @@
109 if(strcmp(name,"_HAVE_MPI_")==0){
110 #ifdef _HAVE_MPI_
111 value = 1.;
112- #else
113- value = 0.;
114 #endif
115 }
116 else if(strcmp(name,"_HAVE_DAKOTA_")==0){
117 #ifdef _HAVE_DAKOTA_
118 value = 1.;
119- #else
120- value = 0.;
121 #endif
122 }
123 else if(strcmp(name,"_HAVE_MUMPS_")==0){
124 #ifdef _HAVE_MUMPS_
125 value = 1.;
126- #else
127- value = 0.;
128 #endif
129 }
130 else if(strcmp(name,"_HAVE_GSL_")==0){
131 #ifdef _HAVE_GSL_
132 value = 1.;
133- #else
134- value = 0.;
135 #endif
136 }
137 else if(strcmp(name,"_HAVE_TAO_")==0){
138 #ifdef _HAVE_TAO_
139 value = 1.;
140- #else
141- value = 0.;
142 #endif
143 }
144+ else if(strcmp(name,"_HAVE_M1QN3_")==0){
145+ #ifdef _HAVE_M1QN3_
146+ value = 1.;
147+ #endif
148+ }
149 else if(strcmp(name,"_HAVE_PETSC_")==0){
150 #ifdef _HAVE_PETSC_
151 value = 1.;
152- #else
153- value = 0.;
154 #endif
155 }
156 else if(strcmp(name,"_PETSC_MAJOR_")==0){
157Index: ../trunk-jpl/src/m/enum/InversionDxminEnum.m
158===================================================================
159--- ../trunk-jpl/src/m/enum/InversionDxminEnum.m (revision 0)
160+++ ../trunk-jpl/src/m/enum/InversionDxminEnum.m (revision 17910)
161@@ -0,0 +1,11 @@
162+function macro=InversionDxminEnum()
163+%INVERSIONDXMINENUM - Enum of InversionDxmin
164+%
165+% WARNING: DO NOT MODIFY THIS FILE
166+% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
167+% Please read src/c/shared/Enum/README for more information
168+%
169+% Usage:
170+% macro=InversionDxminEnum()
171+
172+macro=StringToEnum('InversionDxmin');
173Index: ../trunk-jpl/src/m/enum/EnumDefinitions.py
174===================================================================
175--- ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17909)
176+++ ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17910)
177@@ -140,6 +140,8 @@
178 def InversionMaxiterPerStepEnum(): return StringToEnum("InversionMaxiterPerStep")[0]
179 def InversionMinParametersEnum(): return StringToEnum("InversionMinParameters")[0]
180 def InversionNstepsEnum(): return StringToEnum("InversionNsteps")[0]
181+def InversionDxminEnum(): return StringToEnum("InversionDxmin")[0]
182+def InversionEpsrelEnum(): return StringToEnum("InversionEpsrel")[0]
183 def InversionNumControlParametersEnum(): return StringToEnum("InversionNumControlParameters")[0]
184 def InversionNumCostFunctionsEnum(): return StringToEnum("InversionNumCostFunctions")[0]
185 def InversionStepThresholdEnum(): return StringToEnum("InversionStepThreshold")[0]
186Index: ../trunk-jpl/src/m/enum/InversionEpsrelEnum.m
187===================================================================
188--- ../trunk-jpl/src/m/enum/InversionEpsrelEnum.m (revision 0)
189+++ ../trunk-jpl/src/m/enum/InversionEpsrelEnum.m (revision 17910)
190@@ -0,0 +1,11 @@
191+function macro=InversionEpsrelEnum()
192+%INVERSIONEPSRELENUM - Enum of InversionEpsrel
193+%
194+% WARNING: DO NOT MODIFY THIS FILE
195+% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
196+% Please read src/c/shared/Enum/README for more information
197+%
198+% Usage:
199+% macro=InversionEpsrelEnum()
200+
201+macro=StringToEnum('InversionEpsrel');
Note: See TracBrowser for help on using the repository browser.