Skip to content

Commit 9849a0d

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
Set HIP-RA-X default values correctly
1 parent b433a62 commit 9849a0d

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎src/geophires_x_schema_generator/hip-ra-x-request.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"type": "number",
2222
"units": "degC",
2323
"category": null,
24-
"default": 0.0,
24+
"default": 150.0,
2525
"minimum": 50,
2626
"maximum": 1000
2727
},
@@ -30,7 +30,7 @@
3030
"type": "number",
3131
"units": "degC",
3232
"category": null,
33-
"default": 0.0,
33+
"default": 25.0,
3434
"minimum": 0.1,
3535
"maximum": 200
3636
},
@@ -39,7 +39,7 @@
3939
"type": "number",
4040
"units": "%",
4141
"category": null,
42-
"default": 0.0,
42+
"default": 18.0,
4343
"minimum": 0.0,
4444
"maximum": 100.0
4545
},
@@ -48,7 +48,7 @@
4848
"type": "number",
4949
"units": "km**2",
5050
"category": null,
51-
"default": 0.0,
51+
"default": 81.0,
5252
"minimum": 0.0,
5353
"maximum": 10000.0
5454
},
@@ -57,7 +57,7 @@
5757
"type": "number",
5858
"units": "kilometer",
5959
"category": null,
60-
"default": 0.0,
60+
"default": 0.286,
6161
"minimum": 0.0,
6262
"maximum": 10000.0
6363
},
@@ -66,7 +66,7 @@
6666
"type": "integer",
6767
"units": "yr",
6868
"category": null,
69-
"default": null,
69+
"default": 30,
7070
"minimum": 1,
7171
"maximum": 100
7272
},
@@ -75,7 +75,7 @@
7575
"type": "number",
7676
"units": "kJ/km**3C",
7777
"category": null,
78-
"default": 0.0,
78+
"default": 2840000000000.0,
7979
"minimum": 0.0,
8080
"maximum": 100000000000000.0
8181
},
@@ -84,7 +84,7 @@
8484
"type": "number",
8585
"units": "kJ/kgC",
8686
"category": null,
87-
"default": 0.0,
87+
"default": -1.0,
8888
"minimum": 3.0,
8989
"maximum": 10.0
9090
},
@@ -93,7 +93,7 @@
9393
"type": "number",
9494
"units": "kg/km**3",
9595
"category": null,
96-
"default": 0.0,
96+
"default": -1.0,
9797
"minimum": 100000000000.0,
9898
"maximum": 10000000000000.0
9999
},
@@ -102,7 +102,7 @@
102102
"type": "number",
103103
"units": "kg/km**3",
104104
"category": null,
105-
"default": 0.0,
105+
"default": 2550000000000.0,
106106
"minimum": 100000000000.0,
107107
"maximum": 10000000000000.0
108108
},
@@ -111,7 +111,7 @@
111111
"type": "number",
112112
"units": "",
113113
"category": null,
114-
"default": 0.0,
114+
"default": -1.0,
115115
"minimum": 0.0,
116116
"maximum": 1.0
117117
},
@@ -120,7 +120,7 @@
120120
"type": "number",
121121
"units": "",
122122
"category": null,
123-
"default": 0.0,
123+
"default": -1.0,
124124
"minimum": 0.0,
125125
"maximum": 1.0
126126
},
@@ -129,7 +129,7 @@
129129
"type": "number",
130130
"units": "",
131131
"category": null,
132-
"default": 0.0,
132+
"default": 0.5,
133133
"minimum": 0.0,
134134
"maximum": 1.0
135135
},
@@ -138,7 +138,7 @@
138138
"type": "number",
139139
"units": "kilometer",
140140
"category": null,
141-
"default": 0.0,
141+
"default": -1.0,
142142
"minimum": 0.001,
143143
"maximum": 15.0
144144
},
@@ -147,7 +147,7 @@
147147
"type": "number",
148148
"units": "mPa",
149149
"category": null,
150-
"default": 0.0,
150+
"default": -1.0,
151151
"minimum": 0.0,
152152
"maximum": 10000.0
153153
},
@@ -156,7 +156,7 @@
156156
"type": "number",
157157
"units": "",
158158
"category": null,
159-
"default": 0.0,
159+
"default": 0.75,
160160
"minimum": 0.0,
161161
"maximum": 1.0
162162
},
@@ -165,7 +165,7 @@
165165
"type": "string",
166166
"units": null,
167167
"category": null,
168-
"default": null,
168+
"default": "HIP.html",
169169
"minimum": null,
170170
"maximum": null
171171
}

‎src/hip_ra_x/hip_ra_x.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
112112
self.reservoir_temperature: Parameter = parameter_dict_entry(
113113
floatParameter(
114114
'Reservoir Temperature',
115-
value=150.0,
115+
DefaultValue=150.0,
116116
Min=50,
117117
Max=1000,
118118
UnitType=Units.TEMPERATURE,
@@ -126,7 +126,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
126126
self.rejection_temperature: Parameter = parameter_dict_entry(
127127
floatParameter(
128128
'Rejection Temperature',
129-
value=25.0,
129+
DefaultValue=25.0,
130130
Min=0.1,
131131
Max=200,
132132
UnitType=Units.TEMPERATURE,
@@ -140,7 +140,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
140140
self.reservoir_porosity: Parameter = parameter_dict_entry(
141141
floatParameter(
142142
'Reservoir Porosity',
143-
value=18.0,
143+
DefaultValue=18.0,
144144
Min=0.0,
145145
Max=100.0,
146146
UnitType=Units.PERCENT,
@@ -154,7 +154,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
154154
self.reservoir_area: Parameter = parameter_dict_entry(
155155
floatParameter(
156156
'Reservoir Area',
157-
value=81.0,
157+
DefaultValue=81.0,
158158
Min=0.0,
159159
Max=10000.0,
160160
UnitType=Units.AREA,
@@ -168,7 +168,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
168168
self.reservoir_thickness: Parameter = parameter_dict_entry(
169169
floatParameter(
170170
'Reservoir Thickness',
171-
value=0.286,
171+
DefaultValue=0.286,
172172
Min=0.0,
173173
Max=10000.0,
174174
UnitType=Units.LENGTH,
@@ -182,7 +182,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
182182
self.reservoir_life_cycle: Parameter = parameter_dict_entry(
183183
intParameter(
184184
'Reservoir Life Cycle',
185-
value=30,
185+
DefaultValue=30,
186186
UnitType=Units.TIME,
187187
PreferredUnits=TimeUnit.YEAR,
188188
CurrentUnits=TimeUnit.YEAR,
@@ -197,7 +197,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
197197
self.rock_heat_capacity: Parameter = parameter_dict_entry(
198198
floatParameter(
199199
'Rock Heat Capacity',
200-
value=2.84e12,
200+
DefaultValue=2.84e12,
201201
Min=0.0,
202202
Max=1e14,
203203
UnitType=Units.HEAT_CAPACITY,
@@ -211,7 +211,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
211211
self.fluid_heat_capacity: Parameter = parameter_dict_entry(
212212
floatParameter(
213213
'Fluid Specific Heat Capacity',
214-
value=-1.0,
214+
DefaultValue=-1.0,
215215
Min=3.0,
216216
Max=10.0,
217217
UnitType=Units.HEAT_CAPACITY,
@@ -225,7 +225,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
225225
self.fluid_density: Parameter = parameter_dict_entry(
226226
floatParameter(
227227
'Density Of Reservoir Fluid',
228-
value=-1.0,
228+
DefaultValue=-1.0,
229229
Min=1.000e11,
230230
Max=1.000e13,
231231
UnitType=Units.DENSITY,
@@ -239,7 +239,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
239239
self.rock_density: Parameter = parameter_dict_entry(
240240
floatParameter(
241241
'Density Of Reservoir Rock',
242-
value=2.55e12,
242+
DefaultValue=2.55e12,
243243
Min=1.000e11,
244244
Max=1.000e13,
245245
UnitType=Units.DENSITY,
@@ -253,7 +253,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
253253
self.rock_recoverable_heat: Parameter = parameter_dict_entry(
254254
floatParameter(
255255
'Rock Recoverable Heat',
256-
value=-1.0,
256+
DefaultValue=-1.0,
257257
Min=0.0,
258258
Max=1.000,
259259
UnitType=Units.PERCENT,
@@ -269,7 +269,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
269269
self.fluid_recoverable_heat: Parameter = parameter_dict_entry(
270270
floatParameter(
271271
'Fluid Recoverable Heat',
272-
value=-1.0,
272+
DefaultValue=-1.0,
273273
Min=0.00,
274274
Max=1.000,
275275
UnitType=Units.PERCENT,
@@ -285,7 +285,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
285285
self.recoverable_fluid_factor: Parameter = parameter_dict_entry(
286286
floatParameter(
287287
'Recoverable Fluid Factor',
288-
value=0.5,
288+
DefaultValue=0.5,
289289
Min=0.00,
290290
Max=1.000,
291291
UnitType=Units.PERCENT,
@@ -299,7 +299,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
299299
self.reservoir_depth: Parameter = parameter_dict_entry(
300300
floatParameter(
301301
'Reservoir Depth',
302-
value=-1.0,
302+
DefaultValue=-1.0,
303303
Min=0.001,
304304
Max=15.0,
305305
UnitType=Units.LENGTH,
@@ -315,7 +315,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
315315
self.reservoir_pressure: Parameter = parameter_dict_entry(
316316
floatParameter(
317317
'Reservoir Pressure',
318-
value=-1.0,
318+
DefaultValue=-1.0,
319319
Min=0.00,
320320
Max=10000.000,
321321
UnitType=Units.PRESSURE,
@@ -331,7 +331,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
331331
self.recoverable_rock_heat: Parameter = parameter_dict_entry(
332332
floatParameter(
333333
'Recoverable Heat from Rock',
334-
value=0.75,
334+
DefaultValue=0.75,
335335
Min=0.00,
336336
Max=1.000,
337337
UnitType=Units.PERCENT,
@@ -345,7 +345,7 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
345345
self.html_output_file: Parameter = parameter_dict_entry(
346346
strParameter(
347347
'HTML Output File',
348-
value='HIP.html',
348+
DefaultValue='HIP.html',
349349
Required=False,
350350
Provided=False,
351351
ErrMessage='assume no HTML output',

0 commit comments

Comments
 (0)