Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change reference cost year to 2020 #121

Merged
merged 23 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ configfile: "config.yaml"

rule compile_cost_assumptions:
input:
inflation_rate = "inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx",
pypsa_costs = "inputs/costs_PyPSA.csv",
fraunhofer_costs = "inputs/Fraunhofer_ISE_costs.csv",
fraunhofer_energy_prices = "inputs/Fraunhofer_ISE_energy_prices.csv",
Expand Down
7 changes: 1 addition & 6 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@ years : [2020, 2025, 2030, 2035, 2040, 2045, 2050]

expectation : "" # tech data uncertainty, possible options [None, "optimist", "pessimist"]

rate_inflation : 0.02

#year for EUR outputs
#NB: 2015 is standard year in DEA, and DEA is NOT yet adjusted
#if this is changed, only non-DEA
# DEA takes for solar PV eur_year 2020!
eur_year : 2015
eur_year : 2020

# add solar from different source
solar_utility_from_vartiaien : false
Expand Down
2 changes: 2 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Release Notes
.. Upcoming Release
.. ================

* Update currency year from 2015 to 2020. Add a currency year for each data input. The inflation rate is taken `Eurostat HICP - annual data (average index and rate of change) <https://ec.europa.eu/eurostat/api/dissemination/sdmx/2.1/dataflow/ESTAT/prc_hicp_aind/1.0?references=descendants&detail=referencepartial&format=sdmx_2.1_generic&compressed=true>`_.

Technology-Data 0.7.0 (7 February 2024)
=======================================

Expand Down
6 changes: 3 additions & 3 deletions environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ channels:
- conda-forge
- bioconda
dependencies:
- python>=3.9
fneum marked this conversation as resolved.
Show resolved Hide resolved
- python>=3.9,<3.11
- pip
- snakemake-minimal
- pandas>=1.1.0,<1.3
- pandas>=1.1.0
- numpy
- beautifulsoup4
- xlrd
- scipy
- openpyxl<=3.0.9
- openpyxl<=3.1.0
- packaging

- pip:
Expand Down
Binary file not shown.
1,836 changes: 918 additions & 918 deletions outputs/costs_2020.csv

Large diffs are not rendered by default.

1,836 changes: 918 additions & 918 deletions outputs/costs_2025.csv

Large diffs are not rendered by default.

1,836 changes: 918 additions & 918 deletions outputs/costs_2030.csv

Large diffs are not rendered by default.

1,836 changes: 918 additions & 918 deletions outputs/costs_2035.csv

Large diffs are not rendered by default.

1,836 changes: 918 additions & 918 deletions outputs/costs_2040.csv

Large diffs are not rendered by default.

1,836 changes: 918 additions & 918 deletions outputs/costs_2045.csv

Large diffs are not rendered by default.

1,836 changes: 918 additions & 918 deletions outputs/costs_2050.csv

Large diffs are not rendered by default.

178 changes: 132 additions & 46 deletions scripts/compile_cost_assumptions.py

Large diffs are not rendered by default.

Loading