reversing unwanted chantes to merge into develop

config/default.cfg

@@ -14,7 +14,7 @@ cfg <- list()
 #### Main settings ####
 
 # short description of the actual run
-cfg$title <- "test33_merged_new_inputs_luh_2015"
+cfg$title <- "default"
 
 # path to the submodel to be used relative to main model folder
 cfg$model <- "main.gms"   #def = "main.gms"
@@ -26,7 +26,7 @@ cfg$input <- c(regional    = "rev4.104_h12_magpie.tgz",
                cellular    = "rev4.104_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
                validation  = "rev4.104_h12_validation.tgz",
                additional  = "additional_data_rev4.48.tgz",
-               calibration = "calibration_H12_grassland_mar22.tgz")
+               calibration = "calibration_H12_26Mar24.tgz")
 
 # NOTE: It is recommended to recalibrate the model when changing cellular input data
 #       as well as for any other setting that would affect initial values in the model,
@@ -273,7 +273,7 @@ cfg$gms$tc <- "endo_jan22"              # def = endo_jan22
 cfg$gms$c13_tccost <- "medium"    # def = medium
 
 # * ignore historical tau (1) or use it as lower bound (0)
-cfg$gms$s13_ignore_tau_historical <- 0    # def = 1
+cfg$gms$s13_ignore_tau_historical <- 1    # def = 1
 
 # * Maximum regional tech cost expressed as share of regional GDP
 # *   A meaningful value would be 0.002. However, this bound causes infeasibilities in some cases.
@@ -328,7 +328,7 @@ cfg$gms$s14_degradation <- 0      # def = 0
 # must be supplied in the input directory, or yields must be recalibrated during preprocessing.)
 # This switch should only be activated for penalty_apr22 crop realization.
 # For other realizations, it is recommended not to use this yield calibration.
-cfg$gms$s14_use_yield_calib <- 0    # def = 1
+cfg$gms$s14_use_yield_calib <- 0    # def = 0
 
 # Include a minimum yield for wood harvest in secondary vegetation (tDM per ha per yr).
 # Age classes with wood yields below this threshold have a production of zero.
@@ -737,7 +737,7 @@ cfg$gms$land_snv <- "secdforest, forestry, past, other"    #def = "secdforest, f
 # * (endo_jun13): dynamic pasture
 # * (grasslands_apr22): Grassland management separating managed pastures from rangelands
 # NOTE: It is recommended to recalibrate the model when changing this setting!
-cfg$gms$past <- "grasslands_apr22"               # def = endo_jun13
+cfg$gms$past <- "endo_jun13"               # def = endo_jun13
 
 # * Factor requirements (USD04 per ton DM)
 cfg$gms$s31_fac_req_past  <- 1             # def = 1
@@ -2014,4 +2014,4 @@ cfg$developer_mode <- FALSE
 # wrong
 cfg$debug <- FALSE
 
-################################################################################
+################################################################################

main.gms

@@ -147,44 +147,44 @@ $title magpie
 *'  * Always try to access model outputs through the corresponding magpie package instead of accessing them directly with readGDX. It cannot be guaranteed that your script will work in the future if you do otherwise (as only the corresponding magpie package will be continuously adapted to changes in the GAMS code).
 
 *##################### R SECTION START (VERSION INFO) ##########################
-* 
-* Used data set: rev4.104_h12_magpie.tgz
+*
+* Used data set: rev4.99_h12_magpie.tgz
 * md5sum: NA
-* Repository: https://rse.pik-potsdam.de/data/magpie/public
-* 
-* Used data set: rev4.104_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
+* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
+*
+* Used data set: rev4.99_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz
 * md5sum: NA
-* Repository: https://rse.pik-potsdam.de/data/magpie/public
-* 
-* Used data set: rev4.104_h12_validation.tgz
+* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
+*
+* Used data set: rev4.99_h12_validation.tgz
 * md5sum: NA
-* Repository: https://rse.pik-potsdam.de/data/magpie/public
-* 
-* Used data set: additional_data_rev4.48.tgz
+* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
+*
+* Used data set: additional_data_rev4.47.tgz
+* md5sum: NA
+* Repository: scp://cluster.pik-potsdam.de/p/projects/landuse/data/input/archive
+*
+* Used data set: calibration_H12_per_ton_fao_may22_glo_08Aug23.tgz
 * md5sum: NA
 * Repository: https://rse.pik-potsdam.de/data/magpie/public
-* 
-* Used data set: calibration_H12_grassland_mar22.tgz
-* md5sum: 99507cd40ca11b541b3c6120208cca2d
-* Repository: /p/projects/landuse/data/input/calibration
-* 
+*
 * Low resolution: c200
 * High resolution: 0.5
-* 
+*
 * Total number of cells: 200
-* 
+*
 * Number of cells per region:
 *   CAZ  CHA  EUR  IND  JPN  LAM  MEA  NEU  OAS  REF  SSA  USA
 *    14   23   10    7    4   26   21    9   16   23   32   15
-* 
+*
 * Regionscode: 62eff8f7
-* 
-* Regions data revision: 4.104
-* 
+*
+* Regions data revision: 4.99
+*
 * lpj2magpie settings:
 * * LPJmL data: MRI-ESM2-0:ssp370
-* * Revision: 4.104
-* 
+* * Revision: 4.99
+*
 * aggregation settings:
 * * Input resolution: 0.5
 * * Output resolution: c200
@@ -193,10 +193,10 @@ $title magpie
 *   CAZ  CHA  EUR  IND  JPN  LAM  MEA  NEU  OAS  REF  SSA  USA
 *    14   23   10    7    4   26   21    9   16   23   32   15
 * * Call: withCallingHandlers(expr, message = messageHandler, warning = warningHandler,     error = errorHandler)
-* 
-* 
-* Last modification (input data): Sat Apr 13 23:04:55 2024
-* 
+*
+*
+* Last modification (input data): Wed Feb  7 15:35:14 2024
+*
 *###################### R SECTION END (VERSION INFO) ###########################
 
 $offupper
@@ -221,7 +221,7 @@ $offlisting
 
 $setglobal c_timesteps  coup2100
 $setglobal c_past  till_2010
-$setglobal c_title  test33_merged_new_inputs_luh_2015
+$setglobal c_title  default
 
 scalars
 s_use_gdx   use of gdx files                                       / 0 /
@@ -250,7 +250,7 @@ $setglobal land_conservation  area_based_apr22
 $setglobal ageclass  feb21
 
 $setglobal crop  endo_apr21
-$setglobal past  grasslands_apr22
+$setglobal past  endo_jun13
 
 $setglobal forestry  dynamic_feb21
 
@@ -334,4 +334,4 @@ $batinclude "./modules/include.gms" scaling
 $include "./core/calculations.gms"
 ********************************************************************************
 
-*** EOF magpie.gms ***
+*** EOF magpie.gms ***

modules/13_tc/endo_jan22/input.gms

@@ -7,7 +7,7 @@
 
 
 scalars
- s13_ignore_tau_historical  ignore historical tau (1) or use it as lower bound (0) (binary) / 0 /
+ s13_ignore_tau_historical  ignore historical tau (1) or use it as lower bound (0) (binary) / 1 /
  s13_max_gdp_shr Maximum tech cost as share of regional GDP / Inf /
 ;