Skip to content
Snippets Groups Projects
Commit 399c3dc1 authored by Alois Dirnaichner's avatar Alois Dirnaichner
Browse files

Move bioliquid bound to core to be usable for complex and edge_esm realisations.

parent f891b69b
No related branches found
No related tags found
1 merge request!159Pullreq1
...@@ -274,6 +274,7 @@ cfg$gms$cm_ccapturescen <- 1 # def <- 1 ...@@ -274,6 +274,7 @@ cfg$gms$cm_ccapturescen <- 1 # def <- 1
cfg$gms$c_bioliqscen <- 1 # def <- 1 cfg$gms$c_bioliqscen <- 1 # def <- 1
cfg$gms$c_bioh2scen <- 1 # def <- 1 cfg$gms$c_bioh2scen <- 1 # def <- 1
cfg$gms$c_shGreenh2 <- 0 # def <- 0 cfg$gms$c_shGreenh2 <- 0 # def <- 0
cfg$gms$c_shBioTrans <- 1 # def <- 1
cfg$gms$cm_shSynTrans <- 0 # def <- 0 cfg$gms$cm_shSynTrans <- 0 # def <- 0
cfg$gms$cm_IndCCSscen <- 1 # def <- 1 cfg$gms$cm_IndCCSscen <- 1 # def <- 1
cfg$gms$cm_optimisticMAC <- 0 # def <- 0 cfg$gms$cm_optimisticMAC <- 0 # def <- 0
...@@ -532,6 +533,8 @@ cfg$RunsUsingTHISgdxAsBAU <- NA ...@@ -532,6 +533,8 @@ cfg$RunsUsingTHISgdxAsBAU <- NA
# (1): all technologies # (1): all technologies
# c_shGreenH2 "lower bound on share of green hydrogen in all hydrogen by 2030" # c_shGreenH2 "lower bound on share of green hydrogen in all hydrogen by 2030"
# (a number between 0 and 1): share # (a number between 0 and 1): share
# c_shBioTrans "upper bound on share of biofuels in transport fuels from 2020 onwards"
# (a number between 0 and 1): share
# cm_shSynTrans "lower bound on share of synfuels in transport fuels by 2035" # cm_shSynTrans "lower bound on share of synfuels in transport fuels by 2035"
# (a number between 0 and 1): share # (a number between 0 and 1): share
# c_solscen "solar option choice" # c_solscen "solar option choice"
......
...@@ -504,5 +504,10 @@ loop ((t, regi) $ ( (sameAs(t,"2010") OR sameAs(t,"2015")) ...@@ -504,5 +504,10 @@ loop ((t, regi) $ ( (sameAs(t,"2010") OR sameAs(t,"2015"))
v_shGreenH2.lo(t,regi)$(t.val eq 2025) = c_shGreenH2 * 2/3; v_shGreenH2.lo(t,regi)$(t.val eq 2025) = c_shGreenH2 * 2/3;
v_shGreenH2.lo(t,regi)$(t.val gt 2025) = c_shGreenH2; v_shGreenH2.lo(t,regi)$(t.val gt 2025) = c_shGreenH2;
***----------------------------------------------------------------------------
*** upper bound on bioliquids as a share of transport liquids
***----------------------------------------------------------------------------
v_shBioTrans.up(t,regi)$(t.val > 2020) = c_shBioTrans;
*** EOF ./core/bounds.gms *** EOF ./core/bounds.gms
...@@ -301,6 +301,7 @@ vm_demSeOth(ttot,all_regi,all_enty,all_te) "other sety demand from cert ...@@ -301,6 +301,7 @@ vm_demSeOth(ttot,all_regi,all_enty,all_te) "other sety demand from cert
vm_prodSeOth(ttot,all_regi,all_enty,all_te) "other sety production from certain technologies, have to be calculated in additional equations [TWa]" vm_prodSeOth(ttot,all_regi,all_enty,all_te) "other sety production from certain technologies, have to be calculated in additional equations [TWa]"
v_shGreenH2(ttot,all_regi) "share of green hydrogen in all hydrogen by 2030 [0..1]" v_shGreenH2(ttot,all_regi) "share of green hydrogen in all hydrogen by 2030 [0..1]"
v_shBioTrans(ttot,all_regi) "Share of biofuels in all final energies used for transportation. Value between 0 and 1."
*** ES layer variables *** ES layer variables
vm_demFeForEs(ttot,all_regi,all_enty,all_esty,all_teEs) "Final energy which will be used in the ES layer." vm_demFeForEs(ttot,all_regi,all_enty,all_esty,all_teEs) "Final energy which will be used in the ES layer."
...@@ -391,6 +392,7 @@ q_es2ppfen(ttot,all_regi,all_in) "Energy services are h ...@@ -391,6 +392,7 @@ q_es2ppfen(ttot,all_regi,all_in) "Energy services are h
q_shFeCes(ttot,all_regi,all_enty,all_in,all_teEs) "Shares of final energies in production factors." q_shFeCes(ttot,all_regi,all_enty,all_in,all_teEs) "Shares of final energies in production factors."
*q_shFeCesNorm(ttot,all_regi,all_in) "Shares have to sum to 1." *q_shFeCesNorm(ttot,all_regi,all_in) "Shares have to sum to 1."
q_shGreenH2(ttot,all_regi) "share of green hydrogen in all hydrogen" q_shGreenH2(ttot,all_regi) "share of green hydrogen in all hydrogen"
q_shBioTrans(ttot,all_regi) "Define the share of biofuels in all final energies for transportation."
***---------------------------------------------------------------------------------------- ***----------------------------------------------------------------------------------------
***----------------------------------------------trade module------------------------------ ***----------------------------------------------trade module------------------------------
......
...@@ -827,5 +827,16 @@ q_shGreenH2(t,regi).. ...@@ -827,5 +827,16 @@ q_shGreenH2(t,regi)..
) * v_shGreenH2(t,regi) ) * v_shGreenH2(t,regi)
; ;
***---------------------------------------------------------------------------
*' Share of biofuels in transport liquids
***---------------------------------------------------------------------------
q_shBioTrans(t,regi)..
sum(se2fe(seAgg2se("all_seliq", entySe),entyFeTrans,te), vm_prodFe(t,regi,entySe,entyFeTrans,te) )
* v_shBioTrans(t,regi)
=e=
sum(se2fe("seliqbio",entyFeTrans,te), vm_prodFe(t,regi,"seliqbio",entyFeTrans,te) )
;
*** EOF ./core/equations.gms *** EOF ./core/equations.gms
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
* *
* Input data revision: 5.942 * Input data revision: 5.942
* *
* Last modification (input data): Thu Apr 23 11:28:04 2020 * Last modification (input data): Tue Apr 28 08:29:32 2020
* *
*###################### R SECTION END (VERSION INFO) ########################### *###################### R SECTION END (VERSION INFO) ###########################
...@@ -220,8 +220,9 @@ cm_nucscen "nuclear option choice" ...@@ -220,8 +220,9 @@ cm_nucscen "nuclear option choice"
cm_ccapturescen "carbon capture option choice" cm_ccapturescen "carbon capture option choice"
c_bioliqscen "bioenergy liquids technology choise" c_bioliqscen "bioenergy liquids technology choise"
c_bioh2scen "bioenergy hydrogen technology choice" c_bioh2scen "bioenergy hydrogen technology choice"
c_shGreenH2 "share of green hydrogen in all hydrogen by 2030" c_shGreenH2 "lower bound on share of green hydrogen in all hydrogen by 2030"
cm_shSynTrans "share of synthetic fuels in all transport fuels by 2035" c_shBioTrans "upper bound on share of bioliquids in all transport liquids from 2020 onwards"
cm_shSynTrans "lower bound on share of synthetic fuels in all transport fuels by 2035"
cm_IndCCSscen "CCS for Industry" cm_IndCCSscen "CCS for Industry"
cm_optimisticMAC "assume optimistic Industry MAC from AR5 Ch. 10?" cm_optimisticMAC "assume optimistic Industry MAC from AR5 Ch. 10?"
cm_CCS_cement "CCS for cement sub-sector" cm_CCS_cement "CCS for cement sub-sector"
...@@ -312,6 +313,7 @@ cm_ccapturescen = 1; !! def = 1 ...@@ -312,6 +313,7 @@ cm_ccapturescen = 1; !! def = 1
c_bioliqscen = 1; !! def = 1 c_bioliqscen = 1; !! def = 1
c_bioh2scen = 1; !! def = 1 c_bioh2scen = 1; !! def = 1
c_shGreenH2 = 0; !! def = 0 c_shGreenH2 = 0; !! def = 0
c_shBioTrans = 1; !! def = 1
cm_shSynTrans = 0; !! def = 0 cm_shSynTrans = 0; !! def = 0
c_solscen = 1; !! def = 1 c_solscen = 1; !! def = 1
......
...@@ -5,8 +5,4 @@ ...@@ -5,8 +5,4 @@
*** | REMIND License Exception, version 1.0 (see LICENSE file). *** | REMIND License Exception, version 1.0 (see LICENSE file).
*** | Contact: remind@pik-potsdam.de *** | Contact: remind@pik-potsdam.de
*** SOF ./modules/35_transport/edge_esm/bounds.gms *** SOF ./modules/35_transport/edge_esm/bounds.gms
*** upper bound on bioliquids to 2020 value for all scenarios
v35_shBioFe.up(t,regi)$(t.val > 2020) = 0.05;
*** EOF ./modules/35_transport/edge_esm/bounds.gms *** EOF ./modules/35_transport/edge_esm/bounds.gms
...@@ -10,11 +10,9 @@ pm_bunker_share_in_nonldv_fe(tall,all_regi) "Share of bunkers in non-LDV trans ...@@ -10,11 +10,9 @@ pm_bunker_share_in_nonldv_fe(tall,all_regi) "Share of bunkers in non-LDV trans
; ;
Positive variables Positive variables
v35_shBioFe(ttot,all_regi) "Share of biofuels in all final energies used for transportation. Value between 0 and 1."
; ;
Equations Equations
q35_shBioFe(ttot,all_regi) "Define the share of biofuels in all final energies for transportation."
; ;
*** EOF ./modules/35_transport/edge_esm/declarations.gms *** EOF ./modules/35_transport/edge_esm/declarations.gms
...@@ -6,12 +6,4 @@ ...@@ -6,12 +6,4 @@
*** | Contact: remind@pik-potsdam.de *** | Contact: remind@pik-potsdam.de
*** SOF ./modules/35_transport/edge_esm/equations.gms *** SOF ./modules/35_transport/edge_esm/equations.gms
*' Adjust the shares of biofuels in transport liquids.
q35_shBioFe(t,regi)..
sum(se2fe(entySe,fe_transport_liquids_dyn35,te), vm_prodFe(t,regi,entySe,fe_transport_liquids_dyn35,te) )
* v35_shBioFe(t,regi)
=e=
sum(se2fe("seliqbio",fe_transport_liquids_dyn35,te), vm_prodFe(t,regi,"seliqbio",fe_transport_liquids_dyn35,te) )
;
*** EOF ./modules/35_transport/edge_esm/equations.gms *** EOF ./modules/35_transport/edge_esm/equations.gms
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment