Skip to content

Commit 2d87e35

Browse files
Fix Reservoir Volume Option tooltip text
1 parent fab9de0 commit 2d87e35

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

src/geophires_x/OptionList.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ def from_int(int_val):
137137

138138

139139
class ReservoirVolume(GeophiresInputEnum):
140+
"""
141+
TODO should probably be renamed to ReservoirVolumeOption
142+
"""
143+
140144
FRAC_NUM_SEP = 1, "Specify number of fractures and fracture separation"
141145
RES_VOL_FRAC_SEP = 2, "Specify reservoir volume and fracture separation"
142146
RES_VOL_FRAC_NUM = 3, "Specify reservoir volume and number of fractures"

src/geophires_x/Reservoir.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ def __init__(self, model: Model):
221221
ToolTipText="Thickness of rock segment 4"
222222
)
223223

224+
# noinspection SpellCheckingInspection
224225
self.resvoloption = self.ParameterDict[self.resvoloption.Name] = intParameter(
225226
"Reservoir Volume Option",
226227
DefaultValue=ReservoirVolume.RES_VOL_FRAC_NUM.int_value,
@@ -229,14 +230,11 @@ def __init__(self, model: Model):
229230
Required=True,
230231
UnitType=Units.NONE,
231232
ErrMessage="assume default reservoir volume option",
232-
ToolTipText=(
233-
"Specifies how the reservoir volume, and fracture distribution (for reservoir models 1 and 2) "
234-
"are calculated. The reservoir volume is used by GEOPHIRES to estimate the stored heat in place. The "
235-
"fracture distribution is needed as input for the EGS fracture-based reservoir models 1 and 2: "
236-
"Specify number of fractures and fracture separation, 2: Specify reservoir volume and fracture separation, "
237-
"3: Specify reservoir volume and number of fractures, 4: Specify reservoir volume only "
238-
"(sufficient for reservoir models 3, 4, 5 and 6)"
239-
)
233+
ToolTipText="Specifies how the reservoir volume, and fracture distribution (for reservoir models 1 and 2) "
234+
"are calculated. The reservoir volume is used by GEOPHIRES to estimate the stored "
235+
"heat in place. The fracture distribution is needed as input for the EGS fracture-based "
236+
"reservoir models 1 and 2. " +
237+
'; '.join([f'{it.int_value}: {it.name}: {it.value}' for it in ReservoirVolume])
240238
)
241239

242240
self.fracshape = self.ParameterDict[self.fracshape.Name] = intParameter(

src/geophires_x_schema_generator/geophires-request.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
"maximum": 100.0
227227
},
228228
"Reservoir Volume Option": {
229-
"description": "Specifies how the reservoir volume, and fracture distribution (for reservoir models 1 and 2) are calculated. The reservoir volume is used by GEOPHIRES to estimate the stored heat in place. The fracture distribution is needed as input for the EGS fracture-based reservoir models 1 and 2: Specify number of fractures and fracture separation, 2: Specify reservoir volume and fracture separation, 3: Specify reservoir volume and number of fractures, 4: Specify reservoir volume only (sufficient for reservoir models 3, 4, 5 and 6)",
229+
"description": "Specifies how the reservoir volume, and fracture distribution (for reservoir models 1 and 2) are calculated. The reservoir volume is used by GEOPHIRES to estimate the stored heat in place. The fracture distribution is needed as input for the EGS fracture-based reservoir models 1 and 2. 1: FRAC_NUM_SEP: Specify number of fractures and fracture separation; 2: RES_VOL_FRAC_SEP: Specify reservoir volume and fracture separation; 3: RES_VOL_FRAC_NUM: Specify reservoir volume and number of fractures; 4: RES_VOL_ONLY: Specify reservoir volume only",
230230
"type": "integer",
231231
"units": null,
232232
"category": "Reservoir",

0 commit comments

Comments
 (0)