rudimentary fixes for FE plots

Author: lindnemi

workflow/scripts/export_ariadne_variables.py

@@ -953,7 +953,8 @@ def get_primary_energy(n, region):
         var["Primary Energy|Hydro"] +
         var["Primary Energy|Solar"] +
         var["Primary Energy|Wind"] +
-        var["Primary Energy|Nuclear"]
+        var["Primary Energy|Nuclear"] +
+        var["Primary Energy|Waste"]
     )
 
     return var
@@ -1343,6 +1344,15 @@ def get_secondary_energy(n, region):
     var["Secondary Energy Input|Hydrogen|Liquids"] = \
         hydrogen_withdrawal.get("Fischer-Tropsch", 0)
 
+    var["Secondary Energy"] = (
+        var["Secondary Energy|Electricity"]
+        + var["Secondary Energy|Heat"]
+        + var["Secondary Energy|Hydrogen"]
+        + var["Secondary Energy|Gases"]
+        + var["Secondary Energy|Liquids"]
+        + var["Secondary Energy|Methanol"]
+    )
+    
     return var
 
 def load_idees_data(sector, country):

workflow/scripts/plot_ariadne_variables.py

@@ -202,7 +202,8 @@ def within_plot(df, df2,
         "Final Energy in PJ_yr",
         savepath=snakemake.output.final_energy,
         select_regex="Final Energy\|[^|]*$",
-        drop_regex="^(?!.*(Electricity|Price)).+"
+        rshift = 1.45,
+        drop_regex="^(?!.*(Price|Non-Energy Use)).+"
     )
 
     side_by_side_plot(
@@ -211,8 +212,8 @@ def within_plot(df, df2,
         "Detailed Final Energy in PJ_yr",
         savepath=snakemake.output.final_energy_detailed,
         select_regex="Final Energy\|[^|]*\|[^|]*$",
-        rshift = 1.45,
-        drop_regex="^(?!.*(Price)).+"
+        rshift = 1.7,
+        drop_regex="^(?!.*(Price|\|Solids\||Non-Energy Use\|)).+"
     )
 
     side_by_side_plot(