Skip to content

Commit af2fdf7

Browse files
Merge pull request NREL#240 from softwareengineerprogrammer/main
Add Estimated Jobs Created for electricity end-use NREL#232
2 parents fc5ae79 + 9f8cca0 commit af2fdf7

24 files changed

+102
-66
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 3.4.34
2+
current_version = 3.4.35
33
commit = True
44
tag = True
55

.cookiecutterrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ default_context:
5454
sphinx_doctest: "no"
5555
sphinx_theme: "sphinx-py3doc-enhanced-theme"
5656
test_matrix_separate_coverage: "no"
57-
version: 3.4.34
57+
version: 3.4.35
5858
version_manager: "bump2version"
5959
website: "https://github.com/NREL"
6060
year_from: "2023"

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ Free software: `MIT license <LICENSE>`__
4747
:alt: Supported implementations
4848
:target: https://pypi.org/project/geophires-x
4949

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

5454
.. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
5555
:target: https://nrel.github.io/GEOPHIRES-X

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
year = '2023'
1919
author = 'NREL'
2020
copyright = f'{year}, {author}'
21-
version = release = '3.4.34'
21+
version = release = '3.4.35'
2222

2323
pygments_style = 'trac'
2424
templates_path = ['./templates']

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def read(*names, **kwargs):
1313

1414
setup(
1515
name='geophires-x',
16-
version='3.4.34',
16+
version='3.4.35',
1717
license='MIT',
1818
description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
1919
long_description='{}\n{}'.format(

src/geophires_x/Economics.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,6 +1509,15 @@ def __init__(self, model: Model):
15091509
ToolTipText="Production tax credit inflation adjusted"
15101510
)
15111511

1512+
self.jobs_created_per_MW_electricity = self.ParameterDict[
1513+
self.jobs_created_per_MW_electricity.Name] = floatParameter(
1514+
"Estimated Jobs Created per MW of Electricity Produced",
1515+
DefaultValue=2.13,
1516+
UnitType=Units.NONE,
1517+
Required=False,
1518+
ToolTipText="Estimated jobs created per MW of electricity produced, per https://geothermal.org/resources/geothermal-basics"
1519+
)
1520+
15121521
# local variable initialization
15131522
self.CAPEX_cost_electricity_plant = 0.0
15141523
self.CAPEX_cost_heat_plant = 0.0
@@ -1818,6 +1827,10 @@ def __init__(self, model: Model):
18181827
PreferredUnits=CurrencyUnit.MDOLLARS,
18191828
CurrentUnits=CurrencyUnit.MDOLLARS
18201829
)
1830+
self.jobs_created = self.OutputParameterDict[self.jobs_created.Name] = OutputParameter(
1831+
Name="Estimated Jobs Created",
1832+
UnitType=Units.NONE,
1833+
)
18211834

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

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

2906+
# https://github.com/NREL/GEOPHIRES-X/issues/232
2907+
self.jobs_created.value = round(
2908+
np.average(model.surfaceplant.ElectricityProduced.quantity().to(
2909+
'MW').magnitude * self.jobs_created_per_MW_electricity.value))
2910+
28932911
model.logger.info(f'complete {__class__!s}: {sys._getframe().f_code.co_name}')
28942912

28952913
def __str__(self):

src/geophires_x/Outputs.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,6 +1638,10 @@ def PrintOutputs(self, model: Model):
16381638
EndUseOptions.COGENERATION_PARALLEL_EXTRA_ELECTRICITY]:
16391639
f.write(f' CHP: Percent cost allocation for electrical plant: {model.economics.CAPEX_heat_electricity_plant_ratio.value*100.0:10.2f}%' + NL)
16401640

1641+
if model.surfaceplant.enduse_option.value in [EndUseOptions.ELECTRICITY]:
1642+
f.write(f' Estimated Jobs Created: {model.economics.jobs_created.value}\n')
1643+
1644+
16411645
f.write(NL)
16421646
f.write(' ***ENGINEERING PARAMETERS***\n')
16431647
f.write(NL)

src/geophires_x/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '3.4.34'
1+
__version__ = '3.4.35'

src/geophires_x_client/geophires_x_result.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ class GeophiresXResult:
7171
'Fixed Charge Rate (FCR)', # SUTRA
7272
'Project Payback Period',
7373
'CHP: Percent cost allocation for electrical plant',
74+
'Estimated Jobs Created',
7475
],
7576
'EXTENDED ECONOMICS': [
7677
'Adjusted Project LCOE (after incentives, grants, AddOns,etc)',

tests/example1_addons.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ECONOMIC PARAMETERS,Project VIR=PI=PIR,,3.42,
1818
ECONOMIC PARAMETERS,Project MOIC,,36.27,
1919
ECONOMIC PARAMETERS,Fixed Charge Rate (FCR),,5.0,
2020
ECONOMIC PARAMETERS,Project Payback Period,,7.05,yr
21+
ECONOMIC PARAMETERS,Estimated Jobs Created,,12,
2122
EXTENDED ECONOMICS,"Adjusted Project LCOE (after incentives\, grants\, AddOns\,etc)",,1.74,cents/kWh
2223
EXTENDED ECONOMICS,"Adjusted Project LCOH (after incentives\, grants\, AddOns\,etc)",,0.0,USD/MMBTU
2324
EXTENDED ECONOMICS,"Adjusted Project CAPEX (after incentives\, grants\, AddOns\, etc)",,101.07,MUSD
@@ -96,7 +97,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation
9697
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh
9798
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
9899
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
99-
Simulation Metadata,GEOPHIRES Version,,3.4.31,
100+
Simulation Metadata,GEOPHIRES Version,,3.4.34,
100101
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
101102
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
102103
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,

0 commit comments

Comments
 (0)