Merge branch 'main' into custom_powerplants_fix

pypsa-meets-earth · Jan 4, 2025 · c5778dc · c5778dc
2 parents c3a1eb1 + 5b9ac30
commit c5778dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Snakefile b/Snakefile
@@ -1358,6 +1358,7 @@ rule build_base_energy_totals:
         unsd_paths="data/demand/unsd/paths/Energy_Statistics_Database.xlsx",
     output:
         energy_totals_base="resources/" + SECDIR + "energy_totals_base.csv",
+        unsd_export_path=directory("data/demand/unsd/data/"),
     script:
         "scripts/build_base_energy_totals.py"
 
@@ -1877,7 +1878,7 @@ rule build_base_industry_totals:  #default data
     input:
         #os.path.dirname(snakemake.input["transactions_path"]) + "/demand/unsd/data/"
         #industrial_production_per_country="data/industrial_production_per_country.csv",
-        unsd_path="data/demand/unsd/data/",
+        unsd_export_path="data/demand/unsd/data/",
         energy_totals_base="resources/" + SECDIR + "energy_totals_base.csv",
         transactions_path="data/unsd_transactions.csv",
     output:

diff --git a/scripts/build_base_industry_totals.py b/scripts/build_base_industry_totals.py
@@ -117,7 +117,7 @@ def create_industry_base_totals(df):
     renaming_dit = transaction.set_index("Transaction")["clean_name"].to_dict()
     clean_industry_list = list(transaction.clean_name.unique())
 
-    unsd_path = snakemake.input.unsd_path
+    unsd_path = snakemake.input.unsd_export_path
 
     # Get the files from the path provided in the OP
     all_files = list(Path(unsd_path).glob("*.txt"))