Skip to content

Commit ba36de9

Browse files
committed
Merge branch 'master' into revert_DEA_cost
2 parents 11ae3e3 + f63c6e6 commit ba36de9

24 files changed

Lines changed: 534 additions & 156 deletions

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929

3030
- name: Setup micromamba
3131
uses: mamba-org/setup-micromamba@v2
@@ -46,7 +46,7 @@ jobs:
4646
make test
4747
4848
- name: Upload artifacts
49-
uses: actions/upload-artifact@v4
49+
uses: actions/upload-artifact@v6
5050
with:
5151
name: technology-data
5252
path: outputs/

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ gurobi.log
2424
*.cb
2525
*.cb2
2626
.*.lb
27+
.claude/*

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repos:
1717
# Run ruff to lint and format
1818
- repo: https://github.com/astral-sh/ruff-pre-commit
1919
# Ruff version.
20-
rev: v0.13.3
20+
rev: v0.14.10
2121
hooks:
2222
# Run the linter.
2323
- id: ruff

docs/release_notes.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ Upcoming Release
1616
.. The features listed below are not released yet, but will be part of the next release!
1717
.. To use the features already you have to use the ``master`` branch.
1818
19+
* Adding `grey methanol synthesis`.
20+
21+
* Align cost units for NREL battery data with PyPSA modeling, fetching investment cost and FOM for both `battery storage` and `battery inverter` instead of a single value for `battery storage`, which was instead representative of the full plant (battery storage + battery inverter).
22+
23+
* Add excess heat output rates for Fischer-Tropsch and Haber-Bosch processes.
24+
1925
* Updated indexing of DEA Excel data for PTES and revised capital cost and FOM assumptions for 2045 and 2050.
2026

2127

inputs/US/manual_input_usa.csv

Lines changed: 98 additions & 0 deletions
Large diffs are not rendered by default.

inputs/manual_input.csv

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ blast furnace-basic oxygen furnace,investment,2020,7637406,EUR/t_steel/h,2020,"M
405405
blast furnace-basic oxygen furnace,FOM,2020,14.18,%/year,2020,"Model assumptions from MPP Steel Transition Tool: https://github.com/missionpossiblepartnership/mpp-steel-model/blob/9eca52db92bd2d9715f30e98ccaaf36677fdb516/mppsteel/data/import_data/CAPEX%20OPEX%20Per%20Technology.xlsx, accessed: 2025-04-15.",123.67 EUR/t_steel output/a. MPP steel tool uses CAPEX/OPEX for technology ‘BF-BOF’.
406406
blast furnace-basic oxygen furnace,lifetime,2020,40,years,2020,"Mission Possible Partnership (2022): Steel Model Documentation (https://mpp.gitbook.io/mpp-steel-model/model-overview/model-components/technologies, accessed: 2025-04-15).",MPP steel model distinguishes between plant lifetime (40 years) and investment cycle (20 years). Choose plant lifetime.
407407
blast furnace-basic oxygen furnace,economic_lifetime,2020,20,years,2020,"Mission Possible Partnership (2022): Steel Model Documentation (https://mpp.gitbook.io/mpp-steel-model/model-overview/model-components/technologies, accessed: 2025-04-15).",
408-
blast furnace-basic oxygen furnace,coal-input,2020,1.43,MWh_coal/t_steel,2020,"Mission Possible Partnership (2022): Steel Model Documentation (https://mpp.gitbook.io/mpp-steel-model/model-overview/model-components/technologies, accessed: 2025-04-15). ","Based on process ‘Avg BF-BOF` using 195 kg_PCI/t_HM (PCI = Pulverized Coal Injected; HM = Hot Metal) as substitute for coke, 24 MJ/kg as LHV for coal and 1 : 1.1 as HM-to-steel ratio."
408+
blast furnace-basic oxygen furnace,coal-input,2020,5.34,MWh_coal/t_steel,2020,"Mission Possible Partnership (2022): Steel Model https://github.com/missionpossiblepartnership/mpp-steel-model/blob/9eca52db92bd2d9715f30e98ccaaf36677fdb516/mppsteel/data/import_data/Technology%20Business%20Cases.csv#L21, accessed: 2025-11-10). ","Based on process ‘BAT BF-BOF` Emissivity without CCS using specific emissivity for coal of 0.3361 t_CO2/MWh; composition of 0.44 GJ met-coal, 4.75 GJ coke, 1.35 GJ thermal coal which is translated to one representative coal demand which also includes coal demand for intermediate products like BF gas, BOF gas and COG."
409409
blast furnace-basic oxygen furnace,ore-input,2020,1.539,t_ore/t_steel,2020,"Mission Possible Partnership (2022): Steel Model (https://github.com/missionpossiblepartnership/mpp-steel-model/blob/9eca52db92bd2d9715f30e98ccaaf36677fdb516/mppsteel/data/import_data/Technology%20Business%20Cases.csv, accessed: 2025-04-15). ",Based on process ‘Avg BF-BOF`
410410
blast furnace-basic oxygen furnace,scrap-input,2020,0.051,t_scrap/t_steel,2020,"Mission Possible Partnership (2022): Steel Model (https://github.com/missionpossiblepartnership/mpp-steel-model/blob/9eca52db92bd2d9715f30e98ccaaf36677fdb516/mppsteel/data/import_data/Technology%20Business%20Cases.csv, accessed: 2025-04-15). ",Based on process ‘Avg BF-BOF`
411411
cement dry clinker,investment,2006,1095000,EUR/t_clinker/h,2015,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01) and currency year from file `SysSettings.xls`, sheet `Constants`, Attribute `G_Dyear` = 2015.",Original value 125 EUR/t/year
@@ -601,3 +601,6 @@ H2 production biomass gasification CC,electricity-input,2020,0.143,MWh_el/MWh_H2
601601
H2 production biomass gasification CC,FOM,2020,5,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_15_TECHS_HYDROGEN.xlsx` (SBIOH2GCC01, H2 Production-Biomass Gasification + Carbon Capture, medium size, centralized, medium size, centralized) and currency year from file `SubRES_15_TECHS_HYDROGEN.xlsx`, Sheet `INPUT-Data(HP)`",
602602
H2 production biomass gasification CC,investment,2020,1309.2,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_15_TECHS_HYDROGEN.xlsx` (SBIOH2GCC01, H2 Production-Biomass Gasification + Carbon Capture, medium size, centralized, medium size, centralized) and currency year from file `SubRES_15_TECHS_HYDROGEN.xlsx`, Sheet `INPUT-Data(HP)`",
603603
H2 production biomass gasification CC,VOM,2020,0.46,EUR/MWh_H2,2010,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_15_TECHS_HYDROGEN.xlsx` (SBIOH2GCC01, H2 Production-Biomass Gasification + Carbon Capture, medium size, centralized, medium size, centralized) and currency year from file file `SubRES_15_TECHS_HYDROGEN.xlsx`, Sheet `INPUT-Data(HP)`",
604+
grey methanol synthesis,efficiency,2030,0.569,MWh_MeOH/MWh_gas,2020,"From https://www.sciencedirect.com/science/article/pii/S0016236119311767, table 2, Methanol Synthesis with integrated autothermal reforming. Efficiency is the exergetic efficiency ",
605+
grey methanol synthesis,carbondioxide-output,2030,0.0567742,t_CO2/MWh_gas,2020,"Calculated from the carbon content of gas (0.198 t_CO2/MWh) compared to the carbon content of MeOH (0.2482 t_CO2/MWh)",
606+
grey methanol synthesis,investment,2030,1001188,EUR/MW_MeOH,2020,"Calculated from https://www.irena.org/-/media/Files/IRENA/Agency/Publication/2021/Jan/IRENA_Innovation_Renewable_Methanol_2021.pdf) Table 25 with an exchange rate of 0.8775 EUR/USD and energy content of 5.528 MWh_MeOH/t_MeOH",

0 commit comments

Comments
 (0)