Skip to content

Commit 2184741

Browse files
update unit tests affected by addition of Calulcation Time result field
1 parent 0edb494 commit 2184741

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

tests/example1_addons.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,
9898
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
9999
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
100100
SURFACE EQUIPMENT SIMULATION RESULTS,Heat to Power Conversion Efficiency,,10.07,%
101-
Simulation Metadata,GEOPHIRES Version,,3.9.44,
101+
Simulation Metadata,GEOPHIRES Version,,3.9.49,
102+
Simulation Metadata,Calculation Time,,0.852,sec
102103
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
103104
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
104105
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,

tests/examples/example1_addons.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.9.44
8-
Simulation Date: 2025-07-29
9-
Simulation Time: 06:46
10-
Calculation Time: 0.898 sec
7+
GEOPHIRES Version: 3.9.49
8+
Simulation Date: 2025-08-21
9+
Simulation Time: 09:19
10+
Calculation Time: 0.852 sec
1111

1212
***SUMMARY OF RESULTS***
1313

tests/geophires-result_example-3.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Heat Production,,87.2,GWh
8282
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.18,MW
8383
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,100.0,%
8484
Simulation Metadata,GEOPHIRES Version,,3.0,
85+
Simulation Metadata,Calculation Time,,0.057,sec
8586
POWER GENERATION PROFILE,THERMAL DRAWDOWN,0,1.0,
8687
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0081,
8788
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0097,

tests/test_geophires_x.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ def test_geophires_x_end_use_direct_use_heat(self):
6767
if 'metadata' in result_same_input.result:
6868
del result_same_input.result['metadata']
6969

70+
del result.result['Simulation Metadata']['Calculation Time']
71+
del result_same_input.result['Simulation Metadata']['Calculation Time']
72+
7073
self.assertDictEqual(result.result, result_same_input.result)
7174

7275
# noinspection PyMethodMayBeStatic
@@ -362,6 +365,10 @@ def test_RTES_name(self):
362365
self.assertEqual(PlantType.RTES.value, 'Reservoir Thermal Energy Storage')
363366

364367
def test_input_unit_conversion(self):
368+
def delete_metadata(r: GeophiresXResult) -> None:
369+
del r.result['metadata']
370+
del r.result['Simulation Metadata']['Calculation Time']
371+
365372
client = GeophiresXClient()
366373

367374
result_meters_input = client.get_geophires_result(
@@ -371,7 +378,7 @@ def test_input_unit_conversion(self):
371378
)
372379
)
373380
)
374-
del result_meters_input.result['metadata']
381+
delete_metadata(result_meters_input)
375382

376383
result_kilometers_input = client.get_geophires_result(
377384
GeophiresInputParameters(
@@ -380,7 +387,7 @@ def test_input_unit_conversion(self):
380387
)
381388
)
382389
)
383-
del result_kilometers_input.result['metadata']
390+
delete_metadata(result_kilometers_input)
384391

385392
self.assertDictEqual(result_kilometers_input.result, result_meters_input.result)
386393

0 commit comments

Comments
 (0)