Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes in rc after test runs for forestry and default settings #214

Merged
merged 105 commits into from
Sep 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
1410f0e
Merge pull request #27 from magpiemodel/rc
abhimishr Aug 21, 2020
498b731
Added forestry rc script
abhimishr Aug 21, 2020
2a3ae2a
Changed description of rc forestry script
abhimishr Aug 21, 2020
22d8562
Added baseline run
abhimishr Aug 21, 2020
e46e612
Added baseline run
abhimishr Aug 21, 2020
aa0a985
Added default rc test runs
abhimishr Aug 21, 2020
ef5edd7
Added default rc test runs
abhimishr Aug 21, 2020
a427cda
typo fix
abhimishr Aug 21, 2020
baeec06
Added new start script
abhimishr Aug 21, 2020
05fddbd
Update start script
abhimishr Aug 21, 2020
404dbfe
updated changelog
abhimishr Aug 21, 2020
ac63bdc
Updated default config
abhimishr Aug 21, 2020
6fd84fa
Start script update
abhimishr Aug 21, 2020
030cb4a
Start script header update
abhimishr Aug 21, 2020
1d5355a
Typo fix and additiona info in default.cfg
abhimishr Aug 21, 2020
f8b5309
Introduceed new switch for plantation area fixing, new equation for t…
abhimishr Aug 22, 2020
556c548
Updated additional data revision to include timber plantation values …
abhimishr Aug 22, 2020
1b99966
Start script update
abhimishr Aug 22, 2020
62384a7
postprocessing scripts added
abhimishr Aug 22, 2020
34dae97
Description update
abhimishr Aug 22, 2020
81deb6d
Start script update
abhimishr Aug 22, 2020
ed197db
Typo fix in setting plantation are constraint switch
abhimishr Aug 22, 2020
11d17d2
Runs till 2150
abhimishr Aug 24, 2020
c7921a1
Spurious comma fix
abhimishr Aug 24, 2020
58c5396
Constant plantation added, start script change, added sticky run script
abhimishr Aug 25, 2020
bb54777
Updated change log and sticky script
abhimishr Aug 25, 2020
d1eeaf0
Updated changelog. interface to land module. start script update
abhimishr Aug 26, 2020
251c130
Merge pull request #28 from magpiemodel/rc
abhimishr Aug 26, 2020
c48bb5f
Added upscaling factor for timber demand for estb using max demand (o…
abhimishr Aug 26, 2020
e3cce5d
typo fix
abhimishr Aug 26, 2020
a835aa4
Updated changelog, reverted changes in land module, demand upscaling …
abhimishr Aug 26, 2020
4d58367
Switching startnig scrips, changes moved to existing script
abhimishr Aug 27, 2020
595c01a
Start script update
abhimishr Aug 27, 2020
d9ac8de
Treating age class marginal as 5 instead of 1 for rotation length
abhimishr Aug 28, 2020
45fd1fe
Parametrization test for percetage of production coming from plantations
abhimishr Aug 28, 2020
1abdf71
TEst with lower import tariff for wood
abhimishr Aug 29, 2020
47d8812
Typo fix
abhimishr Aug 29, 2020
53b843f
Test with higher self sufficiency of kforestry in MEA
abhimishr Aug 29, 2020
ff49d92
Lower self seufficiency test for MEA
abhimishr Aug 29, 2020
5f2c855
Lower self suff test MEA
abhimishr Aug 29, 2020
d5fa12b
flag update
abhimishr Aug 29, 2020
20fe349
Comparison with regional and global interest rate for rotation length…
abhimishr Aug 29, 2020
edd93d3
run flag changed
abhimishr Aug 29, 2020
3cc0809
maxiter change
abhimishr Aug 29, 2020
5348b65
Higher prod ratio for MEA
abhimishr Aug 31, 2020
8472ec4
Constant demand in MEA
abhimishr Aug 31, 2020
54ab75a
Self suff of MEA moved back to default value
abhimishr Aug 31, 2020
b599a78
Revert small changes from rc. Hardcoded MEA selfsuff test
abhimishr Aug 31, 2020
1eab080
Revert changes to tini10 set
abhimishr Aug 31, 2020
b1232bb
Start script change
abhimishr Aug 31, 2020
4b40bbc
Start script update. Scaling factor for timber yields added in planta…
abhimishr Aug 31, 2020
1fddaed
Revert previous changes and update stable carbon densities for planta…
abhimishr Sep 1, 2020
b5bcb8a
Penalty component added for establishing plantations in exremely bad …
abhimishr Sep 1, 2020
e0b0d44
Typo fix
abhimishr Sep 1, 2020
d5a9d8d
Updated config, change log, some default values, start script update
abhimishr Sep 1, 2020
84017e3
Merge pull request #29 from magpiemodel/rc
abhimishr Sep 1, 2020
ae89566
Updated changelog, revert additional core set, remove display comments
abhimishr Sep 1, 2020
d6b0bb6
Default value changes and start script change
abhimishr Sep 1, 2020
af5753b
Typo fix
abhimishr Sep 1, 2020
40b8fc5
Input file change
abhimishr Sep 2, 2020
3e67b96
Start script change
abhimishr Sep 2, 2020
554bd1f
Reformatting some changes
abhimishr Sep 2, 2020
8a56efe
revert trade changes
abhimishr Sep 2, 2020
2fdd18b
C-density threshold test
abhimishr Sep 2, 2020
0d124a3
Default values changed, start script update
abhimishr Sep 2, 2020
92d185b
flag increment
abhimishr Sep 2, 2020
d0455b8
Flag update and force plantations to harvest after rotation
abhimishr Sep 3, 2020
e280e88
Cleaned unused parameters and dispaly, additional cost added per ton …
abhimishr Sep 3, 2020
41aed10
Ignore min equation
abhimishr Sep 3, 2020
14e8c92
Flag update
abhimishr Sep 3, 2020
f6874b6
Zero production cost test
abhimishr Sep 3, 2020
a780f14
Removed production costs and flag increment
abhimishr Sep 3, 2020
849f361
Updated scaling. Switch for production costs
abhimishr Sep 3, 2020
8a6e867
global constraint for forestry production
abhimishr Sep 4, 2020
b326a6e
REframing of equations. Costs scaled with yields
abhimishr Sep 4, 2020
c8314b0
REmoved unused initialization
abhimishr Sep 4, 2020
ef4a14a
Start script change
abhimishr Sep 4, 2020
394a412
BASE run
abhimishr Sep 4, 2020
d0902cf
Bugfix annual hv_area time step length + code cleanup
flohump Sep 4, 2020
e5c42b3
Start script update
abhimishr Sep 4, 2020
62d2d3d
Typo fix
abhimishr Sep 4, 2020
cb7e587
Activate demand scaling for historical time period
abhimishr Sep 4, 2020
6d9a935
Added back increasing share of plantations
abhimishr Sep 4, 2020
79c0b64
Time component added to track which share was used to establish plant…
abhimishr Sep 4, 2020
24f11d0
NPI run
abhimishr Sep 4, 2020
f3dce8a
Consistent costs for establishment and harvesting. Both scaled with C…
flohump Sep 5, 2020
f8dc027
Simplification of equations for hvarea and area reduction
flohump Sep 6, 2020
17183c4
revert back default setting
flohump Sep 6, 2020
9aa7fe7
Code check cleanup, interfaces cleanup
abhimishr Sep 7, 2020
91a0b49
Typo fix
abhimishr Sep 7, 2020
6c0cf70
SSP runs
abhimishr Sep 7, 2020
61fa0fe
Removed hardcoded numbers.
abhimishr Sep 8, 2020
1bff145
updated changelog and revert to elastic food demand default
abhimishr Sep 8, 2020
58783a1
Placeholder input data update
abhimishr Sep 8, 2020
7b3dd4f
input data version increment
abhimishr Sep 10, 2020
937eaba
Start script update and cleanup of old scripts
abhimishr Sep 10, 2020
879e0bf
Merge branch 'rc' of github.com:magpiemodel/magpie into rc
abhimishr Sep 10, 2020
0849c41
Start script update
abhimishr Sep 11, 2020
d314247
Update default.cfg
tscheypidi Sep 11, 2020
37de5f1
Partial update for changes requested in rc
abhimishr Sep 14, 2020
26d83d9
Merge branch 'rc' of github.com:abhimishr/magpie into rc
abhimishr Sep 14, 2020
25d4851
Changelog cleanup
abhimishr Sep 14, 2020
ac709ce
Added missing units, author infor and whitespace cosmetic changes
abhimishr Sep 14, 2020
04f9e52
Added explanatory figure (177kb)
abhimishr Sep 14, 2020
87912ac
Updated changelog and whitespace issues
abhimishr Sep 15, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **38_factor_costs** Added the new "sticky" realization to the factor costs module. The realization "sticky_feb18" favors expansion in cells with preexisting farmland and capital based on capital investment decisions.

- **modules** added endogenous implementation of local biophysical (bph) impacts of afforestation to existing realizations in modules 32_forestry (dynamic_oct19) and 56_ghg_policy (price_jan20). default = off
- **73_timber** Added timber module which brings the ability of producing woody biomass for timber plantations and natural vegetation. Default = off.
- **32_forestry** New realization for timber production from timber plantations. This builds up on previous forestry realization for afforestation.
- **35_natveg** New realization for timber production from natural vegetation.
- **73_timber** Added timber module which brings the ability of producing woody biomass for timber plantations and natural vegetation. Default = off. New switch: `s73_foresight`. New scalars : `s73_timber_prod_cost`, `s73_timber_harvest_cost`,`s73_cost_multiplier`,`s73_free_prod_cost`
- **32_forestry** New realization `dynamic_may20` for forestry land use dynamics. This builds up on previous forestry realization for afforestation. New switches: `s32_fix_plant`, `c32_interest_rate`. New scalars : `s32_plant_share`, `s32_forestry_int_rate`, `s32_investment_cost`, `s52_plantation_threshold`.
- **35_natveg** New realization `dynamic_may20` for natural vegetation land use dynamics. New forest protection scenario.
- **52_carbon** Added interface which is used for calculating additional investment needed in plantations when carbon stocks are lower than a specified threshold. New scalar: `s52_plantation_threshold`.
- **57_maccs** Added MACCs from Harmsen PBL 2019
- **15_food** Added the option to include calories from alcohol consumption in healthy and sustainable EAT-Lancet diets.
- **scripts** added start script for making timber production runs (forestry.R)
- **scripts** added start script for making timber production runs (forestry.R).

### changed
- **scripts** updated selection routine for start and output scripts
Expand All @@ -31,6 +32,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **scripts** removed GP_final start script due to obsolescence

### fixed
- **32_forestry** Rotation length calculation based on correct marginals of growth function in timber plantations. Clearer calculations for harvested area for timber production.
- **35_natveg** Clearer calculations for harvested area for timber production.
- **52_carbon** Fix to the Carbon densities received from LPJmL for timber plantations.

## [4.2.1] - 2020-05-15

Expand Down
70 changes: 63 additions & 7 deletions config/default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ cfg$model <- "main.gms" #def = "main.gms"
# which input data sets should be used?

cfg$input <- c("isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev48_c200_690d3718e151be1b450b394c1064b1c5.tgz",
"rev4.51_h12_magpie.tgz",
"rev4.51_h12_validation.tgz",
"calibration_H12_c200_26Feb20.tgz",
"additional_data_rev3.85.tgz")
"rev4.52_h12_magpie.tgz",
"rev4.52_h12_validation.tgz",
"calibration_H12_c200_26Feb20.tgz",
"additional_data_rev3.86.tgz")

#a list of repositories (please pay attention to the list format!) in which the
#files should be searched for. Files will be searched in all repositories until
Expand Down Expand Up @@ -314,8 +314,8 @@ cfg$gms$c15_EAT_scen <- "FLX" # def = FLX
# * Scenario target for the inclusion of alcohol in the EAT-Lancet diet
# * only activated if s15_exo_diet is set to 1
# * (0): no alcohol consumption, as in the original version of the EAT-Lancet diet
# * (0.014): maximum target for alcohol consumption is 1.4% of total calorie consumption
# * (see Lassen et al., 2020)
# * (0.014): maximum target for alcohol consumption is 1.4% of total calorie consumption
# * (see Lassen et al., 2020)
cfg$gms$s15_alc_scen <- 0.014 # def = 0.014

# * Switch and specification of countries for which exogenous food scenarios
Expand Down Expand Up @@ -456,6 +456,33 @@ cfg$gms$c32_tcre_ctrl <- "ann_TCREmean"
# * 0=off
cfg$gms$s32_initial_distribution <- 0 # def = 0

# Switch to fix timber plantations area after sm_fix_SSP2 value
# This makes sure that cellular timber plantations are not changed after 2020.
# This switch does not impact the model behavior before sm_fix_SSP2 as plantations are
# not fixed for that period in the dynamic realization.
# * 1= Plantation area is fixed after 2020
# * 0= Plantation area is not fixed after 2020
cfg$gms$s32_fix_plant <- 0 # def = 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand how that switch works. What means 0? No fixing? What would be alternative values to put here? And what would they mean? Does it have a unit? How is that all related to 2020? What happens before 2020? Does it mean that this number only affects the behavior after 2020?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The number 0 indeed means plantations are not fixed after 2020. The plantations are also not fixed before 2020 irrespective of the settin in s32_fix_plant. I added available settings for this in description and default.cfg. It does not have a unit, just a binary switch. It breaks model behavior if the values are other than 0 or 1 so for making sure that the model still works if somebody sets it to other than 0 or 1 I can add an additional check.


# Percentage of overall timber production which guides plantations establishment
# decision. The model sees a proportion of wood demand from future and establishes
# new plantations accordingly in the current time step (accepted values 0 to 1).
cfg$gms$s32_plant_share <- 0.25 # def = 0.25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again the description is not clear to me. The beginning of the sentence suggests that via the switch I am able to switch betweena constant share and another scenario, but looking at the value my guess is that we are always talking about a constant share scenario and I just define the share here. Is that correct? If so, please describe it that way in the comment. If my interpretation is correct you could for instance write: "Share of overall timber production from plantations which is hold constant over time."

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. This is better. I changed it accordingly.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added additional check to make sure a negative value or a value greater than 1 is not set by user


# Switch fore regional or global interest rate for rotation length calculations.
# Using the global setting would mean that the timber plantation decisions are
# decoupled from other decisions in the model which are based on regional interest
# rates.
# * ("regional") = Regionally differentiated interest rates
# * ("global") = One global interest rate
cfg$gms$c32_interest_rate <- "regional" # def = "regional"

# Global interest rate for plantations in case c32_interest_rate switch is global
# Accepted values between 0 and 1.
cfg$gms$s32_forestry_int_rate <- 0.05 # def = 0.05
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is that decoupled from our interest rate module?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding it there would mean an additional interface and this interest rate is provided to have a hypothetical scenario where we say investment decisions in forestry are dependent on a constant interest rate, there is anyways a lot of unecertainity in future interest rates so lets just assume one interest rate number forever in plantations decisions for rotation length calculation.


# Additional investment cost in plantations for using unproductive cells
cfg$gms$s32_investment_cost <- 200 # def = 200

# ***--------------------- 34_urban ---------------------------------------
# * (static): static urban
Expand Down Expand Up @@ -644,6 +671,9 @@ cfg$gms$carbon <- "normal_dec17" # def = normal_dec17
# * nocc (no climate change)
cfg$gms$c52_carbon_scenario <- "nocc" # def = "nocc"

# * Minimum threshold of carbon density (tC/ha) in timber plantations
cfg$gms$s52_plantation_threshold <- 8 # def = 8

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the unit here? Please set value to its default value!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the unit and updated the default values

# ***--------------------- 53_methane -------------------------------------
# * (ipcc2006_flexreg_apr16): IPCC 1996 methodology
# * (off): methane calculations deactivated
Expand Down Expand Up @@ -925,6 +955,32 @@ cfg$gms$timber <- "biomass_mar20" # def = biomass_mar20
# * 0=off
cfg$gms$s73_demand_switch <- 0 # def = 0

# Setting to define if the model should be forward looking or not in terms of
# seeing the future demand for current timestep establishment of new plantations
# in the forward setting, the model sees only current demand for establishment
# decisions in the historical time period but then sees future demand for non
# historic time periods. In myopic setting, the model sees always the current
# timber demand for establishment decisions.
# * 1 = forward looking. Model sees future demand for establishment in current step
# * 0 = myopic. Model sees current demand for establishment in current step
cfg$gms$s73_foresight <- 0 # def = 0

# harvesting cost per ton of dry matter produced (USD/tDM)
s73_timber_prod_cost <- 2000 # def = 2000

# harvesting cost per ha of forests (USD/ha)
s73_timber_harvest_cost <- 2000 # def = 2000

# Cost multiplier for harvesting costs to make natural vegetation harvest expensive
# than timber plantation harvst. This provides a signal to the model to harvest
# timber plantations first.
s73_cost_multiplier <- 1.5 # def = 1.5

# Cost of production without using any land in case the model is running into infeasibilities.
# This is a last ditch effort for the model and the variable assocaited with this cost
# should not be used in a normally feasible model run (USD/tDM)
s73_free_prod_cost <- 1000000 # def = 1000000


# ***------------------- 80_optimization ------------------------------------
# * (nlp_apr17): solve procedure solving the whole, nonlinear problem
Expand Down Expand Up @@ -1001,7 +1057,7 @@ cfg$files2export$start <- c("input/info.txt",
".Rprofile",
"input/*.spam",
"input/lpj_envflow_total_c200.mz",
"input/lpj_watavail_total_c200.mz",
"input/lpj_watavail_total_c200.mz",
"input/validation.mif",
"calib_*.cs3",
"input/spamplot_*.pdf")
Expand Down
3 changes: 2 additions & 1 deletion core/sets.gms
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@ sets
***Forestry**
ac Age classes / ac0,ac5,ac10,ac15,ac20,ac25,ac30,ac35,ac40,ac45,ac50,
ac55,ac60,ac65,ac70,ac75,ac80,ac85,ac90,ac95,ac100,
ac105,ac110,ac115,ac120,ac125,ac130,ac135,ac140,ac145,acx /
ac105,ac110,ac115,ac120,ac125,ac130,ac135,ac140,ac145,
ac150,ac155,acx /
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added new age-classes for making sure than carbonstock reporting is not buggy in case MAgPIE is run till 2150


ac_est(ac) Dynamic subset of age classes for establishment

Expand Down
72 changes: 36 additions & 36 deletions main.gms
Original file line number Diff line number Diff line change
Expand Up @@ -145,60 +145,60 @@ $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: isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev48_c200_690d3718e151be1b450b394c1064b1c5.tgz
* md5sum: b07787909a9339225fd097c813277b19
* Repository: /p/projects/landuse/data/input/archive
*
* Used data set: rev4.51_h12_magpie.tgz
* md5sum: 7d380cccd273baf44d169492b08cd98e
* Repository: /p/projects/rd3mod/inputdata/output
*
* Used data set: rev4.51_h12_validation.tgz
* md5sum: 99e4aaca789892fc44896d4fcd0e0459
* Repository: /p/projects/rd3mod/inputdata/output
*
*
* Used data set: isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev46_c200_690d3718e151be1b450b394c1064b1c5.tgz
* md5sum: NA
* Repository: https://rse.pik-potsdam.de/data/magpie/public
*
* Used data set: rev4.52_h12_magpie.tgz
* md5sum: NA
* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
*
* Used data set: rev4.52_h12_validation.tgz
* md5sum: NA
* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output
*
* Used data set: calibration_H12_c200_26Feb20.tgz
* md5sum: 0fc75955deb5916d4ac078e8d817feda
* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/intern
*
* Used data set: additional_data_rev3.85.tgz
* md5sum: 23bc2b7ff07da84b798d741c3d2ad3d2
* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/intern
*
* md5sum: NA
* Repository: https://rse.pik-potsdam.de/data/magpie/public
*
* Used data set: additional_data_rev3.86.tgz
* md5sum: NA
* Repository: scp://cluster.pik-potsdam.de/p/projects/landuse/data/input/archive
*
* 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
* 28 24 10 7 3 53 17 8 22 7 11 10
*
*
* Regionscode: 690d3718e151be1b450b394c1064b1c5
*
* Regions data revision: 4.51
*
*
* Regions data revision: 4.52
*
* lpj2magpie settings:
* * LPJmL data folder: /p/projects/landuse/data/input/lpj_input/isimip_rcp/IPSL_CM5A_LR/rcp2p6/co2
* * Additional input folder: /p/projects/landuse/data/input/other/rev48
* * Revision: 48
* * Additional input folder: /p/projects/landuse/data/input/other/rev46
* * Revision: 46
* * Call: lpj2magpie(input_folder = path(cfg$lpj_input_folder, gsub("-", "/", cfg$input)), input2_folder = path(cfg$additional_input_folder, paste("rev", floor(cfg$revision), sep = "")), output_file = lpj2magpie_file, rev = cfg$revision)
*
*
* aggregation settings:
* * Input resolution: 0.5
* * Output resolution: c200
* * Input file: /p/projects/landuse/data/input/archive/isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev48_0.5.tgz
* * Output file: /p/projects/landuse/data/input/archive/isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev48_c200_690d3718e151be1b450b394c1064b1c5.tgz
* * Input file: /p/projects/landuse/data/input/archive/isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev46_0.5.tgz
* * Output file: /p/projects/landuse/data/input/archive/isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev46_c200_690d3718e151be1b450b394c1064b1c5.tgz
* * Regionscode: 690d3718e151be1b450b394c1064b1c5
* * (clustering) n-repeat: 5
* * (clustering) n-redistribute: 0
* * Call: aggregation(input_file = lpj2magpie_file, regionmapping = paste0("../", cfg$regionmapping), output_file = aggregation_file, rev = cfg$revision, res_high = cfg$high_res, res_low = cfg$low_res, hcells = cfg$highres_cells, weight = cfg$cluster_weight, nrepeat = cfg$nrepeat, nredistribute = cfg$nredistribute, sum_spam_file = cfg$spamfile, debug = FALSE, seed = cfg$seed)
*
*
*
* Last modification (input data): Thu Sep 3 10:35:15 2020
*
*
*
*
* Last modification (input data): Thu Sep 10 09:59:16 2020
*
*###################### R SECTION END (VERSION INFO) ###########################

$offupper
Expand Down
2 changes: 1 addition & 1 deletion modules/14_yields/dynamic_aug18/presolve.gms
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ p14_growing_stock(t,j,ac,land_natveg,"natveg") =
p14_growing_stock(t,j,ac,land_natveg,"natveg") = p14_growing_stock(t,j,ac,land_natveg,"natveg")$(p14_growing_stock(t,j,ac,land_natveg,"natveg")>0)+0.0001$(p14_growing_stock(t,j,ac,land_natveg,"natveg")=0);
p14_growing_stock(t,j,ac,"forestry","plantations") = p14_growing_stock(t,j,ac,"forestry","plantations")$(p14_growing_stock(t,j,ac,"forestry","plantations")>0)+0.0001$(p14_growing_stock(t,j,ac,"forestry","plantations")=0);

** Used in equations -- Annual value hence division by timestep
** Used in equations
***************************************************************
** If the plantation yield switch is on, forestry yields are treated are plantation yields
pm_timber_yield(t,j,ac,"forestry")$(s14_timber_plantation_yield = 1) = p14_growing_stock(t,j,ac,"forestry","plantations") ;
Expand Down
2 changes: 1 addition & 1 deletion modules/20_processing/off/sets.gms
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ kpr(kall) Products that can be processed
knpr(kall) Plant-based products that cannot be processed
/alcohol,distillers_grain,ethanol,fibres,fish,livst_chick,livst_egg,livst_milk,
livst_pig,livst_rum,oils,oilcakes,pasture,puls_pro,res_cereals,res_fibrous,
res_nonfibrous,scp/
res_nonfibrous,scp,wood,woodfuel/
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added for clarity - We don't model processing of initial wood products

;
2 changes: 1 addition & 1 deletion modules/20_processing/substitution_dec18/sets.gms
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ kpr(kall) Products that can be processed
knpr(kall) Products that cannot be processed
/alcohol,distillers_grain,ethanol,fibres,fish,livst_chick,livst_egg,livst_milk,
livst_pig,livst_rum,oilcakes,pasture,puls_pro,res_cereals,res_fibrous,
res_nonfibrous,scp/
res_nonfibrous,scp,wood,woodfuel/
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added for clarity - We don't model processing of initial wood products


processing_subst20 Processing activities
/ milling, refining, extracting, distilling, fermentation, breeding, ginning, substitutes /
Expand Down
2 changes: 1 addition & 1 deletion modules/21_trade/selfsuff_reduced/input.gms
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*** | MAgPIE License Exception, version 1.0 (see LICENSE file).
*** | Contact: magpie@pik-potsdam.de

$setglobal c21_trade_liberalization l908080r807070
$setglobal c21_trade_liberalization l909090r808080
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the value from default config. Not sure why this was set to l908080r807070 by default

* options are "regionalized" and "globalized" and "fragmented"

scalars
Expand Down
2 changes: 2 additions & 0 deletions modules/21_trade/selfsuff_reduced/preloop.gms
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ elseif (s21_trade_tariff=0),

pm_selfsuff_ext(t_ext,i,kforestry) = f21_self_suff("y2150",i,kforestry);
pm_selfsuff_ext(t_all,i,kforestry) = f21_self_suff(t_all,i,kforestry);
*Implausible jumps in selfsuff for wood in some regions.
pm_selfsuff_ext(tstart21,i,kforestry) = f21_self_suff("y2010",i,kforestry);
Loading