Merge pull request #69 from rl-institut/features/discern-central-dece…

…ntral-heat

Rearrange components and carriers

oemof_b3/config/colors.csv

@@ -26,6 +26,7 @@ Curtailment,#7f7f7f
 
 El. demand,#000000
 
+H2 Backpressure CHP,magenta
 CH4 Backpressure CHP,brown
 CH4 Extraction CHP,darkred
 

oemof_b3/config/labels.yml

@@ -16,6 +16,7 @@ heat-demand: Heat demand
 hydro-ror: Hydro ROR
 solar-pv: PV
 wind-onshore: Wind on
+h2-bpchp: H2 Backpressure CHP
 ch4-excess: CH4 Excess
 heat-excess: Heat Excess
-heat-storage: Heat Storage
+heat-storage: Heat Storage

oemof_b3/model/bus_attrs_update.yml

@@ -1,3 +1,11 @@
 h2:
   balanced:
-    False
+    False
+
+heat_central:
+  balanced:
+    True
+
+heat_decentral:
+  balanced:
+    True

oemof_b3/model/component_attrs_update.yml

@@ -6,6 +6,15 @@ ch4-demand:
     bus: ch4
     profile: ch4-demand-profile
 
+ch4-shortage:
+  carrier: ch4
+  tech: shortage
+  type: shortage
+  foreign_keys:
+    bus: ch4
+  defaults:
+    output_parameters: "{}"
+
 electricity-electrolyzer:
   carrier: electricity
   tech: electrolyzer
@@ -14,4 +23,115 @@ electricity-electrolyzer:
     from_bus: electricity
     to_bus: h2
   defaults:
-    output_parameters: "{}"
+    output_parameters: "{}"
+
+heat_central-demand:
+  carrier: heat_central
+  tech: demand
+  type: load
+  foreign_keys:
+    bus: heat_central
+    profile: heat_central-demand-profile
+
+heat_central-excess:
+  carrier: heat_central
+  tech: excess
+  type: excess
+  foreign_keys:
+    bus: heat_central
+  defaults:
+    marginal_cost: 0
+
+heat_central-shortage:
+  carrier: heat_central
+  tech: shortage
+  type: shortage
+  foreign_keys:
+    bus: heat_central
+  defaults:
+    output_parameters: "{}"
+
+heat_central-storage:
+  carrier: heat_central
+  tech: storage
+  type: storage
+  foreign_keys:
+    bus: heat_central
+  defaults:
+    input_parameters: "{}"
+    output_parameters: "{}"
+
+heat_decentral-demand:
+  carrier: heat_decentral
+  tech: demand
+  type: load
+  foreign_keys:
+    bus: heat_decentral
+    profile: heat_decentral-demand-profile
+
+heat_decentral-excess:
+  carrier: heat_decentral
+  tech: excess
+  type: excess
+  foreign_keys:
+    bus: heat_decentral
+  defaults:
+    marginal_cost: 0
+
+heat_decentral-shortage:
+  carrier: heat_decentral
+  tech: shortage
+  type: shortage
+  foreign_keys:
+    bus: heat_decentral
+  defaults:
+    output_parameters: "{}"
+
+heat_decentral-storage:
+  carrier: heat_decentral
+  tech: storage
+  type: storage
+  foreign_keys:
+    bus: heat_decentral
+  defaults:
+    input_parameters: "{}"
+    output_parameters: "{}"
+
+ch4-boiler:
+  carrier: ch4
+  tech: boiler
+  type: conversion
+  foreign_keys:
+    from_bus: ch4
+    to_bus: heat_central
+  defaults:
+    output_parameters: "{}"
+
+ch4-bpchp:
+  carrier: ch4
+  tech: bpchp
+  type: backpressure
+  foreign_keys:
+    fuel_bus: ch4
+    electricity_bus: electricity
+    heat_bus: heat_central
+
+h2-bpchp:
+  carrier: h2
+  tech: bpchp
+  type: backpressure
+  foreign_keys:
+    fuel_bus: h2
+    electricity_bus: electricity
+    heat_bus: heat_central
+
+electricity-pth:
+  carrier: electricity
+  tech: pth
+  type: conversion
+  foreign_keys:
+    from_bus: electricity
+    to_bus: heat_central
+  defaults:
+    output_parameters: "{}"
+

oemof_b3/model/foreign_keys_update.yml

@@ -1,12 +1,34 @@
 'bus': [
     'ch4-demand',
+    'ch4-shortage',
+    'heat_central-shortage',
+    'heat_central-excess',
+    'heat_central-demand',
+    'heat_central-storage',
+    'heat_decentral-shortage',
+    'heat_decentral-excess',
+    'heat_decentral-demand',
+    'heat_decentral-storage',
 ]
 
 'profile': [
     'ch4-demand',
+    'heat_central-demand',
+    'heat_decentral-demand',
 ]
 
 'from_to_bus': [
     'electricity-electrolyzer',
     'h2-gt',
+    'electricity-heatpump_large',
+    'electricity-heatpump_small',
+    'electricity-pth',
 ]
+
+'chp': [
+    'h2-bpchp',
+]
+
+'efficiency': [
+    'electricity-heatpump_small',
+]

scenarios/base-scenario.yml

@@ -0,0 +1,63 @@
+# This scenario config file contains information for several steps in the model pipeline, i.e.
+# build_datapackage, parametrize, optimize and potentially also postprocess or plot.
+
+# build_datapackage
+
+name: base-scenario
+
+regions:
+  - BB
+  - B
+
+links:
+  - BB-B
+
+busses:
+  - ch4
+  - electricity
+  - h2
+  - heat_central
+  - heat_decentral
+  - biomass
+
+components:
+  - biomass-gt
+  - ch4-boiler
+  - ch4-bpchp
+  - ch4-demand
+  - ch4-excess
+  - ch4-gt
+  - electricity-demand
+  - electricity-electrolyzer
+  - electricity-curtailment
+  - electricity-liion_battery
+  - electricity-pth
+  - electricity-shortage
+  - h2-gt
+  - h2-bpchp
+  - heat_central-demand
+  - heat_central-excess
+  - heat_central-shortage
+  - heat_central-storage
+  - heat_decentral-demand
+  - heat_decentral-excess
+  - heat_decentral-shortage
+  - heat_decentral-storage
+  - hydro-ror
+  - solar-pv
+  - wind-onshore
+
+# parametrize
+
+path_scalars: results/_resources/base-scenario.csv
+
+filter_scalars:
+  1:
+    scenario:
+      base-scenario
+
+paths_timeseries: raw/time_series/toy-scenario-timeseries.csv
+
+filter_timeseries:
+  scenario:
+    toy-scenario

scenarios/toy-scenario-2.yml

@@ -16,16 +16,17 @@ busses:
   - ch4
   - electricity
   - h2
-  - heat
+  - heat_central
+  - heat_decentral
   - biomass
 
 components:
   - biomass-gt
   - ch4-boiler
   - ch4-bpchp
   - ch4-demand
+  - ch4-shortage
   - ch4-excess
-  - ch4-extchp
   - ch4-gt
   - electricity-demand
   - electricity-electrolyzer
@@ -34,16 +35,20 @@ components:
   - electricity-pth
   - electricity-shortage
   - h2-gt
-  - heat-demand
-  - heat-excess
-  - heat-shortage
-  - heat-storage
+  - h2-bpchp
+  - heat_central-demand
+  - heat_central-excess
+  - heat_central-shortage
+  - heat_central-storage
+  - heat_decentral-demand
+  - heat_decentral-excess
+  - heat_decentral-shortage
+  - heat_decentral-storage
   - hydro-ror
   - solar-pv
   - wind-onshore
 
 # parametrize
-# paths to input data files
 
 path_scalars: raw/toy-scenario.csv
 
@@ -60,10 +65,3 @@ paths_timeseries: raw/time_series/toy-scenario-timeseries.csv
 filter_timeseries:
   scenario:
     toy-scenario-update
-
-# optimize
-
-# solver: "cbc"
-# debug: "False"
-# receive_duals: "False"
-# dump params: "True"

scenarios/toy-scenario.yml

@@ -16,16 +16,17 @@ busses:
   - ch4
   - electricity
   - h2
-  - heat
+  - heat_central
+  - heat_decentral
   - biomass
 
 components:
   - biomass-gt
   - ch4-boiler
   - ch4-bpchp
   - ch4-demand
+  - ch4-shortage
   - ch4-excess
-  - ch4-extchp
   - ch4-gt
   - electricity-demand
   - electricity-electrolyzer
@@ -34,16 +35,20 @@ components:
   - electricity-pth
   - electricity-shortage
   - h2-gt
-  - heat-demand
-  - heat-excess
-  - heat-shortage
-  - heat-storage
+  - h2-bpchp
+  - heat_central-demand
+  - heat_central-excess
+  - heat_central-shortage
+  - heat_central-storage
+  - heat_decentral-demand
+  - heat_decentral-excess
+  - heat_decentral-shortage
+  - heat_decentral-storage
   - hydro-ror
   - solar-pv
   - wind-onshore
 
 # parametrize
-# paths to input data files
 
 path_scalars: raw/toy-scenario.csv
 
@@ -57,10 +62,3 @@ paths_timeseries: raw/time_series/toy-scenario-timeseries.csv
 filter_timeseries:
   scenario:
     toy-scenario
-
-# optimize
-
-# solver: "cbc"
-# debug: "False"
-# receive_duals: "False"
-# dump params: "True"