Skip to content

Commit

Permalink
Merge pull request NREL#240 from softwareengineerprogrammer/main
Browse files Browse the repository at this point in the history
Add Estimated Jobs Created for electricity end-use

NREL#232
  • Loading branch information
softwareengineerprogrammer authored Jun 19, 2024
2 parents fc5ae79 + 9f8cca0 commit af2fdf7
Show file tree
Hide file tree
Showing 24 changed files with 102 additions and 66 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.4.34
current_version = 3.4.35
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion .cookiecutterrc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ default_context:
sphinx_doctest: "no"
sphinx_theme: "sphinx-py3doc-enhanced-theme"
test_matrix_separate_coverage: "no"
version: 3.4.34
version: 3.4.35
version_manager: "bump2version"
website: "https://github.com/NREL"
year_from: "2023"
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ Free software: `MIT license <LICENSE>`__
:alt: Supported implementations
:target: https://pypi.org/project/geophires-x

.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.34.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.35.svg
:alt: Commits since latest release
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.34...main
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.35...main

.. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
:target: https://nrel.github.io/GEOPHIRES-X
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
year = '2023'
author = 'NREL'
copyright = f'{year}, {author}'
version = release = '3.4.34'
version = release = '3.4.35'

pygments_style = 'trac'
templates_path = ['./templates']
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def read(*names, **kwargs):

setup(
name='geophires-x',
version='3.4.34',
version='3.4.35',
license='MIT',
description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
long_description='{}\n{}'.format(
Expand Down
18 changes: 18 additions & 0 deletions src/geophires_x/Economics.py
Original file line number Diff line number Diff line change
Expand Up @@ -1509,6 +1509,15 @@ def __init__(self, model: Model):
ToolTipText="Production tax credit inflation adjusted"
)

self.jobs_created_per_MW_electricity = self.ParameterDict[
self.jobs_created_per_MW_electricity.Name] = floatParameter(
"Estimated Jobs Created per MW of Electricity Produced",
DefaultValue=2.13,
UnitType=Units.NONE,
Required=False,
ToolTipText="Estimated jobs created per MW of electricity produced, per https://geothermal.org/resources/geothermal-basics"
)

# local variable initialization
self.CAPEX_cost_electricity_plant = 0.0
self.CAPEX_cost_heat_plant = 0.0
Expand Down Expand Up @@ -1818,6 +1827,10 @@ def __init__(self, model: Model):
PreferredUnits=CurrencyUnit.MDOLLARS,
CurrentUnits=CurrencyUnit.MDOLLARS
)
self.jobs_created = self.OutputParameterDict[self.jobs_created.Name] = OutputParameter(
Name="Estimated Jobs Created",
UnitType=Units.NONE,
)

model.logger.info(f'Complete {__class__!s}: {sys._getframe().f_code.co_name}')

Expand Down Expand Up @@ -2890,6 +2903,11 @@ def Calculate(self, model: Model) -> None:
# Calculate LCOE/LCOH
self.LCOE.value, self.LCOH.value, self.LCOC.value = CalculateLCOELCOHLCOC(self, model)

# https://github.com/NREL/GEOPHIRES-X/issues/232
self.jobs_created.value = round(
np.average(model.surfaceplant.ElectricityProduced.quantity().to(
'MW').magnitude * self.jobs_created_per_MW_electricity.value))

model.logger.info(f'complete {__class__!s}: {sys._getframe().f_code.co_name}')

def __str__(self):
Expand Down
4 changes: 4 additions & 0 deletions src/geophires_x/Outputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -1638,6 +1638,10 @@ def PrintOutputs(self, model: Model):
EndUseOptions.COGENERATION_PARALLEL_EXTRA_ELECTRICITY]:
f.write(f' CHP: Percent cost allocation for electrical plant: {model.economics.CAPEX_heat_electricity_plant_ratio.value*100.0:10.2f}%' + NL)

if model.surfaceplant.enduse_option.value in [EndUseOptions.ELECTRICITY]:
f.write(f' Estimated Jobs Created: {model.economics.jobs_created.value}\n')


f.write(NL)
f.write(' ***ENGINEERING PARAMETERS***\n')
f.write(NL)
Expand Down
2 changes: 1 addition & 1 deletion src/geophires_x/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.4.34'
__version__ = '3.4.35'
1 change: 1 addition & 0 deletions src/geophires_x_client/geophires_x_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class GeophiresXResult:
'Fixed Charge Rate (FCR)', # SUTRA
'Project Payback Period',
'CHP: Percent cost allocation for electrical plant',
'Estimated Jobs Created',
],
'EXTENDED ECONOMICS': [
'Adjusted Project LCOE (after incentives, grants, AddOns,etc)',
Expand Down
3 changes: 2 additions & 1 deletion tests/example1_addons.csv
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ECONOMIC PARAMETERS,Project VIR=PI=PIR,,3.42,
ECONOMIC PARAMETERS,Project MOIC,,36.27,
ECONOMIC PARAMETERS,Fixed Charge Rate (FCR),,5.0,
ECONOMIC PARAMETERS,Project Payback Period,,7.05,yr
ECONOMIC PARAMETERS,Estimated Jobs Created,,12,
EXTENDED ECONOMICS,"Adjusted Project LCOE (after incentives\, grants\, AddOns\,etc)",,1.74,cents/kWh
EXTENDED ECONOMICS,"Adjusted Project LCOH (after incentives\, grants\, AddOns\,etc)",,0.0,USD/MMBTU
EXTENDED ECONOMICS,"Adjusted Project CAPEX (after incentives\, grants\, AddOns\, etc)",,101.07,MUSD
Expand Down Expand Up @@ -96,7 +97,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
Simulation Metadata,GEOPHIRES Version,,3.4.31,
Simulation Metadata,GEOPHIRES Version,,3.4.34,
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,
Expand Down
9 changes: 5 additions & 4 deletions tests/examples/Fervo_Norbeck_Latimer_2023.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.29
Simulation Date: 2024-05-15
Simulation Time: 11:32
Calculation Time: 0.349 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:57
Calculation Time: 0.345 sec

***SUMMARY OF RESULTS***

Expand All @@ -32,6 +32,7 @@ Simulation Metadata
Project VIR=PI=PIR: 0.64
Project MOIC: -0.10
Project Payback Period: N/A
Estimated Jobs Created: 7

***ENGINEERING PARAMETERS***

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.28
GEOPHIRES Build Date: 2024-03-05
Simulation Date: 2024-05-14
Simulation Time: 17:15
Calculation Time: 3.638 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:56
Calculation Time: 1.619 sec

***SUMMARY OF RESULTS***

Expand All @@ -33,6 +32,7 @@ Simulation Metadata
Project VIR=PI=PIR: -0.09
Project MOIC: -0.85
Project Payback Period: N/A
Estimated Jobs Created: 2

***ENGINEERING PARAMETERS***

Expand Down
9 changes: 5 additions & 4 deletions tests/examples/example1.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.29
Simulation Date: 2024-05-15
Simulation Time: 11:52
Calculation Time: 0.631 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:53
Calculation Time: 0.609 sec

***SUMMARY OF RESULTS***

Expand All @@ -33,6 +33,7 @@ Simulation Metadata
Project VIR=PI=PIR: 0.23
Project MOIC: -0.27
Project Payback Period: N/A
Estimated Jobs Created: 12

***ENGINEERING PARAMETERS***

Expand Down
9 changes: 5 additions & 4 deletions tests/examples/example1_addons.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.31
Simulation Date: 2024-06-17
Simulation Time: 06:45
Calculation Time: 0.619 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:52
Calculation Time: 0.590 sec

***SUMMARY OF RESULTS***

Expand All @@ -34,6 +34,7 @@ Simulation Metadata
Project VIR=PI=PIR: 3.42
Project MOIC: 36.27
Project Payback Period: 7.05 yr
Estimated Jobs Created: 12

***ENGINEERING PARAMETERS***

Expand Down
9 changes: 5 additions & 4 deletions tests/examples/example1_outputunits.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.31
Simulation Date: 2024-06-13
Simulation Time: 07:42
Calculation Time: 0.621 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:53
Calculation Time: 0.595 sec

***SUMMARY OF RESULTS***

Expand All @@ -33,6 +33,7 @@ Simulation Metadata
Project VIR=PI=PIR: 0.28
Project MOIC: -0.20
Project Payback Period: N/A
Estimated Jobs Created: 12

***ENGINEERING PARAMETERS***

Expand Down
9 changes: 5 additions & 4 deletions tests/examples/example4.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.29
Simulation Date: 2024-05-15
Simulation Time: 11:49
Calculation Time: 0.059 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:53
Calculation Time: 0.054 sec

***SUMMARY OF RESULTS***

Expand All @@ -32,6 +32,7 @@ Simulation Metadata
Project VIR=PI=PIR: 0.33
Project MOIC: -0.17
Project Payback Period: N/A
Estimated Jobs Created: 18

***ENGINEERING PARAMETERS***

Expand Down
10 changes: 5 additions & 5 deletions tests/examples/example9.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.28
GEOPHIRES Build Date: 2024-03-05
Simulation Date: 2024-05-14
Simulation Time: 17:14
Calculation Time: 1.525 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:54
Calculation Time: 0.604 sec

***SUMMARY OF RESULTS***

Expand All @@ -34,6 +33,7 @@ Simulation Metadata
Project VIR=PI=PIR: -0.13
Project MOIC: -0.86
Project Payback Period: N/A
Estimated Jobs Created: 1

***ENGINEERING PARAMETERS***

Expand Down
9 changes: 5 additions & 4 deletions tests/examples/example_ITC.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.29
Simulation Date: 2024-05-15
Simulation Time: 11:53
Calculation Time: 0.601 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:54
Calculation Time: 0.600 sec

***SUMMARY OF RESULTS***

Expand All @@ -32,6 +32,7 @@ Simulation Metadata
Project VIR=PI=PIR: 1.14
Project MOIC: 0.61
Project Payback Period: 12.74 yr
Estimated Jobs Created: 41

***ENGINEERING PARAMETERS***

Expand Down
9 changes: 5 additions & 4 deletions tests/examples/example_PTC.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.29
Simulation Date: 2024-05-15
Simulation Time: 11:52
Calculation Time: 0.632 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:53
Calculation Time: 0.593 sec

***SUMMARY OF RESULTS***

Expand All @@ -32,6 +32,7 @@ Simulation Metadata
Project VIR=PI=PIR: 1.07
Project MOIC: 0.55
Project Payback Period: 10.02 yr
Estimated Jobs Created: 41

***ENGINEERING PARAMETERS***

Expand Down
9 changes: 5 additions & 4 deletions tests/examples/example_SHR-1.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.29
Simulation Date: 2024-05-15
Simulation Time: 11:53
Calculation Time: 0.616 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:54
Calculation Time: 0.591 sec

***SUMMARY OF RESULTS***

Expand All @@ -33,6 +33,7 @@ Simulation Metadata
Project VIR=PI=PIR: 1.11
Project MOIC: 1.29
Project Payback Period: 13.38 yr
Estimated Jobs Created: 66

***ENGINEERING PARAMETERS***

Expand Down
9 changes: 5 additions & 4 deletions tests/examples/example_SHR-2.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Simulation Metadata
----------------------
GEOPHIRES Version: 3.4.29
Simulation Date: 2024-05-15
Simulation Time: 11:53
Calculation Time: 0.622 sec
GEOPHIRES Version: 3.4.34
Simulation Date: 2024-06-18
Simulation Time: 15:54
Calculation Time: 0.604 sec

***SUMMARY OF RESULTS***

Expand All @@ -33,6 +33,7 @@ Simulation Metadata
Project VIR=PI=PIR: 1.73
Project MOIC: 2.43
Project Payback Period: 9.49 yr
Estimated Jobs Created: 66

***ENGINEERING PARAMETERS***

Expand Down
Loading

0 comments on commit af2fdf7

Please sign in to comment.