Merge pull request #553 from quintel/european-datasets

New country datasets NO, CH, RS, GB
quintel · Oct 29, 2024 · 51bf0db · 51bf0db
2 parents ded9bc3 + 0b36eda
commit 51bf0db
Show file tree

Hide file tree

Showing 66 changed files with 15,939 additions and 309 deletions.
diff --git a/app/lib/dataset_source/entso/file.rb b/app/lib/dataset_source/entso/file.rb
@@ -28,7 +28,8 @@ def self.energy_balance(csv_table)
       end
 
       def self.from_dataset(dataset)
-        base_path = Rails.root.join('data', 'datasets', "#{dataset.geo_id}_energy_balance_enriched")
+        base_path = Rails.root.join('data', 'datasets', 'energy_balance',
+          "#{dataset.geo_id}_energy_balance_enriched")
         paths = ["#{base_path}.csv", "#{base_path}.encrypted.csv"]
 
         path = paths.find { |p| ::File.exist?(p) }

diff --git a/config/interface_elements/agriculture/agriculture_heat_chp.yml b/config/interface_elements/agriculture/agriculture_heat_chp.yml
@@ -5,13 +5,7 @@ groups:
     items:
       - key: agriculture_chp_engine_network_gas_dispatchable_demand
         unit: 'TJ'
-        entso: |
-          EB("Gas motor CHP - agricultural", "Network gas")
       - key: agriculture_chp_engine_biogas_demand
         unit: 'TJ'
-        entso: |
-          EB("Biogas CHP - agricultural", "Biogases")
       - key: agriculture_chp_wood_pellets_demand
         unit: 'TJ'
-        entso: |
-          EB("Biomass CHP - agricultural", "Biogases")
diff --git a/config/interface_elements/buildings/buildings_energy_supply.yml b/config/interface_elements/buildings/buildings_energy_supply.yml
@@ -4,8 +4,6 @@ groups:
     items:
       - key: input_buildings_solar_pv_demand
         unit: 'TJ'
-        entso: |
-          EB("Solar on roof buildings", "Electricity")
       - key: buildings_final_demand_solar_thermal_demand
         unit: 'TJ'
         entso: |

diff --git a/config/interface_elements/energy/energy_efficiency.yml b/config/interface_elements/energy/energy_efficiency.yml
diff --git a/config/interface_elements/energy/energy_fossil_electricity_production.yml b/config/interface_elements/energy/energy_fossil_electricity_production.yml
@@ -4,12 +4,8 @@ groups:
     items:
       - key: input_energy_power_ultra_supercritical_coal_production
         unit: 'TJ'
-        entso: |
-          EB("Coal pulverized", "Electricity")
       - key: input_energy_power_supercritical_coal_production
         unit: 'TJ'
-        entso: |
-          EB("Coal conventional", "Electricity")
       - key: input_energy_power_combined_cycle_coal_production
         unit: 'TJ'
       - key: input_energy_power_ultra_supercritical_cofiring_coal_production
@@ -20,8 +16,6 @@ groups:
         unit: 'TJ'
       - key: input_energy_chp_ultra_supercritical_ht_coal_production
         unit: 'TJ'
-        entso: |
-          EB("Coal plant for district heat (CHP)", "Electricity")
       - key: input_energy_chp_ultra_supercritical_mt_coal_production
         unit: 'TJ'
       - key: input_energy_chp_ultra_supercritical_cofiring_ht_coal_production
@@ -30,12 +24,8 @@ groups:
         unit: 'TJ'
       - key: input_energy_power_ultra_supercritical_lignite_production
         unit: 'TJ'
-        entso: |
-          EB("Lignite plant", "Electricity")
       - key: input_energy_chp_ultra_supercritical_ht_lignite_production
         unit: 'TJ'
-        entso: |
-          EB("Lignite plant for district heat (CHP)", "Electricity")
       - key: input_energy_chp_ultra_supercritical_mt_lignite_production
         unit: 'TJ'
       - key: input_energy_power_ultra_supercritical_oxyfuel_ccs_lignite_production
@@ -45,44 +35,30 @@ groups:
     items:
       - key: input_energy_power_ultra_supercritical_network_gas_production
         unit: 'TJ'
-        entso: |
-          EB("Gas conventional", "Electricity")
       - key: input_energy_power_turbine_network_gas_production
         unit: 'TJ'
-        entso: |
-          EB("Gas turbine", "Electricity")
       - key: input_energy_power_engine_network_gas_production
         unit: 'TJ'
       - key: input_energy_power_combined_cycle_network_gas_production
         unit: 'TJ'
-        entso: |
-          EB("Gas CCGT", "Electricity")
       - key: input_energy_power_combined_cycle_ccs_network_gas_production
         unit: 'TJ'
       - key: input_energy_chp_combined_cycle_ht_network_gas_production
         unit: 'TJ'
-        entso: |
-          EB("Large-scale gas plant for district heat (CHP)", "Electricity")
       - key: input_energy_chp_combined_cycle_mt_network_gas_production
         unit: 'TJ'
       - key: input_energy_chp_local_engine_ht_network_gas_production
         unit: 'TJ'
-        entso: |
-          EB("Small-scale gas plant for district heat (CHP)", "Electricity")
       - key: input_energy_chp_local_engine_mt_network_gas_production
         unit: 'TJ'
 
   - header: energy_electricity_other_fossil
     items:
       - key: input_energy_power_nuclear_gen2_uranium_oxide_production
         unit: 'TJ'
-        entso: |
-          EB("Nuclear conventional", "Electricity")
       - key: input_energy_power_nuclear_gen3_uranium_oxide_production
         unit: 'TJ'
       - key: input_energy_power_ultra_supercritical_crude_oil_production
         unit: 'TJ'
-        entso: |
-          EB("Oil-fired plant", "Electricity")
       - key: input_energy_power_engine_diesel_production
         unit: 'TJ'
diff --git a/config/interface_elements/energy/energy_heat_production.yml b/config/interface_elements/energy/energy_heat_production.yml
@@ -16,8 +16,6 @@ groups:
     items:
       - key: input_energy_heat_burner_ht_wood_pellets_production
         unit: 'TJ'
-        entso: |
-          EB("Biomass heater", "Heat")
       - key: input_energy_heat_burner_mt_wood_pellets_production
         unit: 'TJ'
 
@@ -26,8 +24,6 @@ groups:
     items:
       - key: input_energy_heat_burner_ht_coal_production
         unit: 'TJ'
-        entso: |
-          EB("Coal heater - industrial", "Heat")
       - key: input_energy_heat_burner_mt_coal_production
         unit: 'TJ'
 
@@ -36,8 +32,6 @@ groups:
     items:
       - key: input_energy_heat_burner_ht_crude_oil_production
         unit: 'TJ'
-        entso: |
-          EB("Oil heater - industrial", "Heat")
       - key: input_energy_heat_burner_mt_crude_oil_production
         unit: 'TJ'
 
@@ -62,8 +56,6 @@ groups:
     items:
       - key: input_energy_heat_well_deep_ht_geothermal_production
         unit: 'TJ' 
-        entso: |
-          EB("Geothermal - residential", "Heat")
       - key: input_energy_heat_well_deep_mt_geothermal_production
         unit: 'TJ'
       - key: input_energy_heat_well_shallow_heatpump_mt_geothermal_production
@@ -86,8 +78,6 @@ groups:
     items:
       - key: input_energy_heat_burner_ht_network_gas_production
         unit: 'TJ'
-        entso: |
-          EB("Gas heater", "Heat")
       - key: input_energy_heat_burner_mt_network_gas_production
         unit: 'TJ'
 
@@ -96,8 +86,6 @@ groups:
     items:
       - key: input_energy_heat_solar_ht_solar_thermal_production
         unit: 'TJ'
-        entso: |
-          EB("Solar thermal", "Heat")
       - key: input_energy_heat_solar_mt_solar_thermal_production
         unit: 'TJ'
       - key: input_energy_heat_solar_lt_solar_thermal_production
@@ -108,8 +96,6 @@ groups:
     items:
       - key: input_energy_heat_burner_ht_waste_mix_production
         unit: 'TJ'
-        entso: |
-          EB("Waste heater", "Heat")
       - key: input_energy_heat_burner_mt_waste_mix_production
         unit: 'TJ'
 

diff --git a/config/interface_elements/energy/energy_renewable_electricity_production.yml b/config/interface_elements/energy/energy_renewable_electricity_production.yml
@@ -4,36 +4,24 @@ groups:
     items:
       - key: input_energy_power_wind_turbine_inland_production
         unit: 'TJ'
-        entso: |
-          EB("Wind onshore", "Electricity")
       - key: input_energy_power_wind_turbine_coastal_production
         unit: 'TJ'
       - key: input_energy_power_wind_turbine_offshore_production
         unit: 'TJ'
-        entso: |
-          EB("Wind offshore", "Electricity")
 
   - header: energy_electricity_solar
     items:
       - key: input_energy_power_solar_pv_solar_radiation_production
         unit: 'TJ'
-        entso: |
-          EB("Solar pv plant", "Electricity")
       - key: input_energy_power_solar_csp_solar_radiation_production
         unit: 'TJ'
-        entso: |
-          EB("Concentrated solar plant", "Electricity")
 
   - header: energy_electricity_waste
     items:
       - key: input_energy_power_supercritical_waste_mix_production
         unit: 'TJ'
-        entso: |
-          EB("Waste incinerator", "Electricity")
       - key: input_energy_chp_supercritical_ht_waste_mix_production
         unit: 'TJ'
-        entso: |
-          EB("Waste CHP", "Electricity")
       - key: input_energy_chp_supercritical_mt_waste_mix_production
         unit: 'TJ'
       - key: input_energy_power_supercritical_ccs_waste_mix_production
@@ -43,24 +31,16 @@ groups:
     items:
       - key: input_energy_chp_local_ht_wood_pellets_production
         unit: 'TJ'
-        entso: |
-          EB("Biomass CHP - residential", "Electricity")
       - key: input_energy_chp_local_mt_wood_pellets_production
         unit: 'TJ'
       - key: input_energy_chp_local_engine_ht_biogas_production
         unit: 'TJ'
-        entso: |
-          EB("Biogas CHP", "Electricity")
       - key: input_energy_chp_local_engine_mt_biogas_production
         unit: 'TJ'
       - key: input_energy_power_hydro_river_production
         unit: 'TJ'
-        entso: |
-          EB("Hydro river", "Electricity")
       - key: input_energy_power_hydro_mountain_production
         unit: 'TJ'
-        entso: |
-          EB("Hydro mountain", "Electricity")
       - key: input_energy_power_geothermal_production
         unit: 'TJ'
         # Open issue: this plant is not included in the energy balance anymore and has to be included again
diff --git a/config/interface_elements/households/households_energy_supply.yml b/config/interface_elements/households/households_energy_supply.yml
@@ -4,8 +4,6 @@ groups:
     items:
       - key: input_households_solar_pv_demand
         unit: 'TJ'
-        entso: |
-          EB("Solar on roof households", "Electricity")
       - key: households_final_demand_solar_thermal_demand
         unit: 'TJ'
         entso: |

diff --git a/config/interface_elements/industry/industry_heat_chp.yml b/config/interface_elements/industry/industry_heat_chp.yml
@@ -5,42 +5,24 @@ groups:
     items:
       - key: industry_chp_combined_cycle_gas_power_fuelmix_demand
         unit: 'TJ'
-        entso: |
-          EB("Gas CHP (CCGT)", "Fuelmix")
       - key: industry_chp_engine_gas_power_fuelmix_demand
         unit: 'TJ'
-        entso: |
-          EB("Gas motor CHP", "Fuelmix")
       - key: industry_chp_turbine_gas_power_fuelmix_demand
         unit: 'TJ'
-        entso: |
-          EB("Gas Turbine CHP", "Fuelmix")
       - key: industry_chp_ultra_supercritical_coal_demand
         unit: 'TJ'
-        entso: |
-          EB("Coal CHP", "Coal")
       - key: industry_chp_wood_pellets_demand
         unit: 'TJ'
-        entso: |
-          EB("Biomass CHP - industrial", "Primary solid biofuels")
       - key: industry_chp_turbine_hydrogen_demand
         unit: 'TJ'
       - key: industry_heat_burner_lignite_demand
         unit: 'TJ'
-        entso: |
-          EB("Lignite heater", "Lignite and peat")
       - key: industry_heat_burner_coal_demand
         unit: 'TJ'
-        entso: |
-          EB("Coal heater - industrial", "Coal")
       - key: industry_heat_well_geothermal_demand
         unit: 'TJ'
-        entso: |
-          EB("Geothermal - industrial", "Geothermal")
       - key: industry_heat_burner_crude_oil_demand
         unit: 'TJ'
-        entso: |
-          EB("Oil heater - industrial", "Oil")
       - key: industry_heat_burner_hydrogen_demand
         unit: 'TJ'
 
@@ -50,22 +32,10 @@ groups:
     items:
       - key: input_share_mixer_gas_fuel_bio_oil
         unit: '%'
-        entso: |
-          IF((EB("Gas CHP (CCGT)", "Fuelmix") + EB("Gas motor CHP", "Fuelmix") + EB("Gas Turbine CHP", "Fuelmix")) > 0.0,
-          -> { (EB("Gas CHP (CCGT)", "Renewable oil") + EB("Gas motor CHP", "Renewable oil") + EB("Gas Turbine CHP", "Renewable oil")) / (EB("Gas CHP (CCGT)", "Fuelmix") + EB("Gas motor CHP", "Fuelmix") + EB("Gas Turbine CHP", "Fuelmix")) },
-          -> { 0.0 })
       - key: input_share_mixer_gas_fuel_oil
         unit: '%'
-        entso: |
-          IF((EB("Gas CHP (CCGT)", "Fuelmix") + EB("Gas motor CHP", "Fuelmix") + EB("Gas Turbine CHP", "Fuelmix")) > 0.0,
-          -> { (EB("Gas CHP (CCGT)", "Fossil oil") + EB("Gas motor CHP", "Fossil oil") + EB("Gas Turbine CHP", "Fossil oil")) / (EB("Gas CHP (CCGT)", "Fuelmix") + EB("Gas motor CHP", "Fuelmix") + EB("Gas Turbine CHP", "Fuelmix")) },
-          -> { 0.0 })
       - key: input_share_mixer_gas_fuel_network_gas
         unit: '%'
-        entso: |
-          IF((EB("Gas CHP (CCGT)", "Fuelmix") + EB("Gas motor CHP", "Fuelmix") + EB("Gas Turbine CHP", "Fuelmix")) > 0.0,
-          -> { (EB("Gas CHP (CCGT)", "Network gas") + EB("Gas motor CHP", "Network gas") + EB("Gas Turbine CHP", "Network gas")) / (EB("Gas CHP (CCGT)", "Fuelmix") + EB("Gas motor CHP", "Fuelmix") + EB("Gas Turbine CHP", "Fuelmix")) },
-          -> { 1.0 })
         flexible: true
         skip_validation: true
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -125,6 +125,9 @@ en:
     se: Sweden
     sg: Singapore
     si: Slovenia
+    no: Norway
+    rs: Serbia
+    ch: Switzerland
     gb: Great Britain
     any: All countries
 

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
@@ -50,6 +50,9 @@ nl:
     se: Zweden
     si: Slovenië
     sg: Singapore
+    no: Noorwegen
+    rs: Servië
+    ch: Zwitserland
     gb: Groot-Brittannië
     any: Alle landen
 

diff --git a/data/datasets/AT_energy_balance_enriched.csv → ...gy_balance/AT_energy_balance_enriched.csv b/data/datasets/AT_energy_balance_enriched.csv → ...gy_balance/AT_energy_balance_enriched.csv
diff --git a/data/datasets/BE_energy_balance_enriched.csv → ...gy_balance/BE_energy_balance_enriched.csv b/data/datasets/BE_energy_balance_enriched.csv → ...gy_balance/BE_energy_balance_enriched.csv
diff --git a/data/datasets/BG_energy_balance_enriched.csv → ...gy_balance/BG_energy_balance_enriched.csv b/data/datasets/BG_energy_balance_enriched.csv → ...gy_balance/BG_energy_balance_enriched.csv