Merge branch 'develop' into develop

CHANGELOG.md

@@ -7,7 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### changed
-- **44_biodiversity** update `bii_target realization` to take `f44_rr_layer` into account in `q44_bii`
+- **config** updated FSEC scenario config for revision and included new calibration file (after cost fix in preprocessing)
+- **70_livestock** if `c70_fac_req_regr` is set to `reg`: use of USDA/FAO values for historic factor requirements for livestock instead of using regression values and change of calibration year from 2005 to 2010 for regional factor requirements regression
+- **21_trade** Revision of trade module. Replaced `cfg$gms$s21_trade_bal_damper` in favour of `cfg$gms$k_import21`, which allows for additional imports to maintain feasibility
+- **58_peatland** Threshold in equations changed from 1e-10 to 1e-8 to avoid rare divisions by zero
+- - **44_biodiversity** update `bii_target realization` to take `f44_rr_layer` into account in `q44_bii`
 - **default.cfg** update additional data to rev4.49
 
 ### added
@@ -33,6 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### fixed
 - **52_carbon** i52_land_carbon_sink was not identical before 2020 for different RCPs. Fixed by setting to RCPBU until the year defined in sm_fix_cc.
+- **inputdata** currency fixed in historic value of production for crops and livestock which affects e.g. total labor costs and in turn hourly labor costs, bugfix in aggregation weight of capital cost share out of factor costs
 
 
 ## [4.7.1] - 2024-02-28

config/default.cfg

@@ -22,11 +22,11 @@ cfg$model <- "main.gms"   #def = "main.gms"
 #### input settings ####
 
 # which input data sets should be used?
-cfg$input <- c(regional    = "rev4.99_h12_magpie.tgz",
-               cellular    = "rev4.99_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
-               validation  = "rev4.99_h12_validation.tgz",
-               additional  = "additional_data_rev4.49.tgz",
-               calibration = "calibration_H12_per_ton_fao_may22_glo_08Aug23.tgz")
+cfg$input <- c(regional    = "rev4.101_h12_magpie.tgz",
+               cellular    = "rev4.101_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
+               validation  = "rev4.101_h12_validation.tgz",
+               additional  = "additional_data_rev4.50.tgz",
+               calibration = "calibration_H12_per_ton_fao_may22_glo_13Mar24.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,
@@ -561,15 +561,21 @@ cfg$gms$c20_scp_type <- "sugar"                         # def = sugar
 # * (free_apr16):       free trade without restrictions
 # * (off):              no trade at all
 # * (exo):              exogenously prescribed trade
-# * (selfsuff_reduced): self-sufficiency based trade with trade costs related
-# *                     to exports
+# * (selfsuff_reduced): self-sufficiency based trade with trade costs related to exports
+# * (selfsuff_reduced_bilateral22): same as `selfsuff_reduced` but with bilateral trade flows
 cfg$gms$trade <- "selfsuff_reduced"             # def = selfsuff_reduced
 
 # * option for `exo` realization only:
 # * fix `v21_manna_from_heaven` to zero (0) or not (1)
 # Note: Without fixing to zero, v21_manna_from_heaven might be used unnecessarily in runs started with highres.R
 cfg$gms$s21_manna_from_heaven <- 0
 
+# * options for `selfsuff_reduced` and `selfsuff_reduced_bilateral22` realizations:
+# * Commodities that can have additional imports to maintain feasibility
+cfg$gms$k_import21 <- "wood, woodfuel"
+# * Cost for additional imports to maintain feasibility in USD05MER per tDM
+cfg$gms$s21_cost_import <- 10000               # def = 10000
+
 # * trade balance reduction scenario
 # * (l909090r808080):   10 percent trade liberalisation for secondary and
 # *                     livestock products in 2030,2050,2100 and 20 percent for
@@ -582,9 +588,11 @@ cfg$gms$s21_manna_from_heaven <- 0
 # * 1995 happens through the self-sufficiency pool. For later time steps, additional
 # * scenarios of trade liberalization (i.e. of allocation to the comparative advantage pool)
 # * are implemented based on Schmitz et al. 2012 (also described in Popp et al. 2017)
-
 cfg$gms$c21_trade_liberalization  <- "l909090r808080"     # def = l909090r808080
 
+# * Fraction to ease self sufficiency pool trade for roundwood
+cfg$gms$s21_trade_bal_damper <- 0.65 # def 0.65
+
 # * whether trade tariff should be considered at all
 # * (0) without trade tariff
 # * (1) with  trade tariff

config/scenario_config.csv

@@ -1,4 +1,4 @@
-;cc;nocc;nocc_hist;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SDP;SDP-EI;SDP-RC;SDP-MC;BASE;NPI;NDC;coupling;emulator;input;Tland;eat_lancet_diet;EL2_Diet;LAMA_Inequal;LAMA_Inequal-SustDemand;LAMA_Inequal-EnvirProt;LAMA_Inequal-GHGPrice;LAMA_Sustainability;NAVIGATE_AllOff;NAVIGATE_LandSup;NAVIGATE_LandDem;NAVIGATE_AllOn;ForestryEndo;ForestryExo;ForestryOff;frst_shock_none;frst_shock_002lin2030;frst_shock_004lin2030;frst_shock_008lin2030;frst_shock_016lin2030;rcp1p9;rcp2p6;rcp4p5;rcp6p0;rcp7p0;rcp8p5;NGFS_o_lowdem;GENIE_SCP
+;cc;nocc;nocc_hist;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SDP;SDP-EI;SDP-RC;SDP-MC;BASE;NPI;NDC;coupling;emulator;input;Tland;eat_lancet_diet;EL2_Diet;LAMA_Inequal;LAMA_Inequal-SustDemand;LAMA_Inequal-EnvirProt;LAMA_Inequal-GHGPrice;LAMA_Sustainability;NAVIGATE_AllOff;NAVIGATE_LandSup;NAVIGATE_LandDem;NAVIGATE_AllOn;ForestryEndo;ForestryExo;ForestryOff;frst_shock_none;frst_shock_002lin2030;frst_shock_004lin2030;frst_shock_008lin2030;frst_shock_016lin2030;rcp1p9;rcp2p6;rcp4p5;rcp6p0;rcp7p0;rcp8p5;NGFS_o_lowdem;GENIE_SCP
 gms$c09_pop_scenario;;;;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SSP1;SSP1;SSP1;SSP1;;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;;;;
 gms$c09_gdp_scenario;;;;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SSP1;SDP_EI;SDP_RC;SDP_MC;;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;;;;
 gms$c09_pal_scenario;;;;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SSP1;SSP2;SSP1;SSP1;;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;;;;