nismod · tomalrussell · Mar 27, 2019 · Mar 26, 2019 · Mar 26, 2019 · Mar 27, 2019
diff --git a/config/dimensions/es_fuel_types.yml b/config/dimensions/es_fuel_types.yml
@@ -0,0 +1,3 @@
+name: es_fuel_types
+description: Fuel types used in the energy supply model
+elements: es_fuel_types.csv
diff --git a/config/model_runs/energy_supply_agent.yml b/config/model_runs/energy_supply_agent.yml
@@ -1,5 +1,5 @@
 scenarios:
-  es_prices: es_prices_dummy
+  fuel_price: baseline
   dummy_energy_demands_minimal: es_energy_demand_minimal
 sos_model: energy_supply_toy
 name: energy_supply_agent

diff --git a/config/model_runs/energy_supply_demand.yml b/config/model_runs/energy_supply_demand.yml
@@ -5,7 +5,7 @@ narratives:
   load_shedding:
   - high_cost
 scenarios:
-  es_prices: es_prices_dummy
+  fuel_price: baseline
   gva: gva_baseline
   population: pop_baseline
   temperature: NF1

diff --git a/config/model_runs/energy_supply_minimal.yml b/config/model_runs/energy_supply_minimal.yml
@@ -4,7 +4,7 @@ narratives:
   load_shedding:
   - high_cost
 scenarios:
-  es_prices: es_prices_dummy
+  fuel_price: baseline
   dummy_energy_demands_minimal: es_energy_demand_minimal
 sos_model: energy_supply_toy
 stamp: '2018-01-31T10:10:41.791Z'

diff --git a/config/model_runs/energy_supply_test.yml b/config/model_runs/energy_supply_test.yml
@@ -4,7 +4,7 @@ narratives:
   load_shedding:
   - high_cost
 scenarios:
-  es_prices: es_prices_dummy
+  fuel_price: baseline
   dummy_energy_demands_full: es_energy_demand_dummy_full
 sos_model: energy_supply_only
 stamp: '2018-01-31T10:10:41.791Z'

diff --git a/config/model_runs/energy_supply_toy.yml b/config/model_runs/energy_supply_toy.yml
diff --git a/config/scenarios/es_prices.yml b/config/scenarios/es_prices.yml
diff --git a/config/scenarios/fuel_price.yml b/config/scenarios/fuel_price.yml
@@ -6,12 +6,20 @@ provides:
       - transport_fuel_type
     dtype: float
     unit: £/l
-  - name: fuel_price_electricity
+  - name: tr_fuel_price_electricity
     dtype: float
     unit: £/kWh
+  - name: energy_supply_price
+    description: ''
+    dims:
+      - seasons
+      - es_fuel_types
+    dtype: float
+    unit: GBP/MWh
 variants:
   - name: baseline
     description: Baseline fuel price projections
     data:
       fuel_price: transport_fuel_price.csv
       fuel_price_electricity: transport_fuel_price_electricity.csv
+      energy_supply_price: energy_supply_price.csv
diff --git a/config/sector_models/energy_supply.yml b/config/sector_models/energy_supply.yml
@@ -52,34 +52,10 @@ inputs:
   - seasonal_week
   unit: MW
   dtype: float
-- name: cost_of_carbon
+- name: fuel_price
   dims:
-  - seasons
-  unit: GBP/Mt
-  dtype: float
-- name: electricity_price
-  dims:
-  - seasons
-  unit: GBP/MWh
-  dtype: float
-- name: gas_price
-  dims:
-  - seasons
-  unit: GBP/MWh
-  dtype: float
-- name: nuclearFuel_price
-  dims:
-  - seasons
-  unit: GBP/MWh
-  dtype: float
-- name: oil_price
-  dims:
-  - seasons
-  unit: GBP/MWh
-  dtype: float
-- name: coal_price
-  dims:
-  - seasons
+    - seasons
+    - es_fuel_types
   unit: GBP/MWh
   dtype: float
 interventions:

diff --git a/config/sector_models/energy_supply_toy.yml b/config/sector_models/energy_supply_toy.yml
@@ -1,6 +1,6 @@
 path: models/energy_supply/energy_supply.py
 description: Toy version of the CGEN++ energy supply model which uses minimal data
-classname: EnergySupplyToyWrapper
+classname: EnergySupplyWrapper
 initial_conditions:
 - ../energy_supply/initial_conditions/historical_interventions_minimal.csv
 parameters:
@@ -73,35 +73,11 @@ inputs:
   - energy_hub_min
   - seasonal_week
   dtype: float
-- name: cost_of_carbon
-  unit: GBP/Mt
+- name: fuel_price
   dims:
-  - seasons
-  dtype: float
-- name: electricity_price
-  unit: GBP/MWh
-  dims:
-  - seasons
-  dtype: float
-- name: gas_price
-  unit: GBP/MWh
-  dims:
-  - seasons
-  dtype: float
-- name: nuclearFuel_price
+    - seasons
+    - es_fuel_types
   unit: GBP/MWh
-  dims:
-  - seasons
-  dtype: float
-- name: oil_price
-  unit: GBP/MWh
-  dims:
-  - seasons
-  dtype: float
-- name: coal_price
-  unit: GBP/MWh
-  dims:
-  - seasons
   dtype: float
 outputs:
 - name: gasfired_gen_tran

diff --git a/config/sos_models/energy_supply_demand.yml b/config/sos_models/energy_supply_demand.yml
@@ -1,4 +1,5 @@
 scenarios:
+  - fuel_price
   - gva
   - population
   - temperature
@@ -569,29 +570,9 @@ scenario_dependencies:
   sink_input: gva_per_head
   source_output: gva_per_head
 - sink: energy_supply
-  source: es_prices
-  sink_input: gas_price
-  source_output: gas_price
-- sink: energy_supply
-  source: es_prices
-  sink_input: electricity_price
-  source_output: electricity_price
-- sink: energy_supply
-  source: es_prices
-  sink_input: oil_price
-  source_output: oil_price
-- sink: energy_supply
-  source: es_prices
-  sink_input: coal_price
-  source_output: coal_price
-- sink: energy_supply
-  source: es_prices
-  sink_input: nuclearFuel_price
-  source_output: nuclearFuel_price
-- sink: energy_supply
-  source: es_prices
-  sink_input: cost_of_carbon
-  source_output: cost_of_carbon
+  source: fuel_price
+  sink_input: fuel_price
+  source_output: energy_supply_price
 - sink: energy_demand_constrained
   source: gva
   sink_input: gva_per_sector

diff --git a/config/sos_models/energy_supply_only.yml b/config/sos_models/energy_supply_only.yml
@@ -6,7 +6,7 @@ narratives:
       LoadShed_gas: ../../data/energy_supply/narratives/high_load_shed.csv
     description: very high cost load shedding
     name: high_cost
-  sos_model: energy_supply_toy
+  sos_model: energy_supply_only
   description: Costs of shedding load
   name: load_shedding
   provides:
@@ -15,29 +15,9 @@ narratives:
     - LoadShed_gas
 scenario_dependencies:
 - sink: energy_supply
-  source_output: gas_price
-  source: es_prices
-  sink_input: gas_price
-- sink: energy_supply
-  source_output: electricity_price
-  source: es_prices
-  sink_input: electricity_price
-- sink: energy_supply
-  source_output: oil_price
-  source: es_prices
-  sink_input: oil_price
-- sink: energy_supply
-  source_output: coal_price
-  source: es_prices
-  sink_input: coal_price
-- sink: energy_supply
-  source_output: nuclearFuel_price
-  source: es_prices
-  sink_input: nuclearFuel_price
-- sink: energy_supply
-  source_output: cost_of_carbon
-  source: es_prices
-  sink_input: cost_of_carbon
+  source_output: energy_supply_price
+  source: fuel_price
+  sink_input: fuel_price
 - sink: energy_supply
   source_output: residential_gas_non_heating
   source: dummy_energy_demands_full
@@ -76,5 +56,5 @@ sector_models:
 - energy_supply
 model_dependencies: []
 scenarios:
-- es_prices
+- fuel_price
 - dummy_energy_demands_full
diff --git a/config/sos_models/energy_supply_toy.yml b/config/sos_models/energy_supply_toy.yml
@@ -1,5 +1,5 @@
 scenarios:
-- es_prices
+- fuel_price
 - dummy_energy_demands_minimal
 description: Links the toy version of the energy supply model to dummy scenarios
 name: energy_supply_toy
@@ -18,30 +18,10 @@ narratives:
     - LoadShed_elec
     - LoadShed_gas
 scenario_dependencies:
-- source_output: gas_price
-  sink_input: gas_price
-  sink: energy_supply_toy
-  source: es_prices
-- source_output: electricity_price
-  sink_input: electricity_price
-  sink: energy_supply_toy
-  source: es_prices
-- source_output: oil_price
-  sink_input: oil_price
-  sink: energy_supply_toy
-  source: es_prices
-- source_output: coal_price
-  sink_input: coal_price
-  sink: energy_supply_toy
-  source: es_prices
-- source_output: nuclearFuel_price
-  sink_input: nuclearFuel_price
-  sink: energy_supply_toy
-  source: es_prices
-- source_output: cost_of_carbon
-  sink_input: cost_of_carbon
-  sink: energy_supply_toy
-  source: es_prices
+- sink: energy_supply_toy
+  source_output: energy_supply_price
+  source: fuel_price
+  sink_input: fuel_price
 - source_output: residential_gas_non_heating
   sink_input: residential_gas_non_heating
   sink: energy_supply_toy

diff --git a/data/dimensions/es_fuel_types.csv b/data/dimensions/es_fuel_types.csv
@@ -0,0 +1,6 @@
+name
+coal
+electricity
+gas
+nuclear
+oil
diff --git a/data/scenarios/energy_supply_price.csv b/data/scenarios/energy_supply_price.csv
@@ -0,0 +1,41 @@
+timestep,seasons,energy_supply_price,es_fuel_types
+2015,1,31.9,oil
+2015,2,26.1,oil
+2015,3,26.1,oil
+2015,4,29,oil
+2020,1,31.9,oil
+2020,2,26.1,oil
+2020,3,26.1,oil
+2020,4,29,oil
+2015,1,31.9,nuclear
+2015,2,26.1,nuclear
+2015,3,26.1,nuclear
+2015,4,29,nuclear
+2020,1,31.9,nuclear
+2020,2,26.1,nuclear
+2020,3,26.1,nuclear
+2020,4,29,nuclear
+2015,1,31.9,gas
+2015,2,26.1,gas
+2015,3,26.1,gas
+2015,4,29,gas
+2020,1,31.9,gas
+2020,2,26.1,gas
+2020,3,26.1,gas
+2020,4,29,gas
+2015,1,44,coal
+2015,2,44,coal
+2015,3,44,coal
+2015,4,44,coal
+2020,1,44,coal
+2020,2,44,coal
+2020,3,44,coal
+2020,4,44,coal
+2015,1,31.9,electricity
+2015,2,26.1,electricity
+2015,3,26.1,electricity
+2015,4,29,electricity
+2020,1,31.9,electricity
+2020,2,26.1,electricity
+2020,3,26.1,electricity
+2020,4,29,electricity