Fixes in rebase

Author: kndehaan

datasets/ES01_groningen/ES01_groningen.derived.ad

@@ -1,6 +1,6 @@
 - area = ES01_groningen
-- id = 126586
-- parent_id = 126586
+- id = 127009
+- parent_id = 127009
 - group = res
 - enabled.etengine = true
 - enabled.etmodel = true

datasets/ES01_groningen/graph_values.yml

@@ -270,6 +270,10 @@ energy_distribution_mt_steam_hot_water:
     :steam_hot_water: 0.7429011031999999
 energy_distribution_network_gas_loss:
   demand: 0.0
+energy_distribution_waste_mix:
+  input:
+    :biogenic_waste: 0.51698899
+    :non_biogenic_waste: 0.48301101
 energy_extraction_coal:
   demand: 0.0
 energy_extraction_crude_oil:
@@ -950,14 +954,10 @@ energy_blastfurnace_transformation_cokes-energy_distribution_coal_gas@coal_gas:
   child_share: 0.6907
 energy_cokesoven_transformation_coal-energy_distribution_coal_gas@coal_gas:
   child_share: 0.3093
-energy_distribution_biogenic_waste-energy_distribution_waste_mix@waste_mix:
-  child_share: 0.51698899
 energy_distribution_coal_gas-energy_chp_coal_gas@coal_gas:
   parent_share: 0.16
 energy_distribution_coal_gas-energy_power_combined_cycle_coal_gas@coal_gas:
   parent_share: 0.0
-energy_distribution_non_biogenic_waste-energy_distribution_waste_mix@waste_mix:
-  child_share: 0.48301101
 energy_greengas_gasification_dry_biomass-energy_greengas_production@greengas:
   child_share: 0.0
 energy_greengas_gasification_wet_biomass-energy_greengas_production@greengas:
@@ -1124,10 +1124,10 @@ industry_final_demand_for_chemical_wood_pellets-industry_final_demand_for_chemic
   parent_share: 0.0
 ? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_fertilizers_wood_pellets_non_energetic@wood_pellets
 : parent_share: 0.0
+? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_other_wood_pellets_non_energetic@wood_pellets
+: parent_share: 1.0
 ? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_refineries_wood_pellets_non_energetic@wood_pellets
 : parent_share: 0.0
-? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_locally_available_wood_pellets_non_energetic_for_chemical@wood_pellets
-: parent_share: 1.0
 industry_final_demand_for_metal_aluminium_electricity-industry_aluminium_electrolysis_current_electricity@electricity:
   parent_share: 0.0
 industry_final_demand_for_metal_coal-industry_final_demand_for_metal_steel_coal@coal:

datasets/ES02_friesland/ES02_friesland.derived.ad

@@ -1,6 +1,6 @@
 - area = ES02_friesland
-- id = 126587
-- parent_id = 126587
+- id = 127010
+- parent_id = 127010
 - group = res
 - enabled.etengine = true
 - enabled.etmodel = true

datasets/ES02_friesland/graph_values.yml

@@ -270,6 +270,10 @@ energy_distribution_mt_steam_hot_water:
     :steam_hot_water: 0.7429011031999999
 energy_distribution_network_gas_loss:
   demand: 0.0
+energy_distribution_waste_mix:
+  input:
+    :biogenic_waste: 0.51698899
+    :non_biogenic_waste: 0.48301101
 energy_extraction_coal:
   demand: 0.0
 energy_extraction_crude_oil:
@@ -950,14 +954,10 @@ energy_blastfurnace_transformation_cokes-energy_distribution_coal_gas@coal_gas:
   child_share: 0.6907
 energy_cokesoven_transformation_coal-energy_distribution_coal_gas@coal_gas:
   child_share: 0.3093
-energy_distribution_biogenic_waste-energy_distribution_waste_mix@waste_mix:
-  child_share: 0.51698899
 energy_distribution_coal_gas-energy_chp_coal_gas@coal_gas:
   parent_share: 0.16
 energy_distribution_coal_gas-energy_power_combined_cycle_coal_gas@coal_gas:
   parent_share: 0.0
-energy_distribution_non_biogenic_waste-energy_distribution_waste_mix@waste_mix:
-  child_share: 0.48301101
 energy_greengas_gasification_dry_biomass-energy_greengas_production@greengas:
   child_share: 0.0
 energy_greengas_gasification_wet_biomass-energy_greengas_production@greengas:
@@ -1124,10 +1124,10 @@ industry_final_demand_for_chemical_wood_pellets-industry_final_demand_for_chemic
   parent_share: 0.0
 ? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_fertilizers_wood_pellets_non_energetic@wood_pellets
 : parent_share: 0.0
+? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_other_wood_pellets_non_energetic@wood_pellets
+: parent_share: 1.0
 ? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_refineries_wood_pellets_non_energetic@wood_pellets
 : parent_share: 0.0
-? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_locally_available_wood_pellets_non_energetic_for_chemical@wood_pellets
-: parent_share: 1.0
 industry_final_demand_for_metal_aluminium_electricity-industry_aluminium_electrolysis_current_electricity@electricity:
   parent_share: 0.0
 industry_final_demand_for_metal_coal-industry_final_demand_for_metal_steel_coal@coal:

datasets/ES03_drenthe/ES03_drenthe.derived.ad

@@ -1,6 +1,6 @@
 - area = ES03_drenthe
-- id = 126588
-- parent_id = 126588
+- id = 127011
+- parent_id = 127011
 - group = res
 - enabled.etengine = true
 - enabled.etmodel = true

datasets/ES03_drenthe/graph_values.yml

@@ -270,6 +270,10 @@ energy_distribution_mt_steam_hot_water:
     :steam_hot_water: 0.7429011031999999
 energy_distribution_network_gas_loss:
   demand: 0.0
+energy_distribution_waste_mix:
+  input:
+    :biogenic_waste: 0.51698899
+    :non_biogenic_waste: 0.48301101
 energy_extraction_coal:
   demand: 0.0
 energy_extraction_crude_oil:
@@ -950,14 +954,10 @@ energy_blastfurnace_transformation_cokes-energy_distribution_coal_gas@coal_gas:
   child_share: 0.6907
 energy_cokesoven_transformation_coal-energy_distribution_coal_gas@coal_gas:
   child_share: 0.3093
-energy_distribution_biogenic_waste-energy_distribution_waste_mix@waste_mix:
-  child_share: 0.51698899
 energy_distribution_coal_gas-energy_chp_coal_gas@coal_gas:
   parent_share: 0.16
 energy_distribution_coal_gas-energy_power_combined_cycle_coal_gas@coal_gas:
   parent_share: 0.0
-energy_distribution_non_biogenic_waste-energy_distribution_waste_mix@waste_mix:
-  child_share: 0.48301101
 energy_greengas_gasification_dry_biomass-energy_greengas_production@greengas:
   child_share: 0.0
 energy_greengas_gasification_wet_biomass-energy_greengas_production@greengas:
@@ -1124,10 +1124,10 @@ industry_final_demand_for_chemical_wood_pellets-industry_final_demand_for_chemic
   parent_share: 0.0
 ? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_fertilizers_wood_pellets_non_energetic@wood_pellets
 : parent_share: 0.0
+? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_other_wood_pellets_non_energetic@wood_pellets
+: parent_share: 1.0
 ? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_refineries_wood_pellets_non_energetic@wood_pellets
 : parent_share: 0.0
-? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_locally_available_wood_pellets_non_energetic_for_chemical@wood_pellets
-: parent_share: 1.0
 industry_final_demand_for_metal_aluminium_electricity-industry_aluminium_electrolysis_current_electricity@electricity:
   parent_share: 0.0
 industry_final_demand_for_metal_coal-industry_final_demand_for_metal_steel_coal@coal:

datasets/ES04_twente/ES04_twente.derived.ad

@@ -1,6 +1,6 @@
 - area = ES04_twente
-- id = 126589
-- parent_id = 126589
+- id = 127012
+- parent_id = 127012
 - group = res
 - enabled.etengine = true
 - enabled.etmodel = true

datasets/ES04_twente/graph_values.yml

@@ -270,6 +270,10 @@ energy_distribution_mt_steam_hot_water:
     :steam_hot_water: 0.7429011031999999
 energy_distribution_network_gas_loss:
   demand: 0.0
+energy_distribution_waste_mix:
+  input:
+    :biogenic_waste: 0.51698899
+    :non_biogenic_waste: 0.48301101
 energy_extraction_coal:
   demand: 0.0
 energy_extraction_crude_oil:
@@ -950,14 +954,10 @@ energy_blastfurnace_transformation_cokes-energy_distribution_coal_gas@coal_gas:
   child_share: 0.6907
 energy_cokesoven_transformation_coal-energy_distribution_coal_gas@coal_gas:
   child_share: 0.3093
-energy_distribution_biogenic_waste-energy_distribution_waste_mix@waste_mix:
-  child_share: 0.51698899
 energy_distribution_coal_gas-energy_chp_coal_gas@coal_gas:
   parent_share: 0.16
 energy_distribution_coal_gas-energy_power_combined_cycle_coal_gas@coal_gas:
   parent_share: 0.0
-energy_distribution_non_biogenic_waste-energy_distribution_waste_mix@waste_mix:
-  child_share: 0.48301101
 energy_greengas_gasification_dry_biomass-energy_greengas_production@greengas:
   child_share: 0.0
 energy_greengas_gasification_wet_biomass-energy_greengas_production@greengas:
@@ -1124,10 +1124,10 @@ industry_final_demand_for_chemical_wood_pellets-industry_final_demand_for_chemic
   parent_share: 0.0
 ? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_fertilizers_wood_pellets_non_energetic@wood_pellets
 : parent_share: 0.0
+? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_other_wood_pellets_non_energetic@wood_pellets
+: parent_share: 1.0
 ? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_refineries_wood_pellets_non_energetic@wood_pellets
 : parent_share: 0.0
-? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_locally_available_wood_pellets_non_energetic_for_chemical@wood_pellets
-: parent_share: 1.0
 industry_final_demand_for_metal_aluminium_electricity-industry_aluminium_electrolysis_current_electricity@electricity:
   parent_share: 0.0
 industry_final_demand_for_metal_coal-industry_final_demand_for_metal_steel_coal@coal:

datasets/ES05_west_overijssel/ES05_west_overijssel.derived.ad

@@ -1,6 +1,6 @@
 - area = ES05_west_overijssel
-- id = 126590
-- parent_id = 126590
+- id = 127013
+- parent_id = 127013
 - group = res
 - enabled.etengine = true
 - enabled.etmodel = true

datasets/ES05_west_overijssel/graph_values.yml

@@ -270,6 +270,10 @@ energy_distribution_mt_steam_hot_water:
     :steam_hot_water: 0.7429011031999999
 energy_distribution_network_gas_loss:
   demand: 0.0
+energy_distribution_waste_mix:
+  input:
+    :biogenic_waste: 0.51698899
+    :non_biogenic_waste: 0.48301101
 energy_extraction_coal:
   demand: 0.0
 energy_extraction_crude_oil:
@@ -950,14 +954,10 @@ energy_blastfurnace_transformation_cokes-energy_distribution_coal_gas@coal_gas:
   child_share: 0.6907
 energy_cokesoven_transformation_coal-energy_distribution_coal_gas@coal_gas:
   child_share: 0.3093
-energy_distribution_biogenic_waste-energy_distribution_waste_mix@waste_mix:
-  child_share: 0.51698899
 energy_distribution_coal_gas-energy_chp_coal_gas@coal_gas:
   parent_share: 0.16
 energy_distribution_coal_gas-energy_power_combined_cycle_coal_gas@coal_gas:
   parent_share: 0.0
-energy_distribution_non_biogenic_waste-energy_distribution_waste_mix@waste_mix:
-  child_share: 0.48301101
 energy_greengas_gasification_dry_biomass-energy_greengas_production@greengas:
   child_share: 0.0
 energy_greengas_gasification_wet_biomass-energy_greengas_production@greengas:
@@ -1124,10 +1124,10 @@ industry_final_demand_for_chemical_wood_pellets-industry_final_demand_for_chemic
   parent_share: 0.0
 ? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_fertilizers_wood_pellets_non_energetic@wood_pellets
 : parent_share: 0.0
+? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_other_wood_pellets_non_energetic@wood_pellets
+: parent_share: 1.0
 ? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_final_demand_for_chemical_refineries_wood_pellets_non_energetic@wood_pellets
 : parent_share: 0.0
-? industry_final_demand_for_chemical_wood_pellets_non_energetic-industry_locally_available_wood_pellets_non_energetic_for_chemical@wood_pellets
-: parent_share: 1.0
 industry_final_demand_for_metal_aluminium_electricity-industry_aluminium_electrolysis_current_electricity@electricity:
   parent_share: 0.0
 industry_final_demand_for_metal_coal-industry_final_demand_for_metal_steel_coal@coal: