remove /bundle

rules/build_sector.smk

@@ -282,7 +282,7 @@ rule build_energy_totals:
         co2="data/bundle/eea/UNFCCC_v23.csv",
         swiss="data/switzerland-new_format-all_years.csv",
         swiss_transport="data/gr-e-11.03.02.01.01-cc.csv",
-        idees="data/bundle/jrc-idees-2021",
+        idees="data/jrc-idees-2021",
         district_heat_share="data/district_heat_share.csv",
         eurostat="data/eurostat/Balances-April2023",
         eurostat_households="data/eurostat/eurostat-household_energy_balances-february_2024.csv",
@@ -453,7 +453,7 @@ rule build_industry_sector_ratios:
         ammonia=config_provider("sector", "ammonia", default=False),
     input:
         ammonia_production=resources("ammonia_production.csv"),
-        idees="data/bundle/jrc-idees-2021",
+        idees="data/jrc-idees-2021",
     output:
         industry_sector_ratios=resources("industry_sector_ratios.csv"),
     threads: 1
@@ -503,7 +503,7 @@ rule build_industrial_production_per_country:
         countries=config_provider("countries"),
     input:
         ammonia_production=resources("ammonia_production.csv"),
-        jrc="data/bundle/jrc-idees-2021",
+        jrc="data/jrc-idees-2021",
         eurostat="data/eurostat/Balances-April2023",
     output:
         industrial_production_per_country=resources(
@@ -650,7 +650,7 @@ rule build_industrial_energy_demand_per_country_today:
         countries=config_provider("countries"),
         industry=config_provider("industry"),
     input:
-        jrc="data/bundle/jrc-idees-2021",
+        jrc="data/jrc-idees-2021",
         industrial_production_per_country=resources(
             "industrial_production_per_country.csv"
         ),

scripts/build_energy_totals.py

@@ -25,7 +25,7 @@ Inputs
 - `data/bundle/eea_UNFCCC_v23.csv`: CO2 emissions data from EEA.
 - `data/switzerland-new_format-all_years.csv`: Swiss energy data.
 - `data/gr-e-11.03.02.01.01-cc.csv`: Swiss transport data
-- `data/bundle/jrc-idees`: JRC IDEES data.
+- `data/jrc-idees`: JRC IDEES data.
 - `data/district_heat_share.csv`: District heating shares.
 - `data/eurostat/Balances-April2023`: Eurostat energy balances.
 - `data/eurostat/eurostat-household_energy_balances-february_2024.csv`: Eurostat household energy balances.
@@ -496,8 +496,6 @@ def idees_per_country(ct: str, base_dir: str) -> pd.DataFrame:
     assert df.index[7] == "International - Extra-EEAwUK"
     ct_totals["total international aviation passenger"] = df.iloc[[6, 7]].sum()
 
-    # TODO freight changed from "Domestic and International - Intra-EU" -> split
-    # domestic and international (intra-EU and outside EU)
     assert df.index[9] == "Domestic"
     ct_totals["total domestic aviation freight"] = df.iloc[9]
 

scripts/build_industrial_energy_demand_per_country_today.py

@@ -8,7 +8,7 @@ Build industrial energy demand per country.
 Inputs
 -------
 
-- ``data/bundle/jrc-idees-2021``
+- ``data/jrc-idees-2021``
 - ``industrial_production_per_country.csv``
 
 Outputs