Merge pull request #121 from PyPSA/cost-2020

Change reference cost year to 2020
PyPSA · Feb 19, 2024 · 3c39918 · 3c39918
2 parents bdfc3d0 + 11d382f
commit 3c39918
Show file tree

Hide file tree

Showing 13 changed files with 6,565 additions and 6,481 deletions.
diff --git a/Snakefile b/Snakefile
@@ -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",

diff --git a/config.yaml b/config.yaml
@@ -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

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -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)
 =======================================
 

diff --git a/environment.yaml b/environment.yaml
@@ -3,15 +3,15 @@ channels:
   - conda-forge
   - bioconda
 dependencies:
-  - python>=3.9
+  - 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:

diff --git a/inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx b/inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx
diff --git a/outputs/costs_2020.csv b/outputs/costs_2020.csv
diff --git a/outputs/costs_2025.csv b/outputs/costs_2025.csv
diff --git a/outputs/costs_2030.csv b/outputs/costs_2030.csv
diff --git a/outputs/costs_2035.csv b/outputs/costs_2035.csv
diff --git a/outputs/costs_2040.csv b/outputs/costs_2040.csv
diff --git a/outputs/costs_2045.csv b/outputs/costs_2045.csv
diff --git a/outputs/costs_2050.csv b/outputs/costs_2050.csv
diff --git a/scripts/compile_cost_assumptions.py b/scripts/compile_cost_assumptions.py