Skip to content

F livestock intensification lam #3

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.

Sign up for GitHub

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

Open
weindl wants to merge 5 commits into
base: livestock_LAM_ak
Choose a base branch
from
Open

F livestock intensification lam #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4724d68
updated main.gms
weindl Nov 28, 2019
560ff43
Added calibration factor and cleaned up input vector in config
weindl Nov 29, 2019
17ad495
Merge pull request #114 from weindl/f_dietchange
flohump Nov 29, 2019
b9ce68f
Merge pull request #25 from magpiemodel/develop
weindl Dec 5, 2019
15d3f9d
Merge pull request #26 from weindl/f_SDP
weindl Dec 8, 2019
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
8 changes: 5 additions & 3 deletions config/default.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ cfg$model <- "main.gms" #def = "main.gms"

# which input data sets should be used?

cfg$input <- c("magpie4.1_default_apr19.tgz", "additional_data_rev3.73.tgz",
"isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev38_c200_690d3718e151be1b450b394c1064b1c5.tgz",
cfg$input <- c("isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev38_c200_690d3718e151be1b450b394c1064b1c5.tgz",
"rev4.26_690d3718e151be1b450b394c1064b1c5_magpie.tgz",
"rev4.26_690d3718e151be1b450b394c1064b1c5_validation.tgz")
"rev4.26_690d3718e151be1b450b394c1064b1c5_validation.tgz",
"calibration_H12_c200_12Sep18.tgz",
"additional_data_rev3.73.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
34 changes: 21 additions & 13 deletions main.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,21 @@ $title magpie
* md5sum: 5c38bb1083bd66010c2104c9d40553f4
* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public
*
* Used data set: additional_data_rev3.68.tgz
* md5sum: 15d1135625a9f5cfb9c7c6038716a156
* Used data set: additional_data_rev3.73.tgz
* md5sum: 3ce07e85c937a937bee759a40fd50b8a
* Repository: /p/projects/landuse/data/input/archive
*
* Used data set: isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev38.1_c200_690d3718e151be1b450b394c1064b1c5.tgz
* md5sum: ae4dbc8e36e6fb4ba8cee0d2400b2193
* Repository: /p/projects/landuse/data/input/archive
* Used data set: isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev38_c200_690d3718e151be1b450b394c1064b1c5.tgz
* md5sum: e0cb64c918128436bf9a323e57cae81b
* Repository: /p/projects/rd3mod/mirror/rse.pik-potsdam.de/data/magpie/public
*
* Used data set: rev4.26_690d3718e151be1b450b394c1064b1c5_magpie.tgz
* md5sum: 448ab3a63e3071b3391c6bb56cb04411
* Repository: /p/projects/rd3mod/inputdata/output
*
* Used data set: rev4.26_690d3718e151be1b450b394c1064b1c5_validation.tgz
* md5sum: 2a5fbb76e8f8f3e3f74c833b21517d4b
* Repository: /p/projects/rd3mod/inputdata/output
*
* Low resolution: c200
* High resolution: 0.5
Expand All @@ -115,27 +123,27 @@ $title magpie
*
* Regionscode: 690d3718e151be1b450b394c1064b1c5
*
* Regions data revision: 4.18
* Regions data revision: 4.26
*
* 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/rev38
* * Revision: 38.1
* * Revision: 38
* * 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_rev38.1_0.5.tgz
* * Output file: /p/projects/landuse/data/input/archive/isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev38.1_c200_690d3718e151be1b450b394c1064b1c5.tgz
* * Input file: /p/projects/landuse/data/input/archive/isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev38_0.5.tgz
* * Output file: /p/projects/landuse/data/input/archive/isimip_rcp-IPSL_CM5A_LR-rcp2p6-co2_rev38_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 = NULL, debug = FALSE)
* * 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 05 11:55:16 2019
* Last modification (input data): Tue Nov 26 23:24:35 2019
*
*###################### R SECTION END (VERSION INFO) ###########################

Expand Down Expand Up @@ -169,7 +177,7 @@ scalars
*******************************MODULE SETUP*************************************

$setglobal drivers aug17
$setglobal land feb15
$setglobal land landmatrix_dec18
$setglobal costs default
$setglobal interest_rate reg_feb18
$setglobal tc endo_jun18
Expand All @@ -188,7 +196,7 @@ $setglobal crop endo_jun13
$setglobal past endo_jun13
$setglobal forestry affore_vegc_dec16
$setglobal urban static
$setglobal natveg dynamic_may18
$setglobal natveg dynamic_oct19

$setglobal factor_costs mixed_feb17
$setglobal landconversion global_static_aug18
Expand Down