From 8bd559559d693538276dfd560799f167de23685f Mon Sep 17 00:00:00 2001 From: Alois Dirnaichner <aloisdir@pik-potsdam.de> Date: Fri, 14 Feb 2020 10:47:58 +0100 Subject: [PATCH] Adjust comments from Jerome. --- core/datainput.gms | 2 +- modules/31_fossil/grades2poly/datainput.gms | 2 +- modules/31_fossil/timeDepGrades/datainput.gms | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/datainput.gms b/core/datainput.gms index e1071c0..a46dd2b 100644 --- a/core/datainput.gms +++ b/core/datainput.gms @@ -151,7 +151,7 @@ $include "./core/input/generisdata_tech_SSP1.prn" table f_dataglob_SSP5(char,all_te) "Techno-economic assumptions consistent with SSP5" $include "./core/input/generisdata_tech_SSP5.prn" ; -*JH* 20140604 (25th Anniversary of Tiananmen) New nuclear assumption for SSP5 +*JH* New nuclear assumption for SSP5 if (cm_nucscen eq 6, f_dataglob_SSP5("inco0","tnrs") = 6270; !! increased from 4000 to 6270 with the update of technology costs in REMIND 1.7 to keep the percentage increase between SSP2 and SSP5 constant ); diff --git a/modules/31_fossil/grades2poly/datainput.gms b/modules/31_fossil/grades2poly/datainput.gms index f25ee5b..51f627e 100644 --- a/modules/31_fossil/grades2poly/datainput.gms +++ b/modules/31_fossil/grades2poly/datainput.gms @@ -60,7 +60,7 @@ p31_fosadjco_xi5xi6(regi,"xi6","pegas")=1/1; *RP* Define bound on total PE uranium use in Megatonnes of metal uranium (U3O8, the stuff that is traded at 40-60US$/lb). s31_max_disp_peur = 23; -*JH* 20140604 (25th Anniversary of Tiananmen) New nuclear assumption for SSP5 +*JH* 20140604 New nuclear assumption for SSP5 if (cm_nucscen eq 6, s31_max_disp_peur = 23*10; ); diff --git a/modules/31_fossil/timeDepGrades/datainput.gms b/modules/31_fossil/timeDepGrades/datainput.gms index 924bf23..79101a4 100644 --- a/modules/31_fossil/timeDepGrades/datainput.gms +++ b/modules/31_fossil/timeDepGrades/datainput.gms @@ -132,7 +132,7 @@ $include "./modules/31_fossil/timeDepGrades/input/p31_datafosdyn.inc"; *RP* Define bound on total PE uranium use in Megatonnes of metal uranium (U3O8, the commodity that is traded at 40-60US$/lb). s31_max_disp_peur = 23; -*JH* 20140604 (25th Anniversary of Tiananmen) New nuclear assumption for SSP5 +*JH* 20140604 New nuclear assumption for SSP5 if (cm_nucscen eq 6, s31_max_disp_peur = 23*10; ); -- GitLab