Merge pull request magpiemodel#646 from flohump/f_woodtrade

bugfix solve statement + revised calibration approach for land conversion costs

CHANGELOG.md

@@ -8,16 +8,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### changed
--
+- **default.cfg** updated inputdata revision to 4.104 to have NDC scenarios included
+- **scripts** cfg$gms$s35_secdf_distribution <- 2 for FSEC
+- **scripts** modified output reporting for SEALS to account for forestry plantations
+- **config** updated FSEC scenario config for revision and included new calibration file (after cost fix in preprocessing)
+- **config** added switch for minimum timber yields
+- **21_trade** v21_import_for_feasibility now available for all coutnries, not just for importers
+- **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
+- **scripts/calibration/landconversion_cost.R** Revised calibration approach for conversion costs for cropland. Information from all calibration time steps in combination with a lowpass filter is now used for deriving the calibration factors, which avoids the previous zickzack pattern. The previous option `cfg$damping_factor_landconversion_cost` has been removed in favor of `cfg$lowpass_filter_landconversion_cost`. 
 
 ### added
--
+- **14_yields** added minimum threshold for wood yields. Below this threshold, wood yields are set to zero.
+- **56_ghg_policy** added NDC scenarios
+- **60_bioenergy** added NDC scenarios 
 
 ### removed
 -
 
 ### fixed
--
+- **52_carbon** removing jump of carbon content into fully grown forest when a forest changes from second-last age class to last age-class.
+- **80_optimization** duplicated solve statement in all instances to avoid non-matchting left- and right-hand sides of equations
+- **58_peatland** Equation `q58_scalingFactorExp` revised to avoid division by zero. 
+
 
 ## [4.7.2] - 2024-04-02
 

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.101_h12_magpie.tgz",
-               cellular    = "rev4.101_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
-               validation  = "rev4.101_h12_validation.tgz",
+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_per_ton_fao_may22_glo_13Mar24.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,
@@ -85,9 +85,9 @@ cfg$crop_calib_max <- 1.5            # def= 1.5
 cfg$best_calib <- TRUE   # def = TRUE
 
 # Settings for land conversion cost calibration (cropland)
-# The calibration routine derives regional calibration factors for
+# The calibration routine derives a time-series of regional calibration factors for
 # costs of cropland expansion and rewards for cropland reduction,
-# with the goal to match historical regional cropland in 2015.
+# with the goal to match historical regional cropland in the period 1995-2015.
 # * (TRUE): Land conversion cost calibration will be performed
 # * (ifneeded): Land conversion cost calibration will only be executed if the input file "f39_calib.csv" is missing
 # * (FALSE): Land conversion cost calibration will not be performed
@@ -98,9 +98,9 @@ cfg$calib_accuracy_landconversion_cost <- 0.05         # def = 0.05
 cfg$calib_maxiter_landconversion_cost <- 40           # def = 40
 # Restart from existing calibration factors (TRUE or FALSE)
 cfg$restart_landconversion_cost <- FALSE           # def = FALSE
-# Factor determining how much the divergence infuences the new
-# calibration factor in each calibration iteration (0-1)
-cfg$damping_factor_landconversion_cost <- 0.96        # def= 0.96
+# Number of lowpass filter iterations applied on calibration factors 
+# for time steps 1995-2015
+cfg$lowpass_filter_landconversion_cost <- 1        # def= 1
 # Set upper limit for cropland calibration factor
 cfg$cost_calib_max_landconversion_cost <- 3         # def= 3
 # Set lower limit for cropland calibration factor
@@ -198,7 +198,6 @@ cfg$gms$sm_fix_SSP2 <- 2020
 cfg$gms$sm_fix_cc <- 2020
 
 # ***---------------------    10_land   ----------------------------------------
-# * (feb15): default land realization
 # * (landmatrix_dec18): includes a land transition matrix
 cfg$gms$land <- "landmatrix_dec18"          # def = landmatrix_dec18
 
@@ -331,6 +330,10 @@ cfg$gms$s14_degradation <- 0      # def = 0
 # For other realizations, it is recommended not to use this yield calibration.
 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.
+cfg$gms$s14_minimum_wood_yield <- 20   #def = 20
+
 # ***---------------------    15_food    ---------------------------------------
 # * (anthropometrics_jan18): estimates food using scenario dependent regression
 # *                          and demography drivers
@@ -1402,12 +1405,13 @@ cfg$gms$s56_cprice_red_factor <- 1    # def = 1
 # *     R32M46-SSP5-NPi, R32M46-SSP5-NDC, R32M46-SSP5-PkBudg1050, R32M46-SSP5-PkBudg650,
 # * R21M42: Coupled REMIND-MAgPIE runs with REMIND 2.1 and MAgPIE 4.2
 # *   NPi: Current policies; above 3.0°C in 2100
+# *   NDC: Nationally determined contributions; limit peak warming to 2.5°C
 # *   PkBudg900:  Budget with 900 GtCO2; well-below 1.5°C in 2100 (PkBudg1000 for SDP)
 # *   PkBudg1300: Budget with 1300 GtCO2; well-below 2.0°C in 2100
-# *     R21M42-SDP-NPi,  R21M42-SDP-PkBudg1000, R21M42-SDP-PkBudg1100, R21M42-SDP-PkBudg900,
-# *     R21M42-SSP1-NPi, R21M42-SSP1-PkBudg1100, R21M42-SSP1-PkBudg1300, R21M42-SSP1-PkBudg900,
-# *     R21M42-SSP2-NPi, R21M42-SSP2-PkBudg1100, R21M42-SSP2-PkBudg1300, R21M42-SSP2-PkBudg900,
-# *     R21M42-SSP5-NPi, R21M42-SSP5-PkBudg1100, R21M42-SSP5-PkBudg1300, R21M42-SSP5-PkBudg900,
+# *     R21M42-SDP-NPi, R21M42-SDP-NDC, R21M42-SDP-PkBudg1000, R21M42-SDP-PkBudg1100, R21M42-SDP-PkBudg900,
+# *     R21M42-SSP1-NPi, R21M42-SSP1-NDC, R21M42-SSP1-PkBudg1100, R21M42-SSP1-PkBudg1300, R21M42-SSP1-PkBudg900,
+# *     R21M42-SSP2-NPi, R21M42-SSP2-NDC, R21M42-SSP2-PkBudg1100, R21M42-SSP2-PkBudg1300, R21M42-SSP2-PkBudg900,
+# *     R21M42-SSP5-NPi, R21M42-SSP5-NDC, R21M42-SSP5-PkBudg1100, R21M42-SSP5-PkBudg1300, R21M42-SSP5-PkBudg900,
 # * R2M41: Coupled REMIND-MAgPIE runs with REMIND 2.0 and MAgPIE 4.1
 # *     R2M41-SSP2-NPi, R2M41-SSP2-NDC, R2M41-SSP2-Budg1300, R2M41-SSP2-Budg600, R2M41-SSP2-Budg950
 # * Standalone REMIND runs from Strefler et al 2021; well-below 2.0°C in 2100
@@ -1663,12 +1667,13 @@ cfg$gms$c60_1stgen_biodem <- "const2020"               # def = const2020
 # *     R32M46-SSP5-NPi, R32M46-SSP5-NDC, R32M46-SSP5-PkBudg1050, R32M46-SSP5-PkBudg650,
 # * R21M42: Coupled REMIND-MAgPIE runs with REMIND 2.1 and MAgPIE 4.2
 # *   NPi: Current policies; above 3.0°C in 2100
+# *   NDC: Nationally determined contributions; limit peak warming to 2.5°C
 # *   PkBudg900:  Budget with 900 GtCO2; well-below 1.5°C in 2100 (PkBudg1000 for SDP)
 # *   PkBudg1300: Budget with 1300 GtCO2; well-below 2.0°C in 2100
-# *     R21M42-SDP-NPi,  R21M42-SDP-PkBudg1000, R21M42-SDP-PkBudg1100, R21M42-SDP-PkBudg900,
-# *     R21M42-SSP1-NPi, R21M42-SSP1-PkBudg1100, R21M42-SSP1-PkBudg1300, R21M42-SSP1-PkBudg900,
-# *     R21M42-SSP2-NPi, R21M42-SSP2-PkBudg1100, R21M42-SSP2-PkBudg1300, R21M42-SSP2-PkBudg900,
-# *     R21M42-SSP5-NPi, R21M42-SSP5-PkBudg1100, R21M42-SSP5-PkBudg1300, R21M42-SSP5-PkBudg900,
+# *     R21M42-SDP-NPi, R21M42-SDP-NDC, R21M42-SDP-PkBudg1000, R21M42-SDP-PkBudg1100, R21M42-SDP-PkBudg900,
+# *     R21M42-SSP1-NPi, R21M42-SSP1-NDC, R21M42-SSP1-PkBudg1100, R21M42-SSP1-PkBudg1300, R21M42-SSP1-PkBudg900,
+# *     R21M42-SSP2-NPi, R21M42-SSP2-NDC, R21M42-SSP2-PkBudg1100, R21M42-SSP2-PkBudg1300, R21M42-SSP2-PkBudg900,
+# *     R21M42-SSP5-NPi, R21M42-SSP5-NDC, R21M42-SSP5-PkBudg1100, R21M42-SSP5-PkBudg1300, R21M42-SSP5-PkBudg900,
 # * R2M41: Coupled REMIND-MAgPIE runs with REMIND 2.0 and MAgPIE 4.1
 # *     R2M41-SSP2-NPi, R2M41-SSP2-NDC, R2M41-SSP2-Budg1300, R2M41-SSP2-Budg600, R2M41-SSP2-Budg950
 # * Standalone REMIND runs from Strefler et al 2021; well-below 2.0°C in 2100
@@ -1887,7 +1892,7 @@ cfg$gms$c80_nlp_solver <- "conopt4"              # def = conopt4
 
 # * 1: using optfile for specified solver settings
 # * 0: default settings (optfile will be ignored)
-cfg$gms$s80_optfile <- 1
+cfg$gms$s80_optfile <- 0 # def = 0
 
 
 #*******************************END MODULE SETUP********************************

config/scenario_fsec.csv

@@ -6,6 +6,7 @@ gms$s12_interest_lic;;;0.06;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s12_interest_hic;;;0.04;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$food;anthro_iso_jun22;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s14_use_yield_calib;1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$s14_minimum_wood_yield;10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s15_exo_waste;;;;;;;;0;0;0;0;0;0;0;0;1;;;;;;;;;;;;;;;;;0;1;;;;;;;;;;;;;;;;;
 gms$s15_exo_diet;;;;;;;;1;1;1;1;1;1;1;1;0;;;;;;;;;;;;;;;;;1;1;;;;;;;;;;;;;;;;;
 gms$c15_kcal_scen;;;;;;;;no_underweight;half_overweight;endo;endo;endo;endo;endo;endo;endo;;;;;;;;;;;;;;;;;no_underweight_half_overweight;no_underweight_half_overweight;;;;;;;;;;;;;;;;;
@@ -24,7 +25,7 @@ gms$s15_alc_scen;0.014;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c15_food_scenario;;;SSP1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c21_trade_liberalization;;;;;;;;;;;;;;;;;;;;;;;l908080r807070;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s21_trade_bal_damper;0.65;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-gms$c22_protect_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;30by30;;;;;;;;;;;;;;;;;;;;;;
+gms$c22_protect_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;BH_IFL;;;;;;;;;;;;;;;;;;;;;;
 gms$crop;penalty_apr22;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c30_rotation_scenario;default;;;;;;;;;;;;;;;;;;;;;;;;;;;agroecology;;;;;;;;;;;;;;;;;;;;;;;
 gms$s30_rotation_scenario_target;2050;;;;;;;;;;;;;;;;;;;;;;;;;;;2050;;;;;;;;;;;;;;;;;;;;;;;
@@ -33,11 +34,14 @@ gms$c30_bioen_water;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rainfed;;;;;;;;;;;;;;;;;;;;;
 gms$s30_snv_scenario_target;;;;;;;;;;;;;;;;;;;;;;;;;;;2050;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s30_snv_shr;;;;;;;;;;;;;;;;;;;;;;;;;;;0.2;;;;;;;;;;;;;;;;;;;;;;;;
 gms$past;endo_jun13;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-gms$c32_aff_policy;;;;;;;;;;;;;;;;;;;;;;;;;ndc;;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$c32_aff_policy;ndc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c32_aff_mask;;;;;;;;;;;;;;;;;;;;;;;;;onlytropical;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s32_max_aff_area;;;;;;;;;;;;;;;;;;;;;;;;;500;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c34_urban_scenario;;SSP1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$c35_ad_policy;ndc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$c35_aolc_policy;ndc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s35_forest_damage_end;2050;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2050;2050;2050;2050;2050;;;;;;;;;;
+gms$s35_secdf_distribution;2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s36_minimum_wage;0;;;;;;3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$factor_costs;sticky_labor;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$labor_prod;off;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;exo;exo
@@ -56,23 +60,23 @@ gms$c50_scen_neff_noselect;;;baseeff_add3_add10_add20_max75;;;;;;;;;;;;;;;;;;;;;
 gms$c52_land_carbon_sink_rcp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;RCP19;RCP26;RCP34;RCP45;RCP60;RCPBU;RCPBU;;;
 gms$c55_scen_conf;;;;;;;;;;;;;;;;;GoodPractice;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c56_emis_policy;none;;;;;;;;;;;;;;;;;;sdp_cropeff;;;;;;sdp_redd;sdp_redd;;;;;sdp_peatland;sdp_soil;;;sdp_redd_soil_peat;sdp_all;;;;;;;;;;;;;;;
-gms$c56_pollutant_prices;R32M46-SSP2EU-PkBudg1050;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$c56_pollutant_prices;R21M42-SSP2-PkBudg1300;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s56_c_price_induced_aff;0;;;;;;;;;;;;;;;;;;;;;;;;1;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s57_maxmac_n_soil;-1;;;;;;;;;;;;;;;;;;;201;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s57_maxmac_ch4_rice;-1;;;;;;;;;;;;;;;;;;;;201;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s57_maxmac_ch4_entferm;-1;;;;;;;;;;;;;;;;;201;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s57_maxmac_ch4_awms;-1;;;;;;;;;;;;;;;;201;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s58_rewetting_switch;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;Inf;;;;;;;;;;;;;;;;;;;;
 gms$som;cellpool_aug16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-gms$c60_2ndgen_biodem;;;;R32M46-SSP2EU-PkBudg650;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;R32M46-SSP1-PkBudg650;;
+gms$c60_2ndgen_biodem;R21M42-SSP2-NDC;;;R21M42-SSP2-PkBudg900;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;R21M42-SSP1-PkBudg900;;
 gms$c60_res_2ndgenBE_dem;;;;sdp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s62_max_dem_bioplastic;0;;;;400;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c70_fac_req_regr;reg;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c70_feed_scen;;;;;;;;;;;;;;;;;;ssp1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c73_build_demand;;;;;;;;;;;;;;;;;;;;;;;;50pc;;;;;;;;;;;;;;;;;;;;;;;;;;;
-input['cellular'];rev4.101_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.101_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.101_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.101_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.101_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.101_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.101_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;;;
-input['regional'];rev4.101_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-input['validation'];rev4.101_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+input['cellular'];rev4.104_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.104_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.104_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.104_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.104_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.104_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.104_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;;;
+input['regional'];rev4.104_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+input['validation'];rev4.104_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 input['additional'];additional_data_rev4.48.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-input['calibration'];calibration_FSEC_14Mar24.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+input['calibration'];calibration_FSEC_26Mar24.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 magicc_emis_scen;bjoernAR6_C_SSP2-NDC.mif;;;bjoernAR6_C_SSP2-PkBudg900.mif;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;bjoernAR6_C_SSP1-NDC.mif;;;;;;;;;;;;bjoernAR6_C_SSP1-PkBudg900.mif;;

modules/14_yields/managementcalib_aug19/input.gms

@@ -18,6 +18,8 @@ scalar s14_degradation   Switch to include yield impacts of land degradation(0=n
 
 scalar s14_use_yield_calib  Switch for using or not using yield calibration factors from the preprocessing (1=use facs 0=not use facs) / 0 /;
 
+scalar s14_minimum_wood_yield Minimum wood yield for timber harvest in natural vegetation (tDM per ha per yr) / 20 /;
+
 scalars
   s14_yld_past_switch  Spillover parameter for translating technological change in the crop sector into pasture yield increases  (1)     / 0.25 /
   s14_yld_reduction_soil_loss  Decline of land productivity in areas with severe soil loss (1)     / 0.08 /

modules/14_yields/managementcalib_aug19/presolve.gms

@@ -49,5 +49,7 @@ p14_growing_stock(t,j,ac,"forestry","plantations") = p14_growing_stock(t,j,ac,"f
 pm_timber_yield(t,j,ac,"forestry")$(s14_timber_plantation_yield = 1) = p14_growing_stock(t,j,ac,"forestry","plantations") ;
 ** Natveg yields are unchanged and doesn't depend on plantation yield switch
 pm_timber_yield(t,j,ac,land_natveg) = p14_growing_stock(t,j,ac,land_natveg,"natveg");
+** Put yields to 0 where they dont exceed a minimum yield for harvest
+pm_timber_yield(t,j,ac,land_natveg)$(pm_timber_yield(t,j,ac,land_natveg) < s14_minimum_wood_yield) = 0;
 ** If the plantation yield switch is off, then the forestry yields are given the same values as secdforest yields,
 pm_timber_yield(t,j,ac,"forestry")$(s14_timber_plantation_yield = 0) = pm_timber_yield(t,j,ac,"secdforest");

modules/21_trade/selfsuff_reduced/equations.gms

@@ -32,8 +32,9 @@
  *sum(ct,i21_trade_bal_reduction(ct,k_trade)))
  $(sum(ct,f21_self_suff(ct,h2,k_trade) >= 1))
  + (sum(supreg(h2,i2),vm_supply(i2,k_trade))*sum(ct,f21_self_suff(ct,h2,k_trade))
- *sum(ct,i21_trade_bal_reduction(ct,k_trade)) - v21_import_for_feasibility(h2,k_trade))
- $(sum(ct,f21_self_suff(ct,h2,k_trade) < 1));
+ *sum(ct,i21_trade_bal_reduction(ct,k_trade)))
+ $(sum(ct,f21_self_suff(ct,h2,k_trade) < 1))
+ - v21_import_for_feasibility(h2,k_trade);
 
 *' Upper bound for production.
 

modules/35_natveg/dynamic_feb21/scaling.gms

@@ -5,9 +5,4 @@
 *** |  MAgPIE License Exception, version 1.0 (see LICENSE file).
 *** |  Contact: [email protected]
 
-v35_other_expansion.scale(j) = 10e-3;
-v35_other_reduction.scale(j,ac) = 10e-3;
-v35_secdforest_expansion.scale(j) = 10e-3;
-v35_secdforest_reduction.scale(j,ac) = 10e-3;
-v35_hvarea_other.scale(j,ac) = 10e-3;
 vm_cost_hvarea_natveg.scale(i)$(s35_hvarea = 1 OR s35_hvarea = 2) = 10e4;