Merge october 13

.github/workflows/test.yaml

@@ -69,7 +69,6 @@ jobs:
         path: |
           data
           cutouts
-          data/ariadne_database.csv
         key: data-cutouts-${{ env.WEEK }}
 
     - uses: conda-incubator/setup-miniconda@v3

.pre-commit-config.yaml

@@ -43,7 +43,7 @@ repos:
   rev: v2.15.0
   hooks:
   - id: pretty-format-yaml
-    exclude: (pinned\.yaml|\.lock\.yaml)$
+    exclude: (\.lock\.yaml)$
     args: [--autofix, --indent, "2", --preserve-quotes]
 
   # Format Snakemake rule / workflow files

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
-- Simplified IIASA database download
+
+- Added the IIASA database to the repository and disabled re-downloading it by default.
+- Simplified IIASA database download, rename `iiasa_database` config section to `pypsa-de`
+- Updated technology-data to v0.13.4
 - Bugfix: Enforce stricter H2 derivative import limit to avoid that exports of one type of derivative compensate for imports of another
 - Added an option to source mobility demand from UBA MWMS (Projektionsbericht 2025) for the years 2025-2035
 - Renamed functions and script for exogenous mobility demand

README.md

@@ -87,6 +87,15 @@ PyPSA-DE is a softfork of PyPSA-EUR. As such, large parts of the functionality a
 - `co2_budget_DE_source` specify the carbon trajectory for Germany: Following the projections of the Umweltbundestamt (`UBA`) or targeting net zero with the Klimaschutzgesetz(`KSG`)
 - `costs:NEP` and `costs:transmission` - specify which year of the Netzentwicklungsplan should be used as basis for the transmission line costs (`2021,2023`) and if new HVDC links should be built with `overhead` or `underground` cables
 
+## Data sources
+
+`ariadne-data/ariadne-database.csv`
+
+* **Source:** Kopernikus Projekt Ariadne
+* **Link:** [Szenarien-Explorer](https://ariadne2.apps.ece.iiasa.ac.at/explorer)
+* **License:** CC-BY 4.0
+* **Description:** Results from the [Ariadne Report: Die Energiewende kosteneffizient gestalten](https://ariadneprojekt.de/publikation/report-szenarien-zur-klimaneutralitat-2045/)
+
 ## License
 
 The code in this repo is MIT licensed, see `./LICENSE.md`.

Snakefile

@@ -327,7 +327,7 @@ rule modify_cost_data:
         "scripts/pypsa-de/modify_cost_data.py"
 
 
-if config["enable"]["retrieve"]:
+if config["pypsa-de"]["retrieve_ariadne_database"]:
 
     rule retrieve_ariadne_database:
         output:
@@ -339,6 +339,12 @@ if config["enable"]["retrieve"]:
         script:
             "scripts/pypsa-de/retrieve_ariadne_database.py"
 
+def get_ariadne_database(w):
+    if config["pypsa-de"]["retrieve_ariadne_database"]:
+        return "data/ariadne_database.csv"
+    else:
+        return "ariadne-data/ariadne_database.csv"
+
 
 if config["enable"]["retrieve"]:
 
@@ -401,7 +407,7 @@ rule build_exogenous_mobility_data:
         aviation_demand_factor=config_provider("sector", "aviation_demand_factor"),
         energy_totals_year=config_provider("energy", "energy_totals_year"),
     input:
-        ariadne="data/ariadne_database.csv",
+        ariadne=get_ariadne_database,
         energy_totals=resources("energy_totals.csv"),
     output:
         mobility_data=resources(
@@ -631,7 +637,7 @@ ruleorder: modify_industry_demand > build_industrial_production_per_country_tomo
 
 rule modify_existing_heating:
     input:
-        ariadne="data/ariadne_database.csv",
+        ariadne=get_ariadne_database,
         existing_heating="data/existing_infrastructure/existing_heating_raw.csv",
     output:
         existing_heating=resources("existing_heating.csv"),
@@ -673,7 +679,7 @@ rule modify_industry_demand:
     params:
         reference_scenario=config_provider("pypsa-de", "reference_scenario"),
     input:
-        ariadne="data/ariadne_database.csv",
+        ariadne=get_ariadne_database,
         industrial_production_per_country_tomorrow=resources(
             "industrial_production_per_country_tomorrow_{planning_horizons}.csv"
         ),
@@ -798,7 +804,7 @@ rule plot_ariadne_variables:
         reference_scenario=config_provider("pypsa-de", "reference_scenario"),
     input:
         exported_variables_full=RESULTS + "ariadne/exported_variables_full.xlsx",
-        ariadne_database="data/ariadne_database.csv",
+        ariadne_database=get_ariadne_database,
     output:
         primary_energy=RESULTS + "ariadne/primary_energy.png",
         primary_energy_detailed=RESULTS + "ariadne/primary_energy_detailed.png",
@@ -865,7 +871,7 @@ rule build_scenarios:
         scenarios=config["run"]["name"],
         leitmodelle=config["pypsa-de"]["leitmodelle"],
     input:
-        ariadne_database="data/ariadne_database.csv",
+        ariadne_database=get_ariadne_database,
         scenario_yaml=config["run"]["scenarios"]["manual_file"],
     output:
         scenario_yaml=config["run"]["scenarios"]["file"],