Skip to content

Commit 24bd805

Browse files
fix csv unit test, prevent wellbore heat transmission model from being parsed from production wellbore heat transmission model
1 parent c6c0d2e commit 24bd805

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

src/geophires_x_client/geophires_x_result.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ def normalize_spaces(matched_line):
487487
return {'value': self._parse_number(str_val, field=f'field "{field_name}"'), 'unit': unit}
488488

489489
def _get_equal_sign_delimited_field(self, field_name):
490-
metadata_marker = f'{field_name} = '
490+
metadata_marker = f' {field_name} = '
491491
matching_lines = set(filter(lambda line: metadata_marker in line, self._lines))
492492

493493
if len(matching_lines) == 0:

tests/geophires-result_example-3.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ RESOURCE CHARACTERISTICS,Number of segments,,1,count
3232
RESOURCE CHARACTERISTICS,Geothermal gradient,,0.07,degC/m
3333
RESERVOIR PARAMETERS,Reservoir Model,,Single Fracture m/A Thermal Drawdown Model,
3434
RESERVOIR PARAMETERS,Bottom-hole temperature,,232.0,degC
35+
RESERVOIR PARAMETERS,Number of fractures,,12.0,count
36+
RESERVOIR PARAMETERS,Fracture separation,,80.0,meter
3537
RESERVOIR PARAMETERS,Reservoir volume,,176000000,m**3
3638
RESERVOIR PARAMETERS,Average reservoir pressure,,100.0,kPa
3739
RESERVOIR PARAMETERS,Plant outlet pressure,,100.0,kPa

tests/test_geophires_x_client.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ def test_geophires_x_result_2(self):
4444
assert result.result['SUMMARY OF RESULTS']['Average Net Electricity Production']['value'] == 5.39
4545
assert result.result['ENGINEERING PARAMETERS']['Power plant type']['value'] == 'Supercritical ORC'
4646
assert result.result['SUMMARY OF RESULTS']['End-Use Option']['value'] == 'Electricity'
47+
assert (
48+
'Ramey Model'
49+
== result.result['RESERVOIR SIMULATION RESULTS']['Production Wellbore Heat Transmission Model']
50+
)
51+
assert result.result['RESERVOIR SIMULATION RESULTS']['Wellbore Heat Transmission Model'] is None
4752

4853
def test_geophires_x_result_3(self):
4954
test_result_path = self._get_test_file_path('geophires-result_example-3.out')

0 commit comments

Comments
 (0)