*bugfix* choose the right GDPpcScen according to the gdpScen

core/datainput.gms

@@ -111,15 +111,6 @@ $ondelim
 $include "./core/input/f_developmentState.cs3r"
 $offdelim
 ;
-
-*** Set c_GDPpcScen according to c_GDPScen
-$if %cm_GDPscen% == "gdp_SDP" c_GDPpcScen = "SDP";
-$if %cm_GDPscen% == "gdp_SSP1" c_GDPpcScen = "SSP1";
-$if %cm_GDPscen% == "gdp_SSP2" c_GDPpcScen = "SSP2";
-$if %cm_GDPscen% == "gdp_SSP3" c_GDPpcScen = "SSP3";
-$if %cm_GDPscen% == "gdp_SSP4" c_GDPpcScen = "SSP4";
-$if %cm_GDPscen% == "gdp_SSP5" c_GDPpcScen = "SSP5";
-
 p_developmentState(tall,all_regi) = f_developmentState(tall,all_regi,"%c_GDPpcScen%");
 
 *** load data for macro investments in 2005, used as bound

core/sets.gms

@@ -765,6 +765,7 @@ iso_regi "all iso countries and EU and greater China region" /  EUR,CHA,
 ***######################## R SECTION START (MODULES) ###############################
 *** THIS CODE IS CREATED AUTOMATICALLY, DO NOT MODIFY THESE LINES DIRECTLY
 *** ANY DIRECT MODIFICATION WILL BE LOST AFTER NEXT MODEL START
+*** CHANGES CAN BE DONE USING THE RESPECTIVE LINES IN scripts/start_functions.R
 
 sets
 
@@ -802,7 +803,7 @@ sets
        codePerformance
        /
 
-      module2realisation(modules,*) "mapping of modules and active realisations" /
+module2realisation(modules,*) "mapping of modules and active realisations" /
        PE_FE_parameters . %PE_FE_parameters%
        initialCap . %initialCap%
        aerosols . %aerosols%

main.gms

@@ -58,7 +58,7 @@
 * 
 * Input data revision: 5.936
 * 
-* Last modification (input data): Fri Dec 06 16:04:29 2019
+* Last modification (input data): Wed Dec 11 09:40:06 2019
 * 
 *###################### R SECTION END (VERSION INFO) ###########################
 
@@ -297,7 +297,7 @@ c21_cprice_red_factor  = 0.5;         !! def = 0.5
 
 $setglobal cm_POPscen  pop_SSP2  !! def = pop_SSP2
 $setglobal cm_GDPscen  gdp_SSP2  !! def = gdp_SSP2
-$setglobal c_GDPpcScen  SSP2     !! def = gdp_SSP2   (automatically adjusted in core/datainput.gms based on GDPscen) 
+$setglobal c_GDPpcScen  SSP2     !! def = gdp_SSP2   (automatically adjusted by start_run() based on GDPscen) 
 
 *AG* and *CB* for cm_startyear greater than 2005, you have to copy the fulldata.gdx (rename it to: input_ref.gdx) from the run you want to build your new run onto.
 cm_startyear      = 2005;      !! def = 2005 for a BAU, 2015 for policy runs

scripts/start_functions.R

@@ -86,6 +86,8 @@ start_run <- function(cfg, scenario = NULL, report = NULL, sceninreport = NULL,
                                       "GDP_", cfg$gms$cm_GDPscen, "-",
                                       "Kap_", cfg$gms$capitalMarket, "-",
                                       "Reg_", substr(regionscode(cfg$regionmapping),1,10))
+   # adjust GDPpcScen based on GDPscen
+  cfg$gms$c_GDPpcScen <- gsub("gdp_","",cfg$gms$cm_GDPscen) 
 
   ################## M O D E L   L O C K ###################################
   # Lock the directory for other instances of the start scritps