Merge pull request #3111 from quintel/ctm-etm-coupling-final

CTM-ETM coupling: final changes
quintel · Aug 30, 2024 · a67ca34 · a67ca34
2 parents 24c4b8a + 7b24b84
commit a67ca34
Show file tree

Hide file tree

Showing 36 changed files with 188 additions and 175 deletions.
diff --git a/..._energetic-industry_chemicals_fertilizers_external_coupling_node_non_energetic@ammonia.ad b/..._energetic-industry_chemicals_fertilizers_external_coupling_node_non_energetic@ammonia.ad
@@ -0,0 +1,5 @@
+- type = share
+- reversed = false
+- groups = [final_demand, chemical_industry, fertilizers_industry, aggregated_chemical_industry]
+
+~ parent_share = 0.0
diff --git a/...ammonia_non_energetic-industry_chemicals_fertilizers_locally_available_ammonia@ammonia.ad b/...ammonia_non_energetic-industry_chemicals_fertilizers_locally_available_ammonia@ammonia.ad
@@ -1,3 +1,5 @@
 - type = share
 - reversed = false
 - groups = [final_demand, chemical_industry, fertilizers_industry, aggregated_chemical_industry]
+
+~ parent_share = 1.0
diff --git a/...rgy/nodes/industry/industry_chemicals_fertilizers_external_coupling_node_non_energetic.ad b/...rgy/nodes/industry/industry_chemicals_fertilizers_external_coupling_node_non_energetic.ad
@@ -7,3 +7,4 @@
 - input.wood_pellets = 0.0
 - input.crude_oil = 0.0
 - input.hydrogen = 0.0
+- input.ammonia = 0.0
diff --git a/graphs/energy/nodes/industry/industry_other_metals_external_coupling_node.ad b/graphs/energy/nodes/industry/industry_other_metals_external_coupling_node.ad
@@ -4,7 +4,6 @@
 # Cost attributes are taken from network gas burner, heat_output_capacity converted to typical_input_capacity
 
 - use = energetic
-- output.loss = elastic
 - output.not_defined = 1.0
 - input.electricity = 0.5
 - input.useable_heat = 0.5

diff --git a/...ertilizers/external_coupling_industry_chemical_fertilizers_non_energetic_ammonia_share.ad b/...ertilizers/external_coupling_industry_chemical_fertilizers_non_energetic_ammonia_share.ad
@@ -0,0 +1,10 @@
+- query = UPDATE(INPUT_SLOTS(V(industry_chemicals_fertilizers_external_coupling_node_non_energetic),ammonia), conversion, DIVIDE(USER_INPUT(),100.0))
+- share_group = external_coupling_chemicals_fertilizers_non_energetic_input
+- priority = 0
+- max_value = 100.0
+- min_value = 0.0
+- start_value_gql = present:V(industry_chemicals_fertilizers_external_coupling_node_non_energetic,ammonia_input_conversion) * 100.0
+- step_value = 0.1
+- unit = %
+- update_period = future
+- coupling_groups = [external_model_industry, industry_chemical_fertilizers]
diff --git a/...aluminium/external_coupling_industry_aluminium_carbothermalreduction_electricity_share.ad b/...aluminium/external_coupling_industry_aluminium_carbothermalreduction_electricity_share.ad
diff --git a/...etal_aluminium/external_coupling_industry_aluminium_electrolysis_bat_electricity_share.ad b/...etal_aluminium/external_coupling_industry_aluminium_electrolysis_bat_electricity_share.ad
diff --git a/..._aluminium/external_coupling_industry_aluminium_electrolysis_current_electricity_share.ad b/..._aluminium/external_coupling_industry_aluminium_electrolysis_current_electricity_share.ad
diff --git a/...ustry_metal_aluminium/external_coupling_industry_aluminium_smeltoven_electricity_share.ad b/...ustry_metal_aluminium/external_coupling_industry_aluminium_smeltoven_electricity_share.ad
diff --git a/...try_metal_aluminium/external_coupling_industry_metal_aluminium_external_coupling_share.ad b/...try_metal_aluminium/external_coupling_industry_metal_aluminium_external_coupling_share.ad
diff --git a/...oupling/industry_metal_aluminium/external_coupling_industry_metal_aluminium_production.ad b/...oupling/industry_metal_aluminium/external_coupling_industry_metal_aluminium_production.ad
@@ -1,10 +1,44 @@
-- query = UPDATE_WITH_FACTOR(V(industry_aluminium_production), preset_demand, USER_INPUT())
+# By moving demand for aluminium to the external coupling node, the demand on the
+# other production processes is set to 0.
+
+- query =
+    EACH(
+      UPDATE(
+        EDGE(industry_aluminium_production,industry_aluminium_external_coupling_node),
+        share,
+        1.0
+      ),
+      UPDATE(
+        EDGE(industry_aluminium_production,industry_aluminium_electrolysis_current_electricity),
+        share,
+        0.0
+      ),
+      UPDATE(
+        EDGE(industry_aluminium_production,industry_aluminium_electrolysis_bat_electricity),
+        share,
+        0.0
+      ),
+      UPDATE(
+        EDGE(industry_aluminium_production,industry_aluminium_smeltoven_electricity),
+        share,
+        0.0
+      ),
+      UPDATE(
+        EDGE(industry_aluminium_production,industry_aluminium_carbothermalreduction_electricity),
+        share,
+        0.0
+      ),
+      UPDATE(
+        V(industry_aluminium_production),
+        preset_demand,
+        (USER_INPUT() * BILLIONS)
+      )
+    )
 - priority = 0
-- max_value = 99900.0
+- max_value = 10000.0
 - min_value = 0.0
-- start_value = 100.0
+- start_value_gql = present:DIVIDE(V(industry_other_metals_production, preset_demand),BILLIONS)
 - step_value = 0.1
-- unit = %
+- unit = MT
 - update_period = future
-- update_type = %
 - coupling_groups = [external_model_industry, industry_metal_aluminium]
diff --git a/...ng_industry_metal_aluminium_efficiency.ad → ..._metal_aluminium_production_efficiency.ad b/...ng_industry_metal_aluminium_efficiency.ad → ..._metal_aluminium_production_efficiency.ad
@@ -1,9 +1,9 @@
-- query = UPDATE(OUTPUT_SLOTS(V(industry_aluminium_external_coupling_node), not_defined), conversion, DIVIDE(USER_INPUT(), 100.0))
+- query = UPDATE(OUTPUT_SLOTS(V(industry_aluminium_external_coupling_node), not_defined), conversion, USER_INPUT())
 - priority = 0
-- max_value = 100.0
+- max_value = 1.0
 - min_value = 0.0
-- start_value_gql = present:V(industry_aluminium_external_coupling_node, not_defined_output_conversion) * 100.0
-- step_value = 0.1
-- unit = %
+- start_value_gql = present:V(industry_aluminium_external_coupling_node, not_defined_output_conversion)
+- step_value = 0.001
+- unit = MT/PJ
 - update_period = future
 - coupling_groups = [external_model_industry, industry_metal_aluminium]
diff --git a/...pling_industry_other_metals_coal_share.ad → ...industry_metal_other_metals_coal_share.ad b/...pling_industry_other_metals_coal_share.ad → ...industry_metal_other_metals_coal_share.ad
diff --git a/..._industry_other_metals_crude_oil_share.ad → ...try_metal_other_metals_crude_oil_share.ad b/..._industry_other_metals_crude_oil_share.ad → ...try_metal_other_metals_crude_oil_share.ad
diff --git a/...ndustry_other_metals_electricity_share.ad → ...y_metal_other_metals_electricity_share.ad b/...ndustry_other_metals_electricity_share.ad → ...y_metal_other_metals_electricity_share.ad
diff --git a/...industry_metal_other/external_coupling_industry_metal_other_metals_hydrogen_efficiency.ad b/...industry_metal_other/external_coupling_industry_metal_other_metals_hydrogen_efficiency.ad
diff --git a/...g_industry_other_metals_hydrogen_share.ad → ...stry_metal_other_metals_hydrogen_share.ad b/...g_industry_other_metals_hydrogen_share.ad → ...stry_metal_other_metals_hydrogen_share.ad
diff --git a/...ndustry_other_metals_network_gas_share.ad → ...y_metal_other_metals_network_gas_share.ad b/...ndustry_other_metals_network_gas_share.ad → ...y_metal_other_metals_network_gas_share.ad
diff --git a/...y_other_metals_heat_useable_heat_share.ad → ...tal_other_metals_steam_hot_water_share.ad b/...y_other_metals_heat_useable_heat_share.ad → ...tal_other_metals_steam_hot_water_share.ad
diff --git a/...upling/industry_metal_other/external_coupling_industry_metal_other_metals_total_demand.ad b/...upling/industry_metal_other/external_coupling_industry_metal_other_metals_total_demand.ad
diff --git a/...stry_metal_other/external_coupling_industry_metal_other_metals_useful_energetic_demand.ad b/...stry_metal_other/external_coupling_industry_metal_other_metals_useful_energetic_demand.ad
@@ -0,0 +1,34 @@
+# By moving demand for other metals to the external coupling node, the demand on the
+# process nodes for useable heat and electricity is set to 0.
+
+- query =
+    EACH(
+      UPDATE(
+        EDGE(industry_other_metals_production,industry_other_metals_external_coupling_node),
+        share,
+        1.0
+      ),
+      UPDATE(
+        EDGE(industry_other_metals_production,industry_other_metals_process_heat_useable_heat),
+        share,
+        0.0
+      ),
+      UPDATE(
+        EDGE(industry_other_metals_production,industry_other_metals_process_electricity),
+        share,
+        0.0
+      ),
+      UPDATE(
+        V(industry_other_metals_production),
+        preset_demand,
+        (USER_INPUT() * BILLIONS)
+      )
+    )
+- priority = 0
+- max_value = 10000.0
+- min_value = 0.0
+- start_value_gql = present:DIVIDE(V(industry_other_metals_production, preset_demand),BILLIONS)
+- step_value = 0.1
+- unit = PJ
+- update_period = future
+- coupling_groups = [external_model_industry, industry_metal_other]
diff --git a/...g/industry_metal_other/external_coupling_industry_other_metals_external_coupling_share.ad b/...g/industry_metal_other/external_coupling_industry_other_metals_external_coupling_share.ad
diff --git a/...industry_metal_other/external_coupling_industry_other_metals_process_electricity_share.ad b/...industry_metal_other/external_coupling_industry_other_metals_process_electricity_share.ad
diff --git a/...ry_metal_other/external_coupling_industry_other_metals_process_heat_useable_heat_share.ad b/...ry_metal_other/external_coupling_industry_other_metals_process_heat_useable_heat_share.ad
diff --git a/...xternal_coupling/industry_other_food/external_coupling_industry_other_food_electricity.ad b/...xternal_coupling/industry_other_food/external_coupling_industry_other_food_electricity.ad
diff --git a/...ternal_coupling/industry_other_food/external_coupling_industry_other_food_useable_heat.ad b/...ternal_coupling/industry_other_food/external_coupling_industry_other_food_useable_heat.ad
diff --git a/...od/external_coupling_industry_other_food_useful_energetic_demand_excluding_electricity.ad b/...od/external_coupling_industry_other_food_useful_energetic_demand_excluding_electricity.ad
@@ -0,0 +1,14 @@
+- query =
+    UPDATE(
+      V(industry_useful_demand_for_other_food_useable_heat),
+      preset_demand,
+      (USER_INPUT() * BILLIONS)
+    )
+- priority = 0
+- max_value = 10000.0
+- min_value = 0.0
+- start_value_gql = present:DIVIDE(V(industry_useful_demand_for_other_food_useable_heat, preset_demand),BILLIONS)
+- step_value = 0.1
+- unit = PJ
+- update_period = future
+- coupling_groups = [external_model_industry, industry_other_food]
diff --git a/...her_food/external_coupling_industry_other_food_useful_energetic_demand_for_electricity.ad b/...her_food/external_coupling_industry_other_food_useful_energetic_demand_for_electricity.ad
@@ -0,0 +1,14 @@
+- query =
+    UPDATE(
+      V(industry_useful_demand_for_other_food_electricity),
+      preset_demand,
+      (USER_INPUT() * BILLIONS)
+    )
+- priority = 0
+- max_value = 10000.0
+- min_value = 0.0
+- start_value_gql = present:DIVIDE(V(industry_useful_demand_for_other_food_electricity, preset_demand),BILLIONS)
+- step_value = 0.1
+- unit = PJ
+- update_period = future
+- coupling_groups = [external_model_industry, industry_other_food]
diff --git a/...r_non_specified/external_coupling_industry_other_non_specified_useful_energetic_demand.ad b/...r_non_specified/external_coupling_industry_other_non_specified_useful_energetic_demand.ad
@@ -0,0 +1,18 @@
+- query =
+    present_value = QUERY_PRESENT(-> {SUM(V(Q(other_non_specified_industry_energetic_converters),preset_demand))});
+    future_value = PRODUCT(USER_INPUT(),BILLIONS);
+    relative_value = DIVIDE(future_value,present_value);
+
+    UPDATE_WITH_FACTOR(
+      V(Q(other_non_specified_industry_energetic_converters)),
+      preset_demand,
+      relative_value
+    )
+- priority = 1
+- max_value = 10000.0
+- min_value = 0.0
+- start_value_gql = present:DIVIDE(SUM(V(Q(other_non_specified_industry_energetic_converters),preset_demand)),BILLIONS)
+- step_value = 0.1
+- unit = PJ
+- update_period = future
+- coupling_groups = [external_model_industry, industry_other_non_specified]
diff --git a/...n_specified/external_coupling_industry_other_non_specified_useful_non_energetic_demand.ad b/...n_specified/external_coupling_industry_other_non_specified_useful_non_energetic_demand.ad
@@ -0,0 +1,18 @@
+- query =
+    present_value = QUERY_PRESENT(-> {SUM(V(Q(other_non_specified_industry_non_energetic_converters),preset_demand))});
+    future_value = PRODUCT(USER_INPUT(),BILLIONS);
+    relative_value = DIVIDE(future_value,present_value);
+
+    UPDATE_WITH_FACTOR(
+      V(Q(other_non_specified_industry_non_energetic_converters)),
+      preset_demand,
+      relative_value
+    )
+- priority = 1
+- max_value = 10000.0
+- min_value = 0.0
+- start_value_gql = present:DIVIDE(SUM(V(Q(other_non_specified_industry_non_energetic_converters),preset_demand)),BILLIONS)
+- step_value = 0.1
+- unit = PJ
+- update_period = future
+- coupling_groups = [external_model_industry, industry_other_non_specified]
diff --git a/...n_specified/external_coupling_industry_useful_demand_for_other_non_specified_energetic.ad b/...n_specified/external_coupling_industry_useful_demand_for_other_non_specified_energetic.ad
diff --git a/...ecified/external_coupling_industry_useful_demand_for_other_non_specified_non_energetic.ad b/...ecified/external_coupling_industry_useful_demand_for_other_non_specified_non_energetic.ad
diff --git a/...ernal_coupling/industry_other_paper/external_coupling_industry_other_paper_electricity.ad b/...ernal_coupling/industry_other_paper/external_coupling_industry_other_paper_electricity.ad
diff --git a/...rnal_coupling/industry_other_paper/external_coupling_industry_other_paper_useable_heat.ad b/...rnal_coupling/industry_other_paper/external_coupling_industry_other_paper_useable_heat.ad