Plot scalar results

Snakefile

@@ -187,7 +187,7 @@ rule plot_dispatch:
     input:
         "results/{scenario}/postprocessed/"
     output:
-        directory("results/{scenario}/plotted/")
+        directory("results/{scenario}/plotted/dispatch")
     shell:
         "python scripts/plot_dispatch.py {input} {output}"
 
@@ -200,6 +200,22 @@ rule plot_conv_pp_scalars:
     shell:
         "python {input.script} {input.data} {wildcards.var_name} {output}"
 
+rule plot_scalar_results:
+    input:
+        "results/{scenario}/postprocessed/scalars.csv"
+    output:
+        directory("results/{scenario}/plotted/scalars/")
+    shell:
+        "python scripts/plot_scalar_results.py {input} {output}"
+
+rule plot_joined_scalars:
+    input:
+        "results/joined_scenarios/{scenario_list}/joined/scalars.csv"
+    output:
+        directory("results/joined_scenarios/{scenario_list}/joined_plotted/")
+    shell:
+        "python scripts/plot_scalar_results.py {input} {output}"
+
 rule report:
     input:
         template="report/report.md",
@@ -260,11 +276,3 @@ rule join_scenario_results:
         "results/joined_scenarios/{scenario_group}/joined/scalars.csv"
     shell:
         "python scripts/join_scenarios.py {input} {output}"
-
-rule plot_joined_scalars:
-    input:
-        "results/joined_scenarios/{scenario_group}/joined/scalars.csv"
-    output:
-        directory("results/joined_scenarios/{scenario_group}/joined_plotted/")
-    shell:
-        "python scripts/plot_joined_scalars.py {input} {output}"

oemof_b3/config/colors.csv

@@ -26,7 +26,8 @@ Curtailment,#7f7f7f
 
 El. demand,#000000
 El. Export,#8c564b
-El. Import,8c564b
+El. Import,#8c564b
+BEV charging,#000000
 
 H2 Backpressure CHP,magenta
 CH4 Backpressure CHP,brown

oemof_b3/config/labels.yml

@@ -4,6 +4,7 @@ ch4-boiler: CH4 Boiler
 ch4-bpchp: CH4 Backpressure CHP
 ch4-extchp: CH4 Extraction CHP
 ch4-gt: CH4 GT
+electricity-bev_charging: BEV charging
 electricity-curtailment: Curtailment
 electricity-demand: El. demand
 electricity-electrolyzer: Electrolyzer
@@ -22,6 +23,7 @@ hydro-ror: Hydro ROR
 solar-pv: PV
 wind-onshore: Wind on
 h2-bpchp: H2 Backpressure CHP
+h2-cavern: H2 Cavern
 ch4-export: CH4 Export
 ch4-import: CH4 Import
 h2-export: H2 Export

report/report.md

@@ -1,14 +1,28 @@
 ## Main results
 
 ## Scalar plots
+![Capacities](scalars/capacity.png)
+
+![Energy per year](scalars/flow_out_electricity.png)
+
 
 ## Electricity dispatch
+\center
+![Electricity dispatch winter](dispatch/BB-electricity_01.png)
+
+![Electricity dispatch summer](dispatch/BB-electricity_07.png)
+
+![Electricity dispatch winter](dispatch/B-electricity_01.png)
+
+![Electricity dispatch summer](dispatch/B-electricity_07.png)
+
 
+## Heat dispatch
 \center
-![Plot 1](BB-electricity_01.png)
+![Heat dispatch winter](dispatch/BB-heat_decentral_01.png)
 
-![Plot 2](BB-electricity_07.png)
+![Heat dispatch summer](dispatch/BB-heat_decentral_07.png)
 
-![Plot 3](BE-electricity_01.png)
+![Heat dispatch winter](dispatch/B-heat_decentral_01.png)
 
-![Plot 4](BE-electricity_07.png)
+![Heat dispatch summer](dispatch/B-heat_decentral_07.png)

report/report_interactive.md

@@ -5,6 +5,6 @@
 ## Electricity dispatch
 
 \center
-![Plot 1](BB-electricity_dispatch_interactive.html){width=900px height=500px}
+![Plot 1](dispatch/BB-electricity_dispatch_interactive.html){width=900px height=500px}
 
-![Plot 2](BE-electricity_dispatch_interactive.html){width=900px height=500px}
+![Plot 2](dispatch/B-electricity_dispatch_interactive.html){width=900px height=500px}

scripts/join_scenarios.py

@@ -21,7 +21,6 @@
 import sys
 
 import pandas as pd
-from oemoflex.tools.helpers import load_yaml
 
 
 def load_scalars(path):
@@ -30,18 +29,14 @@ def load_scalars(path):
 
 
 if __name__ == "__main__":
-    list_scenarios = sys.argv[1]
+    paths_scenarios = sys.argv[1:-1]
 
-    destination = sys.argv[2]
-
-    scenarios = load_yaml(list_scenarios)
+    destination = sys.argv[-1]
 
     joined_scalars = list()
-    for scenario in scenarios:
-        scalars = load_scalars(
-            os.path.join("results", scenario, "postprocessed", "scalars.csv")
-        )
-        scalars["scenario"] = scenario
+    for path_sc in paths_scenarios:
+        scalars = load_scalars(os.path.join(path_sc, "scalars.csv"))
+
         joined_scalars.append(scalars)
 
     joined_scalars = pd.concat(joined_scalars)