Skip to content

Commit 3c39918

Browse files
authored
Merge pull request #121 from PyPSA/cost-2020
Change reference cost year to 2020
2 parents bdfc3d0 + 11d382f commit 3c39918

13 files changed

+6565
-6481
lines changed

Snakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ configfile: "config.yaml"
44

55
rule compile_cost_assumptions:
66
input:
7+
inflation_rate = "inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx",
78
pypsa_costs = "inputs/costs_PyPSA.csv",
89
fraunhofer_costs = "inputs/Fraunhofer_ISE_costs.csv",
910
fraunhofer_energy_prices = "inputs/Fraunhofer_ISE_energy_prices.csv",

config.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@ years : [2020, 2025, 2030, 2035, 2040, 2045, 2050]
55

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

8-
rate_inflation : 0.02
9-
108
#year for EUR outputs
11-
#NB: 2015 is standard year in DEA, and DEA is NOT yet adjusted
12-
#if this is changed, only non-DEA
13-
# DEA takes for solar PV eur_year 2020!
14-
eur_year : 2015
9+
eur_year : 2020
1510

1611
# add solar from different source
1712
solar_utility_from_vartiaien : false

docs/release_notes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Release Notes
55
.. Upcoming Release
66
.. ================
77
8+
* 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>`_.
9+
810
Technology-Data 0.7.0 (7 February 2024)
911
=======================================
1012

environment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ channels:
33
- conda-forge
44
- bioconda
55
dependencies:
6-
- python>=3.9
6+
- python>=3.9,<3.11
77
- pip
88
- snakemake-minimal
9-
- pandas>=1.1.0,<1.3
9+
- pandas>=1.1.0
1010
- numpy
1111
- beautifulsoup4
1212
- xlrd
1313
- scipy
14-
- openpyxl<=3.0.9
14+
- openpyxl<=3.1.0
1515
- packaging
1616

1717
- pip:
22.8 KB
Binary file not shown.

outputs/costs_2020.csv

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

outputs/costs_2025.csv

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

outputs/costs_2030.csv

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

outputs/costs_2035.csv

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

outputs/costs_2040.csv

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

0 commit comments

Comments
 (0)