From 8416a85214f77d735cfe6fca0542100f826edeae Mon Sep 17 00:00:00 2001
From: Alois Dirnaichner <alodi@directbox.com>
Date: Tue, 14 Jan 2020 10:58:21 +0100
Subject: [PATCH] Move definition of synfuel shares to the edge_esm module for
separation of concerns.
---
modules/35_transport/edge_esm/bounds.gms | 6 ++++++
.../35_transport/edge_esm/declarations.gms | 6 ++++--
modules/35_transport/edge_esm/equations.gms | 20 +++++++++++++++++++
modules/39_CCU/on/bounds.gms | 4 ----
modules/39_CCU/on/declarations.gms | 4 ----
modules/39_CCU/on/equations.gms | 8 --------
6 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/modules/35_transport/edge_esm/bounds.gms b/modules/35_transport/edge_esm/bounds.gms
index e62d04d..7dd58d1 100644
--- a/modules/35_transport/edge_esm/bounds.gms
+++ b/modules/35_transport/edge_esm/bounds.gms
@@ -5,9 +5,15 @@
*** | REMIND License Exception, version 1.0 (see LICENSE file).
*** | Contact: remind@pik-potsdam.de
*** SOF ./modules/35_transport/edge_esm/bounds.gms
+
+* Specify amount of syn- and biofuels to be used in transport
vm_shBioFe.lo(t,regi)$(t.val > 2020) = 0.1;
vm_shBioFe.lo(t,regi)$(t.val > 2025) = 0.2;
vm_shBioFe.lo(t,regi)$(t.val > 2030) = 0.3;
+vm_shSynSe.lo(t,regi)$(t.val > 2020) = 0.1;
+vm_shSynSe.lo(t,regi)$(t.val > 2025) = 0.2;
+vm_shSynSe.lo(t,regi)$(t.val > 2030) = 0.4;
+
* vm_cesIO.up(t,regi,ppfen_dyn35)$(t.val > 2020) = p35_demLimit(t,regi,"gdp_SSP2","Smart_lifestyles_Electricity_push",ppfen_dyn35);
*** EOF ./modules/35_transport/edge_esm/bounds.gms
diff --git a/modules/35_transport/edge_esm/declarations.gms b/modules/35_transport/edge_esm/declarations.gms
index 4827f6d..ba00f04 100644
--- a/modules/35_transport/edge_esm/declarations.gms
+++ b/modules/35_transport/edge_esm/declarations.gms
@@ -6,10 +6,12 @@
*** | Contact: remind@pik-potsdam.de
*** SOF ./modules/35_transport/edge_esm/declarations.gms
Positive variables
-vm_shBioFe(ttot,all_regi) "Share of biofuels in all final energies used for transportation. Value between 0 and 1."
+vm_shBioFe(ttot,all_regi) "Share of biofuels in all final energies used for transportation. Value between 0 and 1."
+vm_shSynSe(ttot,all_regi) "Share of synthetic liquids in all fossil liquids. Value between 0 and 1."
;
Equations
-q35_shBioFe(ttot,all_regi) "Define the share of biofuels in all final energies for transportation."
+q35_shBioFe(ttot,all_regi) "Define the share of biofuels in all final energies for transportation."
+q35_shSynSe(ttot,all_regi) "Define share of synthetic liquids in all fossil liquids."
;
*** EOF ./modules/35_transport/edge_esm/declarations.gms
diff --git a/modules/35_transport/edge_esm/equations.gms b/modules/35_transport/edge_esm/equations.gms
index 9095bba..1da2e84 100644
--- a/modules/35_transport/edge_esm/equations.gms
+++ b/modules/35_transport/edge_esm/equations.gms
@@ -6,10 +6,30 @@
*** | Contact: remind@pik-potsdam.de
*** SOF ./modules/35_transport/edge_esm/equations.gms
+***---------------------------------------------------------------------------
+*** Share of biofuels in transport liquids
+***---------------------------------------------------------------------------
+
q35_shBioFe(t,regi)..
sum(se2fe(entySe,fe_with_bio_dyn35,te), vm_prodFe(t,regi,entySe,fe_with_bio_dyn35,te) )
* vm_shBioFe(t,regi)
=e=
sum(se2fe(se_with_bio_dyn35,fe_with_bio_dyn35,te), vm_prodFe(t,regi,se_with_bio_dyn35,fe_with_bio_dyn35,te) )
;
+
+***---------------------------------------------------------------------------
+*** Share of synfuels in transport liquids, only applicable if CCU module is used
+***---------------------------------------------------------------------------
+
+$ifthen.ccu %CCU% == "on"
+q35_shSynSe(t,regi)..
+ (
+ sum(se2fe(entySe,"fepet",te), vm_prodFe(t,regi,entySe,"fepet",te) ) +
+ sum(se2fe(entySe,"fedie",te), vm_prodFe(t,regi,entySe,"fedie",te) )
+ ) * vm_shSynSe(t,regi)
+ =e=
+ vm_prodSe(t,regi,"seh2","seliqfos","MeOH")
+;
+$endif.ccu
+
*** EOF ./modules/35_transport/edge_esm/equations.gms
diff --git a/modules/39_CCU/on/bounds.gms b/modules/39_CCU/on/bounds.gms
index b1748a4..f9cbed4 100644
--- a/modules/39_CCU/on/bounds.gms
+++ b/modules/39_CCU/on/bounds.gms
@@ -46,9 +46,5 @@ vm_co2capture.up(t,regi,"cco2","ico2","ccsinje","1") = 50;
*** vm_prodSe.lo("2060","SSA",enty,"segafos",te) = 1;
*** vm_prodSe.lo("2060","USA",enty,"segafos",te) = 0.5;
-vm_shSynSe.lo(t,regi)$(t.val > 2020) = 0.1;
-vm_shSynSe.lo(t,regi)$(t.val > 2025) = 0.2;
-vm_shSynSe.lo(t,regi)$(t.val > 2030) = 0.4;
-
*** EOF ./modules/39_CCU/39_CCU.gms
diff --git a/modules/39_CCU/on/declarations.gms b/modules/39_CCU/on/declarations.gms
index 0f0f094..bdf2fd8 100644
--- a/modules/39_CCU/on/declarations.gms
+++ b/modules/39_CCU/on/declarations.gms
@@ -25,8 +25,6 @@ p39_ratioCtoH(tall,all_regi,all_enty,all_enty,all_te,all_enty) "ratio be
positive variables
vm_co2CCUshort(ttot,all_regi,all_enty,all_enty,all_te,rlf) "CO2 captured in CCU te that have a persistence for co2 storage shorter than 5 years. Unit GtC/a"
-
-vm_shSynSe(ttot,all_regi) "Share of synthetic liquids in all fossil liquids. Value between 0 and 1."
;
@@ -38,8 +36,6 @@ vm_shSynSe(ttot,all_regi) "Share of synthetic liquids in all fossil liq
equations
q39_emiCCU(ttot,all_regi) "Managing the C/H ratio in CCU-Technologies"
-
-q39_shSynSe(ttot,all_regi) "Define share of synthetic liquids in all fossil liquids."
;
*** EOF ./modules/39_CCU/on/declarations.gms
diff --git a/modules/39_CCU/on/equations.gms b/modules/39_CCU/on/equations.gms
index 7153ef5..b0e0535 100644
--- a/modules/39_CCU/on/equations.gms
+++ b/modules/39_CCU/on/equations.gms
@@ -23,13 +23,5 @@ q39_emiCCU(t,regi) ..
)
;
-q39_shSynSe(t,regi)..
- (
- sum(se2fe(entySe,"fepet",te), vm_prodFe(t,regi,entySe,"fepet",te) ) +
- sum(se2fe(entySe,"fedie",te), vm_prodFe(t,regi,entySe,"fedie",te) )
- ) * vm_shSynSe(t,regi)
- =e=
- vm_prodSe(t,regi,"seh2","seliqfos","MeOH")
-;
*** EOF ./modules/39_CCU/on/equations.gms
--
GitLab