Merge pull request #97 from LaviniaBaumstark/develop

increased input data revision

config/default.cfg

@@ -22,7 +22,7 @@ cfg$title <- "default"
 cfg$regionmapping <- "config/regionmappingH12.csv"
 
 #### Current input data revision (<mainrevision>.<subrevision>) ####
-cfg$revision <- 5.9386
+cfg$revision <- 5.939
 
 #### Force the model to download new input data ####
 cfg$force_download <- FALSE

main.gms

@@ -82,9 +82,9 @@
 * 
 * Regionscode: 690d3718e151be1b450b394c1064b1c5
 * 
-* Input data revision: 5.9386
+* Input data revision: 5.939
 * 
-* Last modification (input data): Wed Feb 26 11:38:50 2020
+* Last modification (input data): Thu Mar 05 11:36:34 2020
 * 
 *###################### R SECTION END (VERSION INFO) ###########################
 
@@ -421,7 +421,7 @@ $setGlobal cm_magicc_temperatureImpulseResponse  off           !! def = off
 
 $setGlobal cm_damage_DiceLike_specification  HowardNonCatastrophic   !! def = HowardNonCatastrophic
 
-$setglobal cm_CES_configuration  stat_off-indu_fixed_shares-buil_simple-tran_complex-POP_pop_SSP2-GDP_gdp_SSP2-Kap_perfect-Reg_690d3718e1   !! this will be changed by start_run()
+$setglobal cm_CES_configuration  stat_off-indu_fixed_shares-buil_simple-tran_complex-POP_pop_SSP2-GDP_gdp_SSP2-Kap_debt_limit-Reg_690d3718e1   !! this will be changed by start_run()
 
 $setglobal c_CES_calibration_new_structure  0    !! def =  0
 $setglobal c_CES_calibration_iterations  10    !! def = 10

modules/23_capitalMarket/debt_limit/realization.gms

@@ -16,8 +16,9 @@
 *' but not as well as with imperfect market realization.
 
 *####################### R SECTION START (PHASES) ##############################
-$Ifi "%phase%" == "declarations" $include "./modules/23_capitalMarket/perfect/declarations.gms"
-$Ifi "%phase%" == "datainput" $include "./modules/23_capitalMarket/perfect/datainput.gms"
+$Ifi "%phase%" == "declarations" $include "./modules/23_capitalMarket/debt_limit/declarations.gms"
+$Ifi "%phase%" == "datainput" $include "./modules/23_capitalMarket/debt_limit/datainput.gms"
+$Ifi "%phase%" == "equations" $include "./modules/23_capitalMarket/debt_limit/equations.gms"
 *######################## R SECTION END (PHASES) ###############################
 
 *** EOF ./module/23_capitalMarket/perfect.gms

modules/23_capitalMarket/module.gms

@@ -16,6 +16,7 @@
 *' @authors Marian Leimbach
 
 *###################### R SECTION START (MODULETYPES) ##########################
+$Ifi "%capitalMarket%" == "debt_limit" $include "./modules/23_capitalMarket/debt_limit/realization.gms"
 $Ifi "%capitalMarket%" == "imperfect" $include "./modules/23_capitalMarket/imperfect/realization.gms"
 $Ifi "%capitalMarket%" == "perfect" $include "./modules/23_capitalMarket/perfect/realization.gms"
 *###################### R SECTION END (MODULETYPES) ############################

modules/29_CES_parameters/load/datainput.gms

@@ -8,7 +8,7 @@
 *** Load CES parameters based on current model configuration
 *** ATTENTION the file name is replaced by the function start_run()
 *##################### R SECTION START (CES INPUT) ##########################
-$include "./modules/29_CES_parameters/load/input/stat_off-indu_fixed_shares-buil_simple-tran_complex-POP_pop_SSP2-GDP_gdp_SSP2-Kap_perfect-Reg_690d3718e1.inc"
+$include "./modules/29_CES_parameters/load/input/stat_off-indu_fixed_shares-buil_simple-tran_complex-POP_pop_SSP2-GDP_gdp_SSP2-Kap_debt_limit-Reg_690d3718e1.inc"
 *###################### R SECTION END (CES INPUT) ###########################