From b0bf4751e0c851ab5942c2e671ab82fd1497fb40 Mon Sep 17 00:00:00 2001
From: Alois Dirnaichner <alodi@directbox.com>
Date: Sun, 12 Jan 2020 20:54:47 +0100
Subject: [PATCH] Add bounds for cesIO for the case of the smart lifestyles.

---
 config/default.cfg                            |   2 +-
 modules/35_transport/edge_esm/bounds.gms      |   8 +-
 modules/35_transport/edge_esm/datainput.gms   |   7 +
 .../edge_esm/input/dem_smart_Elpush.csv       | 144 ++++++++++++++++++
 modules/39_CCU/on/bounds.gms                  |   6 +-
 5 files changed, 160 insertions(+), 7 deletions(-)
 create mode 100644 modules/35_transport/edge_esm/input/dem_smart_Elpush.csv

diff --git a/config/default.cfg b/config/default.cfg
index f752ae8..0c5a116 100755
--- a/config/default.cfg
+++ b/config/default.cfg
@@ -157,7 +157,7 @@ cfg$gms$stationary  <- "off"      # def = off
 # ***---------------------    39_CCU    ---------------------------------
 # * (on): simple representation of carbon capture and utilization technologies, first only example of syngas (H22CH4)
 # * (off): no representation of carbon caputre and utilization technologies.
-cfg$gms$CCU  <- "on"      # def = off
+cfg$gms$CCU  <- "off"      # def = off
 
 # ***---------------------    40_techpol  ----------------------------------------
 # * (none): no technology policies
diff --git a/modules/35_transport/edge_esm/bounds.gms b/modules/35_transport/edge_esm/bounds.gms
index 3824fb4..ebd969c 100644
--- a/modules/35_transport/edge_esm/bounds.gms
+++ b/modules/35_transport/edge_esm/bounds.gms
@@ -5,7 +5,9 @@
 *** |  REMIND License Exception, version 1.0 (see LICENSE file).
 *** |  Contact: remind@pik-potsdam.de
 *** SOF ./modules/35_transport/edge_esm/bounds.gms
-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.4;
+* 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.4;
+
+vm_cesIO.up(t,regi,ppfen_dyn35)$(t.val > 2025) = 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/datainput.gms b/modules/35_transport/edge_esm/datainput.gms
index a096185..f3afadf 100644
--- a/modules/35_transport/edge_esm/datainput.gms
+++ b/modules/35_transport/edge_esm/datainput.gms
@@ -37,6 +37,13 @@ $include "./modules/35_transport/edge_esm/input/fe_demand_tech.cs4r"
 $offdelim
 /
 
+p35_demLimit(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_in)
+/
+$ondelim
+$include "./modules/35_transport/edge_esm/input/dem_smart_Elpush.csv"
+$offdelim
+/
+
 p35_shFeCes(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_enty,all_in,all_teEs)                "shares by fuel"
 ;
 
diff --git a/modules/35_transport/edge_esm/input/dem_smart_Elpush.csv b/modules/35_transport/edge_esm/input/dem_smart_Elpush.csv
new file mode 100644
index 0000000..6f54193
--- /dev/null
+++ b/modules/35_transport/edge_esm/input/dem_smart_Elpush.csv
@@ -0,0 +1,144 @@
+2025,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,6.24309698212893
+2030,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,6.79587997503924
+2035,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,7.27831480628151
+2040,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,7.76466887350506
+2045,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,8.2563858412508
+2050,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,8.71962644782441
+2055,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.32027690468088
+2060,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.68787282864401
+2070,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.0383806584406
+2080,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.2435570120097
+2090,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.3152822632152
+2100,LAM,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.2825879360631
+2025,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,14.0695218754197
+2030,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,15.2696002534194
+2035,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,16.4126763006045
+2040,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,17.524182823723
+2045,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,18.587432408982
+2050,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,19.5274715353716
+2055,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,20.439673947715
+2060,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,21.3192991436734
+2070,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,21.4213185335351
+2080,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,21.3900517657935
+2090,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,21.2745630189427
+2100,OAS,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,21.0109012077816
+2025,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,4.65615314222515
+2030,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,5.39718990232859
+2035,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,6.19850121804566
+2040,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,7.06399418507898
+2045,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,7.97619633150432
+2050,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,8.90511980569121
+2055,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.89325583879245
+2060,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.8828073566921
+2070,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,11.1306144682154
+2080,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,11.1644093693921
+2090,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,11.1766283066499
+2100,SSA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,11.2680052070133
+2025,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,7.97732237878028
+2030,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,8.37227308292272
+2035,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.32634724891455
+2040,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.66657666447872
+2045,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.88485212495699
+2050,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.0684882355244
+2055,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.1886115283976
+2060,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.2716614469044
+2070,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.0696595379871
+2080,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.65166608631409
+2090,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.07049620346481
+2100,EUR,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,8.32539865549681
+2025,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.01885086725347
+2030,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.10818421194468
+2035,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.21897789482409
+2040,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.29250647049917
+2045,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.35870990399277
+2050,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.41650291022562
+2055,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.46812885556371
+2060,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.51343244886365
+2070,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.50742556083749
+2080,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.47536135647331
+2090,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.42606938812435
+2100,NEU,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.36090596329272
+2025,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,7.30656636140064
+2030,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,8.04655514890023
+2035,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,8.74412089494805
+2040,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.42240843916448
+2045,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.1159594262824
+2050,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.9516608319805
+2055,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,11.631153135576
+2060,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.3320012835099
+2070,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.6261028124719
+2080,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.7258599229384
+2090,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.7758492678432
+2100,MEA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.7802105870356
+2025,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.77997499091304
+2030,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.95201924380101
+2035,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,3.09352459252965
+2040,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,3.21436931179424
+2045,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,3.30965677311802
+2050,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,3.40356748138015
+2055,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,3.46710514385082
+2060,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,3.60811237323432
+2070,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,3.6492978202205
+2080,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,3.66566748007469
+2090,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,3.7850131259147
+2100,REF,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,3.91645125504782
+2025,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.77278301300578
+2030,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.87707965485501
+2035,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.14402584395205
+2040,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.24129509282265
+2045,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.33487423108446
+2050,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.43030516949236
+2055,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.50421970740126
+2060,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.57295571301299
+2070,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.5692811578477
+2080,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.52659341023597
+2090,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.45114466181447
+2100,CAZ,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,2.34122261343316
+2025,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.6752266479263
+2030,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.7934767708653
+2035,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.8601277017707
+2040,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.8957480949181
+2045,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.7656930298794
+2050,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.5442785690447
+2055,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.247247889822
+2060,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.1268129544564
+2070,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,11.4871097850879
+2080,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.7968735539462
+2090,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.0660108581639
+2100,CHA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.34001318205866
+2025,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,8.14668955805908
+2030,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.18247075499442
+2035,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.2541248465321
+2040,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,11.3314870273428
+2045,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.3504035165689
+2050,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,13.2564838731575
+2055,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,14.0335761689627
+2060,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,14.6432110990525
+2070,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,14.3109969825252
+2080,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,13.6610661653494
+2090,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.8574920714238
+2100,IND,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.0181139977268
+2025,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.41025500303994
+2030,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.41929967482353
+2035,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.49233582788614
+2040,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.47765030911559
+2045,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.45612329076874
+2050,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.42798351050907
+2055,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.39628362784093
+2060,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.35921043968212
+2070,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.28382467316994
+2080,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.18752347829221
+2090,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,1.07742298659647
+2100,JPN,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,0.962753030307015
+2025,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.07212824219562
+2030,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.53124876789285
+2035,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,9.86585397820507
+2040,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.5565887705728
+2045,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,10.5761066968476
+2050,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,11.3046012145315
+2055,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,12.885406985417
+2060,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,13.3318871434366
+2070,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,13.7865806871845
+2080,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,14.0174326792994
+2090,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,14.0729786898312
+2100,USA,gdp_SSP2,Smart_lifestyles_Electricity_push,entrp_pass_sm,13.9312356761351
diff --git a/modules/39_CCU/on/bounds.gms b/modules/39_CCU/on/bounds.gms
index b1748a4..5444642 100644
--- a/modules/39_CCU/on/bounds.gms
+++ b/modules/39_CCU/on/bounds.gms
@@ -46,9 +46,9 @@ 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;
+* 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
-- 
GitLab