Merge pull request #127 from nismod/feature/es_ed_configs

Feature/es ed configs
nismod · Jul 9, 2019 · b3b2fd6 · b3b2fd6
2 parents 240e3b1 + ef69fbe
commit b3b2fd6
Show file tree

Hide file tree

Showing 28 changed files with 1,138 additions and 52 deletions.
diff --git a/config/dimensions/elec_intercon_countries.yml b/config/dimensions/elec_intercon_countries.yml
@@ -0,0 +1,3 @@
+name: elec_intercon_countries
+description: list of countries with electricity interconnection with GB
+elements: ../energy_supply/dimensions/elec_intercon_countries.csv
diff --git a/config/model_runs/arc_et__baseline.yml b/config/model_runs/arc_et__baseline.yml
@@ -11,6 +11,7 @@ scenarios:
   engine_type_fractions: baseline
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives: 
   operation_mode:
   - central

diff --git a/config/model_runs/arc_et__expansion.yml b/config/model_runs/arc_et__expansion.yml
@@ -11,6 +11,7 @@ scenarios:
   engine_type_fractions: baseline
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives: 
   operation_mode:
   - decentral

diff --git a/config/model_runs/arc_et__new-cities.yml b/config/model_runs/arc_et__new-cities.yml
@@ -11,6 +11,7 @@ scenarios:
   engine_type_fractions: baseline
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives:
   operation_mode:
   - central

diff --git a/config/model_runs/arc_et__unplanned.yml b/config/model_runs/arc_et__unplanned.yml
@@ -11,6 +11,7 @@ scenarios:
   engine_type_fractions: baseline
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives:
   operation_mode:
   - decentral

diff --git a/config/model_runs/arc_ets__baseline.yml b/config/model_runs/arc_ets__baseline.yml
@@ -9,6 +9,7 @@ scenarios:
   ev_transport_trips: arc_baseline
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives:
   operation_mode:
   - central

diff --git a/config/model_runs/arc_ets__expansion.yml b/config/model_runs/arc_ets__expansion.yml
@@ -9,6 +9,7 @@ scenarios:
   ev_transport_trips: arc_expansion
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives:
   operation_mode:
   - decentral

diff --git a/config/model_runs/arc_ets__new-cities.yml b/config/model_runs/arc_ets__new-cities.yml
@@ -9,6 +9,7 @@ scenarios:
   ev_transport_trips: arc_new-cities
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives:
   operation_mode:
   - central

diff --git a/config/model_runs/electricworld.yml b/config/model_runs/electricworld.yml
@@ -1,14 +1,15 @@
 name: electricworld
 stamp: ''
-description: ''
-sos_model: energy_sd_constrained
+description: 'electric world config with es-ed-et'
+sos_model: energy_transport-scenario
 scenarios:
   fuel_price: es_prices_electric_world
   socio-economic: itrc_high-dcc
   temperature: NF1
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
-  dummy_energy_demands_full: es_energy_demand_dummy_full
+  ev_transport_trips: electricworld
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives:
   load_shedding:
   - high_cost

diff --git a/config/model_runs/electricworld_decentral.yml b/config/model_runs/electricworld_decentral.yml
@@ -1,14 +1,15 @@
 name: electricworld_decentral
 stamp: ''
 description: ''
-sos_model: energy_sd_constrained
+sos_model: energy_transport-scenario
 scenarios:
   fuel_price: es_prices_electric_world
   socio-economic: itrc_high-dcc
   temperature: NF1
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
-  dummy_energy_demands_full: es_energy_demand_dummy_full
+  ev_transport_trips: electricworld
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives:
   load_shedding:
   - high_cost
@@ -31,6 +32,7 @@ strategies:
   - type: pre-specified-planning
     description: 'electric world'
     filename: ../energy_supply/strategies/electric_world.csv
+    model_name: energy_supply_constrained
 timesteps:
   - 2015
   - 2030

diff --git a/config/model_runs/energy_supply_constrained.yml b/config/model_runs/energy_supply_constrained.yml
@@ -10,6 +10,7 @@ scenarios:
   dummy_energy_demands_full: es_energy_demand_dummy_full
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 sos_model: energy_supply_constrained
 stamp: '2018-01-31T10:10:41.791Z'
 timesteps:

diff --git a/config/model_runs/energy_supply_optimised.yml b/config/model_runs/energy_supply_optimised.yml
@@ -3,10 +3,14 @@ name: energy_supply_optimised
 narratives:
   load_shedding:
   - high_cost
+  operation_mode:
+  - central
 scenarios:
   fuel_price: baseline
   dummy_energy_demands_full: es_energy_demand_dummy_full
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
+  biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 sos_model: energy_supply_optimised
 stamp: '2018-01-31T10:10:41.791Z'
 timesteps:

diff --git a/config/model_runs/energy_transport-scenario-unconstrained.yml b/config/model_runs/energy_transport-scenario-unconstrained.yml
@@ -0,0 +1,20 @@
+name: energy_transport-scenario-unconstrained
+stamp: '2019-04-23'
+description: 'Test model run for energy (supply-demand unconstrained) and et_module with transport energy demand scenario'
+sos_model: energy_transport-scenario-unconstrained
+scenarios:
+  fuel_price: baseline
+  socio-economic: itrc_baseline16
+  temperature: NF1
+  ev_transport_trips: electricworld
+  dummy_weather_inputs_full: es_dummy_weather_inputs_full
+  biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
+narratives: 
+  operation_mode:
+  - central
+strategies: []
+timesteps:
+  - 2015
+  - 2030
+  - 2050
diff --git a/config/model_runs/energy_transport-scenario.yml b/config/model_runs/energy_transport-scenario.yml
@@ -9,6 +9,7 @@ scenarios:
   ev_transport_trips: electricworld
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives: 
   operation_mode:
   - central

diff --git a/config/model_runs/multivector.yml b/config/model_runs/multivector.yml
@@ -1,14 +1,15 @@
 name: multivector
 stamp: ''
 description: ''
-sos_model: energy_sd_constrained
+sos_model: energy_transport-scenario
 scenarios:
   fuel_price: es_prices_multivector_world
   socio-economic: itrc_low-fcc
   temperature: NF1
-  dummy_energy_demands_full: es_energy_demand_dummy_full
+  ev_transport_trips: multivector
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives:
   load_shedding:
   - high_cost
@@ -31,6 +32,7 @@ strategies:
   - type: pre-specified-planning
     description: 'multi vector world'
     filename: ../energy_supply/strategies/multi_vector.csv
+    model_name: energy_supply_constrained
 timesteps:
   - 2015
   - 2030

diff --git a/config/model_runs/multivector_decentral.yml b/config/model_runs/multivector_decentral.yml
@@ -1,14 +1,15 @@
 name: multivector_decentral
 stamp: ''
 description: ''
-sos_model: energy_sd_constrained
+sos_model: energy_transport-scenario
 scenarios:
   fuel_price: es_prices_multivector_world
   socio-economic: itrc_low-fcc
   temperature: NF1
   dummy_weather_inputs_full: es_dummy_weather_inputs_full
-  dummy_energy_demands_full: es_energy_demand_dummy_full
+  ev_transport_trips: multivector
   biomass_waste_to_energy: es_biomass_waste_to_energy
+  elec_interconnector_prices : average_annual_prices
 narratives:
   load_shedding:
   - high_cost
@@ -31,6 +32,7 @@ strategies:
   - type: pre-specified-planning
     description: 'multi vector world'
     filename: ../energy_supply/strategies/multi_vector.csv
+    model_name: energy_supply_constrained
 timesteps:
   - 2015
   - 2030

diff --git a/config/scenarios/dummy_energy_demands_full.yml b/config/scenarios/dummy_energy_demands_full.yml
@@ -178,3 +178,53 @@ variants:
       dh_hydrogen_fuelcell : ../energy_supply/scenarios/energy_demand_full.csv
       elec_trans : ../energy_supply/scenarios/energy_demand_full.csv
       EV_Cap : ../energy_supply/scenarios/ev_cap.csv
+  - name: electricworld
+    description: ''
+    data:
+      elecload: ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      gasload: ../energy_supply/scenarios/EW/EW_energy_demand_gasload.csv
+      residential_heatload: ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      residential_gas_non_heating: ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      residential_electricity_non_heating: ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      service_heatload: ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      service_gas_non_heating: ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      service_electricity_non_heating: ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      hydrogen_non_heating: ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      building_biomass_boiler: ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      building_elec_boiler : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      building_heatpump : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      building_gas_boiler : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      building_hydrogen_boiler : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      building_hydrogen_heatpump : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      building_oil_boiler : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      dh_biomass_boiler : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      dh_elec_boiler : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      dh_gas_CHP : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      dh_hydrogen_fuelcell : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      elec_trans : ../energy_supply/scenarios/EW/EW_energy_demand_full.csv
+      EV_Cap : ../energy_supply/scenarios/EW/EW_ev_cap.csv
+  - name: multivector
+    description: ''
+    data:
+      elecload: ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      gasload: ../energy_supply/scenarios/MV/MV_energy_demand_gasload.csv
+      residential_heatload: ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      residential_gas_non_heating: ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      residential_electricity_non_heating: ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      service_heatload: ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      service_gas_non_heating: ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      service_electricity_non_heating: ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      hydrogen_non_heating: ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      building_biomass_boiler: ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      building_elec_boiler : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      building_heatpump : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      building_gas_boiler : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      building_hydrogen_boiler : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      building_hydrogen_heatpump : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      building_oil_boiler : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      dh_biomass_boiler : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      dh_elec_boiler : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      dh_gas_CHP : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      dh_hydrogen_fuelcell : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      elec_trans : ../energy_supply/scenarios/MV/MV_energy_demand_full.csv
+      EV_Cap : ../energy_supply/scenarios/MV/MV_ev_cap.csv
diff --git a/config/scenarios/elec_interconnector_prices.yml b/config/scenarios/elec_interconnector_prices.yml
@@ -0,0 +1,16 @@
+name: elec_interconnector_prices
+description: Annual prices for electricity interconnectors
+provides:
+  - name: elec_int
+    description: 'electricity interconnector prices'
+    dims:
+    - elec_intercon_countries
+    dtype: float
+    unit: £/MW
+
+variants:
+  - name: average_annual_prices
+    description: ''
+    data:
+      elec_int: ../energy_supply/scenarios/elec_interconnector_prices.csv
+
diff --git a/config/sector_models/energy_supply_constrained.yml b/config/sector_models/energy_supply_constrained.yml
@@ -164,6 +164,11 @@ inputs:
     - energy_hub
     unit: kg
     dtype: float
+  - name: elec_int
+    dims:
+    - elec_intercon_countries
+    unit: £/MW
+    dtype: float
 parameters:
   - description: cost of electricity load shedding
     name: LoadShed_elec
@@ -235,7 +240,13 @@ outputs:
     - seasonal_week
     unit: MW
     dtype: float
-  - name: tran_interconnector
+  - name: tran_int_import
+    dims:
+    - bus_bars
+    - seasonal_week
+    unit: MW
+    dtype: float
+  - name: tran_int_export
     dims:
     - bus_bars
     - seasonal_week
@@ -277,6 +288,12 @@ outputs:
     - seasonal_week
     unit: mcm
     dtype: float
+  - name: gas_shale
+    dims:
+    - national
+    - seasonal_week
+    unit: mcm
+    dtype: float
   - name: gas_storage_level
     dims:
     - energy_hub
@@ -678,4 +695,16 @@ outputs:
     - energy_hub
     - seasonal_week
     unit: MW
-    dtype: float
+    dtype: float
+  - name: e_uc
+    dims:
+    - national
+    - seasonal_week
+    unit: MW
+    dtype: float
+  - name: tran_gas_ccs
+    dims:
+    - bus_bars
+    - seasonal_week
+    unit: MW
+    dtype: float