diff --git a/config/default.cfg b/config/default.cfg index 82d370b4d4050de5ccf57cba625724b483ab9227..cc6584c8234b68dbf4b198406cbde6a5ce5c6349 100755 --- a/config/default.cfg +++ b/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 diff --git a/main.gms b/main.gms index 9b8587fbfebc47f2b95ee78b3fa2c17029150f11..c9f1f342a72fba66fb57070f46f35e7bab4a2000 100755 --- a/main.gms +++ b/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 diff --git a/modules/23_capitalMarket/debt_limit/realization.gms b/modules/23_capitalMarket/debt_limit/realization.gms index 1f1cdf978b0e9f5db92bb0384f0fd5d9b6ffb8ae..04bc7a1dc75bd6fbf1e779630b3675804257b315 100644 --- a/modules/23_capitalMarket/debt_limit/realization.gms +++ b/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 diff --git a/modules/23_capitalMarket/module.gms b/modules/23_capitalMarket/module.gms index 09b30c5738b4cc34d840429708a7e75b11bc0c29..2b5d27b30d41e5a00ce02bdad42ea1ab57162f8f 100644 --- a/modules/23_capitalMarket/module.gms +++ b/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) ############################ diff --git a/modules/29_CES_parameters/load/datainput.gms b/modules/29_CES_parameters/load/datainput.gms index a951c9eb66931960f198acc99f9bfa82908abe63..dd517885d2160e650423d47632055545a33fab3a 100644 --- a/modules/29_CES_parameters/load/datainput.gms +++ b/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) ###########################