source: issm/oecreview/Archive/27230-27343/ISSM-27283-27284.diff@ 27344

Last change on this file since 27344 was 27344, checked in by Mathieu Morlighem, 2 years ago

CHG: added Archive/27230-27343
File size: 14.0 KB
RevLine 
[27344]1Index: ../trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 27283)
4+++ ../trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 27284)
5@@ -134,7 +134,7 @@
6 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
7 }
8 else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
9- iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
10+ iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
11 }
12 break;
13 default:
14Index: ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp
15===================================================================
16--- ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 27283)
17+++ ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 27284)
18@@ -224,7 +224,7 @@
19 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
20 }
21 else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
22- iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
23+ iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
24 }
25 break;
26 case LinearFloatingMeltRatearmaEnum:
27Index: ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp
28===================================================================
29--- ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 27283)
30+++ ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 27284)
31@@ -862,7 +862,7 @@
32 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
33 }
34 else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
35- iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
36+ iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
37 }
38 break;
39 default:
40Index: ../trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp
41===================================================================
42--- ../trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 27283)
43+++ ../trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 27284)
44@@ -164,7 +164,7 @@
45 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
46 }
47 else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
48- iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
49+ iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
50 }
51 break;
52 default:
53Index: ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp
54===================================================================
55--- ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 27283)
56+++ ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 27284)
57@@ -149,7 +149,7 @@
58 break;
59 case FrontalForcingsRignotEnum:
60 /*Retrieve thermal forcing only in the case of non-arma FrontalForcingsRignot*/
61- iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
62+ iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.thermalforcing",ThermalForcingEnum);
63 /* Do not break here, still retrieve basin_ID,subglacial_discharge, etc.*/
64 case FrontalForcingsRignotarmaEnum:
65 iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.basin_id",FrontalForcingsBasinIdEnum);
66Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp
67===================================================================
68--- ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 27283)
69+++ ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 27284)
70@@ -85,7 +85,7 @@
71 maenum_type = ThermalforcingValuesMovingaverageEnum;
72 basinenum_type = FrontalForcingsBasinIdEnum;
73 noiseenum_type = ThermalforcingARMANoiseEnum;
74- outenum_type = FrontalForcingsAndBasalforcingsThermalForcingEnum;
75+ outenum_type = ThermalForcingEnum;
76 break;
77 case(BasalforcingsDeepwaterMeltingRatearmaEnum):
78 arenum_type = BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum;
79@@ -194,7 +194,7 @@
80 arenum_type = ThermalforcingValuesAutoregressionEnum;
81 basinenum_type = FrontalForcingsBasinIdEnum;
82 noiseenum_type = ThermalforcingARMANoiseEnum;
83- outenum_type = FrontalForcingsAndBasalforcingsThermalForcingEnum;
84+ outenum_type = ThermalForcingEnum;
85 break;
86 case(BasalforcingsDeepwaterMeltingRatearmaEnum):
87 arenum_type = BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum;
88@@ -2804,7 +2804,7 @@
89 this->GetInputListOnVertices(oceantemp,BasalforcingsOceanTempEnum);
90 }
91 else{
92- this->GetInputListOnVertices(oceanthermalforcing,FrontalForcingsAndBasalforcingsThermalForcingEnum);
93+ this->GetInputListOnVertices(oceanthermalforcing,ThermalForcingEnum);
94 }
95
96 Gauss* gauss=this->NewGauss();
97@@ -3813,7 +3813,7 @@
98 this->GetInputValue(&basinid,FrontalForcingsBasinIdEnum);
99 Input* bed_input = this->GetInput(BedEnum); _assert_(bed_input);
100 Input* qsg_input = this->GetInput(FrontalForcingsSubglacialDischargeEnum); _assert_(qsg_input);
101- Input* TF_input = this->GetInput(FrontalForcingsAndBasalforcingsThermalForcingEnum); _assert_(TF_input);
102+ Input* TF_input = this->GetInput(ThermalForcingEnum); _assert_(TF_input);
103
104 this->FindParam(&yts, ConstantsYtsEnum);
105 this->parameters->FindParam(&numbasins,FrontalForcingsNumberofBasinsEnum);
106Index: ../trunk-jpl/src/c/shared/Enum/Enum.vim
107===================================================================
108--- ../trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27283)
109+++ ../trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27284)
110@@ -775,7 +775,6 @@
111 syn keyword cConstant FrictionfEnum
112 syn keyword cConstant FrontalForcingsBasinIdEnum
113 syn keyword cConstant FrontalForcingsSubglacialDischargeEnum
114-syn keyword cConstant FrontalForcingsAndBasalforcingsThermalForcingEnum
115 syn keyword cConstant GeometryHydrostaticRatioEnum
116 syn keyword cConstant NGiaEnum
117 syn keyword cConstant NGiaRateEnum
118@@ -1105,6 +1104,7 @@
119 syn keyword cConstant TemperaturePicardEnum
120 syn keyword cConstant TemperatureSEMICEnum
121 syn keyword cConstant ThermalforcingARMANoiseEnum
122+syn keyword cConstant ThermalForcingEnum
123 syn keyword cConstant ThermalforcingValuesAutoregressionEnum
124 syn keyword cConstant ThermalforcingValuesMovingaverageEnum
125 syn keyword cConstant ThermalSpctemperatureEnum
126Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
127===================================================================
128--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27283)
129+++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27284)
130@@ -771,7 +771,6 @@
131 FrictionfEnum,
132 FrontalForcingsBasinIdEnum,
133 FrontalForcingsSubglacialDischargeEnum,
134- FrontalForcingsAndBasalforcingsThermalForcingEnum,
135 GeometryHydrostaticRatioEnum,
136 NGiaEnum,
137 NGiaRateEnum,
138@@ -1102,6 +1101,7 @@
139 TemperaturePicardEnum,
140 TemperatureSEMICEnum,
141 ThermalforcingARMANoiseEnum,
142+ ThermalForcingEnum,
143 ThermalforcingValuesAutoregressionEnum,
144 ThermalforcingValuesMovingaverageEnum,
145 ThermalSpctemperatureEnum,
146Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
147===================================================================
148--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27283)
149+++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27284)
150@@ -777,7 +777,6 @@
151 case FrictionfEnum : return "Frictionf";
152 case FrontalForcingsBasinIdEnum : return "FrontalForcingsBasinId";
153 case FrontalForcingsSubglacialDischargeEnum : return "FrontalForcingsSubglacialDischarge";
154- case FrontalForcingsAndBasalforcingsThermalForcingEnum : return "FrontalForcingsAndBasalforcingsThermalForcing";
155 case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
156 case NGiaEnum : return "NGia";
157 case NGiaRateEnum : return "NGiaRate";
158@@ -1107,6 +1106,7 @@
159 case TemperaturePicardEnum : return "TemperaturePicard";
160 case TemperatureSEMICEnum : return "TemperatureSEMIC";
161 case ThermalforcingARMANoiseEnum : return "ThermalforcingARMANoise";
162+ case ThermalForcingEnum : return "ThermalForcing";
163 case ThermalforcingValuesAutoregressionEnum : return "ThermalforcingValuesAutoregression";
164 case ThermalforcingValuesMovingaverageEnum : return "ThermalforcingValuesMovingaverage";
165 case ThermalSpctemperatureEnum : return "ThermalSpctemperature";
166Index: ../trunk-jpl/src/c/shared/Enum/Enumjl.vim
167===================================================================
168--- ../trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27283)
169+++ ../trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27284)
170@@ -768,7 +768,6 @@
171 syn keyword juliaConstC FrictionfEnum
172 syn keyword juliaConstC FrontalForcingsBasinIdEnum
173 syn keyword juliaConstC FrontalForcingsSubglacialDischargeEnum
174-syn keyword juliaConstC FrontalForcingsAndBasalforcingsThermalForcingEnum
175 syn keyword juliaConstC GeometryHydrostaticRatioEnum
176 syn keyword juliaConstC NGiaEnum
177 syn keyword juliaConstC NGiaRateEnum
178@@ -1098,6 +1097,7 @@
179 syn keyword juliaConstC TemperaturePicardEnum
180 syn keyword juliaConstC TemperatureSEMICEnum
181 syn keyword juliaConstC ThermalforcingARMANoiseEnum
182+syn keyword juliaConstC ThermalForcingEnum
183 syn keyword juliaConstC ThermalforcingValuesAutoregressionEnum
184 syn keyword juliaConstC ThermalforcingValuesMovingaverageEnum
185 syn keyword juliaConstC ThermalSpctemperatureEnum
186Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
187===================================================================
188--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27283)
189+++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27284)
190@@ -795,7 +795,6 @@
191 else if (strcmp(name,"Frictionf")==0) return FrictionfEnum;
192 else if (strcmp(name,"FrontalForcingsBasinId")==0) return FrontalForcingsBasinIdEnum;
193 else if (strcmp(name,"FrontalForcingsSubglacialDischarge")==0) return FrontalForcingsSubglacialDischargeEnum;
194- else if (strcmp(name,"FrontalForcingsAndBasalforcingsThermalForcing")==0) return FrontalForcingsAndBasalforcingsThermalForcingEnum;
195 else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
196 else if (strcmp(name,"NGia")==0) return NGiaEnum;
197 else if (strcmp(name,"NGiaRate")==0) return NGiaRateEnum;
198@@ -874,11 +873,11 @@
199 else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
200 else if (strcmp(name,"Misfit")==0) return MisfitEnum;
201 else if (strcmp(name,"MovingFrontalVx")==0) return MovingFrontalVxEnum;
202+ else if (strcmp(name,"MovingFrontalVy")==0) return MovingFrontalVyEnum;
203 else stage=8;
204 }
205 if(stage==8){
206- if (strcmp(name,"MovingFrontalVy")==0) return MovingFrontalVyEnum;
207- else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
208+ if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
209 else if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
210 else if (strcmp(name,"Node")==0) return NodeEnum;
211 else if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum;
212@@ -997,11 +996,11 @@
213 else if (strcmp(name,"SmbCcsnowValue")==0) return SmbCcsnowValueEnum;
214 else if (strcmp(name,"SmbCciceValue")==0) return SmbCciceValueEnum;
215 else if (strcmp(name,"SmbCotValue")==0) return SmbCotValueEnum;
216+ else if (strcmp(name,"SmbD")==0) return SmbDEnum;
217 else stage=9;
218 }
219 if(stage==9){
220- if (strcmp(name,"SmbD")==0) return SmbDEnum;
221- else if (strcmp(name,"SmbDailyairdensity")==0) return SmbDailyairdensityEnum;
222+ if (strcmp(name,"SmbDailyairdensity")==0) return SmbDailyairdensityEnum;
223 else if (strcmp(name,"SmbDailyairhumidity")==0) return SmbDailyairhumidityEnum;
224 else if (strcmp(name,"SmbDailydlradiation")==0) return SmbDailydlradiationEnum;
225 else if (strcmp(name,"SmbDailydsradiation")==0) return SmbDailydsradiationEnum;
226@@ -1120,11 +1119,11 @@
227 else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum;
228 else if (strcmp(name,"Surface")==0) return SurfaceEnum;
229 else if (strcmp(name,"SurfaceOld")==0) return SurfaceOldEnum;
230+ else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
231 else stage=10;
232 }
233 if(stage==10){
234- if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
235- else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
236+ if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
237 else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
238 else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
239 else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
240@@ -1134,6 +1133,7 @@
241 else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
242 else if (strcmp(name,"TemperatureSEMIC")==0) return TemperatureSEMICEnum;
243 else if (strcmp(name,"ThermalforcingARMANoise")==0) return ThermalforcingARMANoiseEnum;
244+ else if (strcmp(name,"ThermalForcing")==0) return ThermalForcingEnum;
245 else if (strcmp(name,"ThermalforcingValuesAutoregression")==0) return ThermalforcingValuesAutoregressionEnum;
246 else if (strcmp(name,"ThermalforcingValuesMovingaverage")==0) return ThermalforcingValuesMovingaverageEnum;
247 else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
Note: See TracBrowser for help on using the repository browser.