diff --git a/core/datainput.gms b/core/datainput.gms index e1071c09080f68ae9fe9cc354124838336a941b9..a46dd2bd75369275318c5dd6bf4f566d85d25867 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 f25ee5b2b9f11f9632be12ae4fc10d925bcccb50..51f627e59496071b50cec8c7f920ec4590c0a856 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 924bf23221cd916ca908124ce520e15e7b086f1c..79101a4c356146f618ac2685d5f5d0630ba9ec01 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; );