Skip to content

Commit afd4f21

Browse files
malcolm-dsidermalcolm-dsider
committed
Fix check errors (pre-commit) try 2
1 parent 20dc73c commit afd4f21

File tree

3 files changed

+83
-83
lines changed

3 files changed

+83
-83
lines changed

‎src/geophires_x_client/geophires_x_result.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,9 @@ def __init__(self, output_file_path, logger_name='root'):
306306

307307
try:
308308
self.result['POWER GENERATION PROFILE'] = self._get_power_generation_profile()
309-
self.result[
310-
'HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE'
311-
] = self._get_heat_electricity_extraction_generation_profile()
309+
self.result['HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE'] = (
310+
self._get_heat_electricity_extraction_generation_profile()
311+
)
312312
except Exception as e:
313313
# FIXME
314314
self._logger.error(f'Failed to parse power and/or extraction profiles: {e}')

‎src/hip_ra/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ def _parse_fields(self):
3737
matches = re.findall(pattern, text)
3838

3939
result = {
40-
key.strip(): {'value': float(value), 'unit': unit.strip()}
41-
if unit
42-
else {'value': float(value), 'unit': None}
40+
key.strip(): (
41+
{'value': float(value), 'unit': unit.strip()} if unit else {'value': float(value), 'unit': None}
42+
)
4343
for key, value, unit in matches
4444
}
4545

‎src/hip_ra_x/hip_ra_x.py

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -419,29 +419,29 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
419419
PreferredUnits=HeatUnit.KJ,
420420
CurrentUnits=HeatUnit.KJ,
421421
)
422-
self.wellhead_heat_recovery_rock = self.OutputParameterDict[
423-
self.wellhead_heat_recovery_rock.Name
424-
] = OutputParameter(
425-
Name='Wellhead Heat (rock)',
426-
UnitType=Units.HEAT,
427-
PreferredUnits=HeatUnit.KJ,
428-
CurrentUnits=HeatUnit.KJ,
422+
self.wellhead_heat_recovery_rock = self.OutputParameterDict[self.wellhead_heat_recovery_rock.Name] = (
423+
OutputParameter(
424+
Name='Wellhead Heat (rock)',
425+
UnitType=Units.HEAT,
426+
PreferredUnits=HeatUnit.KJ,
427+
CurrentUnits=HeatUnit.KJ,
428+
)
429429
)
430-
self.wellhead_heat_recovery_fluid = self.OutputParameterDict[
431-
self.wellhead_heat_recovery_fluid.Name
432-
] = OutputParameter(
433-
Name='Wellhead Heat (fluid)',
434-
UnitType=Units.HEAT,
435-
PreferredUnits=HeatUnit.KJ,
436-
CurrentUnits=HeatUnit.KJ,
430+
self.wellhead_heat_recovery_fluid = self.OutputParameterDict[self.wellhead_heat_recovery_fluid.Name] = (
431+
OutputParameter(
432+
Name='Wellhead Heat (fluid)',
433+
UnitType=Units.HEAT,
434+
PreferredUnits=HeatUnit.KJ,
435+
CurrentUnits=HeatUnit.KJ,
436+
)
437437
)
438-
self.reservoir_recovery_factor = self.OutputParameterDict[
439-
self.reservoir_recovery_factor.Name
440-
] = OutputParameter(
441-
Name='Recovery Factor (reservoir)',
442-
UnitType=Units.PERCENT,
443-
PreferredUnits=PercentUnit.PERCENT,
444-
CurrentUnits=PercentUnit.PERCENT,
438+
self.reservoir_recovery_factor = self.OutputParameterDict[self.reservoir_recovery_factor.Name] = (
439+
OutputParameter(
440+
Name='Recovery Factor (reservoir)',
441+
UnitType=Units.PERCENT,
442+
PreferredUnits=PercentUnit.PERCENT,
443+
CurrentUnits=PercentUnit.PERCENT,
444+
)
445445
)
446446
self.recovery_factor_rock = self.OutputParameterDict[self.recovery_factor_rock.Name] = OutputParameter(
447447
Name='Recovery Factor (rock)',
@@ -473,13 +473,13 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
473473
PreferredUnits=HeatUnit.KJ,
474474
CurrentUnits=HeatUnit.KJ,
475475
)
476-
self.reservoir_producible_heat = self.OutputParameterDict[
477-
self.reservoir_producible_heat.Name
478-
] = OutputParameter(
479-
Name='Producible Heat (reservoir)',
480-
UnitType=Units.HEAT,
481-
PreferredUnits=HeatUnit.KJ,
482-
CurrentUnits=HeatUnit.KJ,
476+
self.reservoir_producible_heat = self.OutputParameterDict[self.reservoir_producible_heat.Name] = (
477+
OutputParameter(
478+
Name='Producible Heat (reservoir)',
479+
UnitType=Units.HEAT,
480+
PreferredUnits=HeatUnit.KJ,
481+
CurrentUnits=HeatUnit.KJ,
482+
)
483483
)
484484
self.producible_heat_rock = self.OutputParameterDict[self.producible_heat_rock.Name] = OutputParameter(
485485
Name='Producible Heat (rock)',
@@ -493,37 +493,37 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
493493
PreferredUnits=HeatUnit.KJ,
494494
CurrentUnits=HeatUnit.KJ,
495495
)
496-
self.reservoir_producible_electricity = self.OutputParameterDict[
497-
self.reservoir_producible_electricity.Name
498-
] = OutputParameter(
499-
Name='Producible Electricity (reservoir)',
500-
UnitType=Units.POWER,
501-
PreferredUnits=PowerUnit.MW,
502-
CurrentUnits=PowerUnit.MW,
496+
self.reservoir_producible_electricity = self.OutputParameterDict[self.reservoir_producible_electricity.Name] = (
497+
OutputParameter(
498+
Name='Producible Electricity (reservoir)',
499+
UnitType=Units.POWER,
500+
PreferredUnits=PowerUnit.MW,
501+
CurrentUnits=PowerUnit.MW,
502+
)
503503
)
504-
self.producible_electricity_rock = self.OutputParameterDict[
505-
self.producible_electricity_rock.Name
506-
] = OutputParameter(
507-
Name='Producible Electricity (rock)',
508-
UnitType=Units.POWER,
509-
PreferredUnits=PowerUnit.MW,
510-
CurrentUnits=PowerUnit.MW,
504+
self.producible_electricity_rock = self.OutputParameterDict[self.producible_electricity_rock.Name] = (
505+
OutputParameter(
506+
Name='Producible Electricity (rock)',
507+
UnitType=Units.POWER,
508+
PreferredUnits=PowerUnit.MW,
509+
CurrentUnits=PowerUnit.MW,
510+
)
511511
)
512-
self.producible_electricity_fluid = self.OutputParameterDict[
513-
self.producible_electricity_fluid.Name
514-
] = OutputParameter(
515-
Name='Producible Electricity (fluid)',
516-
UnitType=Units.POWER,
517-
PreferredUnits=PowerUnit.MW,
518-
CurrentUnits=PowerUnit.MW,
512+
self.producible_electricity_fluid = self.OutputParameterDict[self.producible_electricity_fluid.Name] = (
513+
OutputParameter(
514+
Name='Producible Electricity (fluid)',
515+
UnitType=Units.POWER,
516+
PreferredUnits=PowerUnit.MW,
517+
CurrentUnits=PowerUnit.MW,
518+
)
519519
)
520-
self.producible_heat_per_unit_area = self.OutputParameterDict[
521-
self.producible_heat_per_unit_area.Name
522-
] = OutputParameter(
523-
Name='Producible Heat/Unit Area (reservoir)',
524-
UnitType=Units.HEATPERUNITAREA,
525-
PreferredUnits=HeatPerUnitAreaUnit.KJPERSQKM,
526-
CurrentUnits=HeatPerUnitAreaUnit.KJPERSQKM,
520+
self.producible_heat_per_unit_area = self.OutputParameterDict[self.producible_heat_per_unit_area.Name] = (
521+
OutputParameter(
522+
Name='Producible Heat/Unit Area (reservoir)',
523+
UnitType=Units.HEATPERUNITAREA,
524+
PreferredUnits=HeatPerUnitAreaUnit.KJPERSQKM,
525+
CurrentUnits=HeatPerUnitAreaUnit.KJPERSQKM,
526+
)
527527
)
528528
self.heat_per_unit_area_rock = self.OutputParameterDict[self.heat_per_unit_area_rock.Name] = OutputParameter(
529529
Name='Producible Heat/Unit Area (rock)',
@@ -537,13 +537,13 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
537537
PreferredUnits=HeatPerUnitAreaUnit.KJPERSQKM,
538538
CurrentUnits=HeatPerUnitAreaUnit.KJPERSQKM,
539539
)
540-
self.heat_per_unit_volume_reservoir = self.OutputParameterDict[
541-
self.heat_per_unit_volume_reservoir.Name
542-
] = OutputParameter(
543-
Name='Producible Heat/Unit Volume (reservoir)',
544-
UnitType=Units.HEATPERUNITVOLUME,
545-
PreferredUnits=HeatPerUnitVolumeUnit.KJPERCUBICKM,
546-
CurrentUnits=HeatPerUnitVolumeUnit.KJPERCUBICKM,
540+
self.heat_per_unit_volume_reservoir = self.OutputParameterDict[self.heat_per_unit_volume_reservoir.Name] = (
541+
OutputParameter(
542+
Name='Producible Heat/Unit Volume (reservoir)',
543+
UnitType=Units.HEATPERUNITVOLUME,
544+
PreferredUnits=HeatPerUnitVolumeUnit.KJPERCUBICKM,
545+
CurrentUnits=HeatPerUnitVolumeUnit.KJPERCUBICKM,
546+
)
547547
)
548548
self.producible_electricity_per_unit_area = self.OutputParameterDict[
549549
self.producible_electricity_per_unit_area.Name
@@ -553,21 +553,21 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
553553
PreferredUnits=PowerPerUnitAreaUnit.MWPERSQKM,
554554
CurrentUnits=PowerPerUnitAreaUnit.MWPERSQKM,
555555
)
556-
self.electricity_per_unit_area_rock = self.OutputParameterDict[
557-
self.electricity_per_unit_area_rock.Name
558-
] = OutputParameter(
559-
Name='Producible Electricity/Unit Area (rock)',
560-
UnitType=Units.POWERPERUNITAREA,
561-
PreferredUnits=PowerPerUnitAreaUnit.MWPERSQKM,
562-
CurrentUnits=PowerPerUnitAreaUnit.MWPERSQKM,
556+
self.electricity_per_unit_area_rock = self.OutputParameterDict[self.electricity_per_unit_area_rock.Name] = (
557+
OutputParameter(
558+
Name='Producible Electricity/Unit Area (rock)',
559+
UnitType=Units.POWERPERUNITAREA,
560+
PreferredUnits=PowerPerUnitAreaUnit.MWPERSQKM,
561+
CurrentUnits=PowerPerUnitAreaUnit.MWPERSQKM,
562+
)
563563
)
564-
self.electricity_per_unit_area_fluid = self.OutputParameterDict[
565-
self.electricity_per_unit_area_fluid.Name
566-
] = OutputParameter(
567-
Name='Producible Electricity/Unit Area (fluid)',
568-
UnitType=Units.POWERPERUNITAREA,
569-
PreferredUnits=PowerPerUnitAreaUnit.MWPERSQKM,
570-
CurrentUnits=PowerPerUnitAreaUnit.MWPERSQKM,
564+
self.electricity_per_unit_area_fluid = self.OutputParameterDict[self.electricity_per_unit_area_fluid.Name] = (
565+
OutputParameter(
566+
Name='Producible Electricity/Unit Area (fluid)',
567+
UnitType=Units.POWERPERUNITAREA,
568+
PreferredUnits=PowerPerUnitAreaUnit.MWPERSQKM,
569+
CurrentUnits=PowerPerUnitAreaUnit.MWPERSQKM,
570+
)
571571
)
572572
self.electricity_per_unit_volume_reservoir = self.OutputParameterDict[
573573
self.electricity_per_unit_volume_reservoir.Name

0 commit comments

Comments
 (0)