Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8746 commits
Select commit Hold shift + click to select a range
725b37a
Merge branch 'f_vm_balance_feed' into f_vm_balanceF
weindl May 10, 2025
908007c
Merge pull request #69 from weindl/develop
weindl May 10, 2025
dce53f1
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
pascal-sauer May 12, 2025
3d379db
request 24h
pascal-sauer May 12, 2025
f38c89c
set --time in sh scripts
pascal-sauer May 12, 2025
3d5daaa
replace dayMax scripts
pascal-sauer May 12, 2025
f5c2d9d
Merge pull request #803 from pascal-sauer/develop
pascal-sauer May 12, 2025
ad4f2c1
use magpie4::disaggregateLandConservation
pascal-sauer May 15, 2025
45466ea
remove .dissagLandConsv
pascal-sauer May 15, 2025
382e001
changelog
pascal-sauer May 16, 2025
7c4f2d0
Merge pull request #804 from pascal-sauer/develop
pascal-sauer May 16, 2025
a58d510
Merge branch 'develop' into markup
May 21, 2025
5c33409
revert renaming
pvjeetze May 21, 2025
bd7b342
default.cfg documentation
pvjeetze May 21, 2025
6b42342
updated changelog
pvjeetze May 21, 2025
3dc2a0c
in code documentation
pvjeetze May 21, 2025
6ea94f2
fixes
pvjeetze May 21, 2025
7f7ee89
made exo realisation consistent
pvjeetze May 21, 2025
0553e20
bugfix s32_max_aff_area
pvjeetze May 22, 2025
b821e4a
small fix
pvjeetze May 22, 2025
a5834a0
another fix
pvjeetze May 22, 2025
a0dc2d1
correction
pvjeetze May 22, 2025
84484e8
bugfixes
pvjeetze May 22, 2025
423a315
logical fix
pvjeetze May 22, 2025
111fa9a
change miti consv scenario config csv
pvjeetze May 22, 2025
d6e0d06
bugfix
pvjeetze May 22, 2025
910a026
infes fix
pvjeetze May 22, 2025
42453a0
minor fix
pvjeetze May 22, 2025
7512407
revert run compilation changes
pvjeetze May 22, 2025
100c4b9
improvement
pvjeetze May 22, 2025
78208d8
better infes fix
pvjeetze May 23, 2025
b8bf685
changelog and other fixes
pvjeetze May 23, 2025
1c01e88
update markup addition
May 23, 2025
e8a6625
Merge pull request #65 from caviddhen/develop
caviddhen May 23, 2025
9c5112e
Merge branch 'markup' of https://github.com/caviddhen/magpie into markup
May 23, 2025
b75ee78
update changelog
May 23, 2025
44907df
bump additional data
May 23, 2025
13cc367
updated miti consv start script
pvjeetze May 26, 2025
380fec9
rem-7
pvjeetze May 26, 2025
dbe4c21
coupled May25
pvjeetze May 26, 2025
70fea35
uncomment calibration
pvjeetze May 26, 2025
7a5ca19
Merge pull request #806 from pvjeetze/develop
pvjeetze May 26, 2025
e345d89
Merge pull request #74 from weindl/develop
weindl May 26, 2025
b52b46b
updates for PR clarity
May 26, 2025
c29e821
bugfix cfg
May 27, 2025
ba41fc9
Merge branch 'develop' into markup
May 27, 2025
7413420
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
pvjeetze May 27, 2025
2b1df40
more efficient run time request in SEALS allocation
pvjeetze May 27, 2025
56c28db
Merge branch 'master' of github.com:magpiemodel/magpie into rc-4.10.1
pascal-sauer May 27, 2025
fc6e378
magpie release 4.10.1
pascal-sauer May 27, 2025
8068290
revert main and fix formatting
May 27, 2025
760e811
update data changelog
pascal-sauer May 28, 2025
97951e9
Merge pull request #808 from magpiemodel/rc-4.10.1
pascal-sauer May 28, 2025
336a235
merge master into develop
pascal-sauer May 28, 2025
a403fbc
Merge pull request #809 from pascal-sauer/develop
pascal-sauer May 28, 2025
54370ef
added fader for C price induced afforestation
flohump May 30, 2025
4f5719f
update start script
flohump May 30, 2025
3200739
changelog
flohump May 30, 2025
025c372
changelog
flohump May 30, 2025
dbe0aed
bugfix start script ScenarioMIP
flohump May 30, 2025
b984905
Merge branch 'develop' into maccs_steps-fix
georg-schroeter Jun 2, 2025
2fd058c
revision default.cfg fader for C price induced afforestation
flohump Jun 2, 2025
be4e6ff
update magpie4 version
flohump Jun 2, 2025
f2b13ab
Merge pull request #811 from flohump/f_livst
flohump Jun 2, 2025
56eb4b6
Merge branch 'develop' into maccs_steps-fix
georg-schroeter Jun 3, 2025
bad8fe5
Update CHANGELOG.md
georg-schroeter Jun 3, 2025
a3a0d11
Merge pull request #802 from georg-schroeter/maccs_steps-fix
georg-schroeter Jun 4, 2025
88d1887
Merge branch 'develop' into markup
caviddhen Jun 4, 2025
e9dc5ff
Merge pull request #807 from caviddhen/markup
caviddhen Jun 4, 2025
b59a828
removed hard-coded region name and added switch
weindl Jun 5, 2025
c544654
Update input data from rev4.118 to rev 4.119
flohump Jun 7, 2025
020e4ac
update main.gms and bugfix unit peatland emission factors
flohump Jun 7, 2025
b63872d
magpie4 version update and update WH start script
flohump Jun 8, 2025
415fb88
update magpie4 library - nitrogen reporting fixes
flohump Jun 11, 2025
31c6c21
Merge pull request #812 from flohump/f_livst
flohump Jun 11, 2025
3da4c6c
Mirror changes regarding feed balance flows and new switch in fbask_j…
weindl Jun 11, 2025
e0d3239
added entries to CHANGELOG.md
weindl Jun 11, 2025
3ad599d
Merge branch 'f_FIntake_Balance_Switch' into develop
weindl Jun 11, 2025
39d46ee
Merge pull request #75 from weindl/develop
weindl Jun 11, 2025
5017b02
update sets
Jun 12, 2025
6d15d17
avoid redundant positivity declarations for variables
weindl Jun 18, 2025
a7c6156
relevant sets from module 71 are now also defined in off realization
weindl Jun 18, 2025
d55fbef
introduced lower bound for pc70_dem_feed_pasture to safeguard against…
weindl Jun 18, 2025
4b5b198
Merge branch 'f_FIntake_Balance_Switch' of github.com:weindl/magpie i…
weindl Jun 18, 2025
3a46ea5
update output parameters in postsolve.gms files and module embedding
weindl Jun 18, 2025
c9ffa7d
Update revision magpie4
weindl Jun 18, 2025
b43695d
Update CHANGELOG.md
weindl Jun 19, 2025
e4f6c9e
mac/linux install instructions
pascal-sauer Jun 19, 2025
98677c8
remove Dockerfile
pascal-sauer Jun 19, 2025
5047652
Update README.md
pascal-sauer Jun 23, 2025
b6d418d
Update README.md
pascal-sauer Jun 23, 2025
a9bf16f
Update README.md
pascal-sauer Jun 23, 2025
8768cdc
remove specific link
pascal-sauer Jun 23, 2025
5b89ab5
Merge pull request #813 from weindl/f_FIntake_Balance_Switch
weindl Jun 24, 2025
67b0697
Merge pull request #814 from pascal-sauer/develop
pascal-sauer Jun 27, 2025
09b91d9
update start script and miniforge path
pvjeetze Jul 1, 2025
eaa69a9
changelog
pvjeetze Jul 2, 2025
607a1e8
Merge pull request #815 from pvjeetze/f_MitiConsv
pvjeetze Jul 2, 2025
408bcb5
clean-up forestry
flohump Jul 4, 2025
cafe703
magpie4 version + changelog
flohump Jul 5, 2025
7b2d3f5
changelog
flohump Jul 5, 2025
60cb3a1
Merge pull request #816 from flohump/f_forestry
flohump Jul 7, 2025
22487a8
..
bodirsky Jul 7, 2025
111f692
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
bodirsky Jul 7, 2025
a48ce7d
include trade costs in exo trade realization
bodirsky Jul 7, 2025
d6ca6d9
..
bodirsky Jul 7, 2025
7436feb
..
bodirsky Jul 7, 2025
b349c7a
.. include trade costs in exo trade
bodirsky Jul 7, 2025
d7aa650
magpie release 4.11.0
pascal-sauer Jul 11, 2025
9fb23ee
data-changelog for 4.11.0
pascal-sauer Jul 11, 2025
f267218
Merge branch 'develop' of github.com:pascal-sauer/magpiemodel into de…
pascal-sauer Jul 11, 2025
78514e5
require newest magpie4 to prevent reporting bug
pascal-sauer Jul 11, 2025
c043532
Merge pull request #819 from pascal-sauer/develop
pascal-sauer Jul 11, 2025
21e6d40
merge master into develop
pascal-sauer Jul 11, 2025
e3f07ee
Merge pull request #820 from pascal-sauer/develop
pascal-sauer Jul 11, 2025
f30bad3
Update README.md
georg-schroeter Jul 24, 2025
7c4f72d
undo Update activate.R
bodirsky Jul 25, 2025
725e8eb
Merge branch 'develop' into develop
bodirsky Jul 25, 2025
a6243b2
Fixing missing trade costs in exo realization
bodirsky Jul 25, 2025
784f1e7
Update CHANGELOG.md
georg-schroeter Jul 25, 2025
cbaba1f
update renv/activate.R
pascal-sauer Jul 28, 2025
82277de
changelog
pascal-sauer Jul 28, 2025
96f0743
Merge pull request #824 from pascal-sauer/develop
pascal-sauer Jul 28, 2025
d1bcbfa
Merge pull request #823 from georg-schroeter/develop
georg-schroeter Jul 28, 2025
34eadfd
Merge pull request #67 from caviddhen/develop
caviddhen Aug 4, 2025
b7ff574
Updates input data to rev4.120
codeZeilen Aug 11, 2025
b0cf77c
update changelog and revert name
Aug 12, 2025
ef02a7d
Updates default calibration file after regenerating 4.120
codeZeilen Aug 14, 2025
5aba05f
Updates input data revisions in scenarios, fsec, and el2
codeZeilen Aug 14, 2025
39384af
Adds the FSEC calibration file
codeZeilen Aug 14, 2025
266cf30
Merge pull request #827 from codeZeilen/update/rev4.120
codeZeilen Aug 15, 2025
61aafb8
merge develop
Aug 20, 2025
a0997b5
update scenarios cfgs and add documentation
Aug 20, 2025
1691393
revert delimiter in config csvs
Aug 26, 2025
7059eaa
update food module documentation
Aug 27, 2025
c13f280
update realization to reflect upcoming release
Aug 28, 2025
8fd7282
Apply suggestion from @pascal-sauer
pascal-sauer Aug 29, 2025
44d7750
Apply suggestion from @pascal-sauer
pascal-sauer Aug 29, 2025
6c7097c
Merge pull request #822 from georg-schroeter/readme
pascal-sauer Aug 29, 2025
cc1197a
update from code review
Aug 29, 2025
838848c
Merge remote-tracking branch 'refs/remotes/origin/fao_update' into fa…
Aug 29, 2025
741dc7d
changelog update
georg-schroeter Aug 29, 2025
73c148e
update default.cfg
Aug 30, 2025
e39d9ba
Merge pull request #828 from caviddhen/fao_update
caviddhen Aug 30, 2025
5684464
whitespace
georg-schroeter Sep 1, 2025
7d7caa6
Merge branch 'develop' into readme
georg-schroeter Sep 1, 2025
0d23905
Merge pull request #2 from georg-schroeter/readme
georg-schroeter Sep 1, 2025
b1bcaa2
bioplastic fix
Sep 4, 2025
e466a24
updated changelog
Sep 4, 2025
58196ef
fix
Sep 4, 2025
13936c0
Merge pull request #830 from deleip/bioplastic_fix2
deleip Sep 4, 2025
3cd48a5
Merge pull request #3 from magpiemodel/develop
georg-schroeter Sep 4, 2025
7363c55
release file changes
georg-schroeter Sep 5, 2025
fcbce50
Changes default cellular input data back to ssp245
codeZeilen Sep 5, 2025
916c6a9
Merge pull request #832 from codeZeilen/fix/default-cellular-ssp245
codeZeilen Sep 5, 2025
e3c040e
Merge pull request #4 from magpiemodel/develop
georg-schroeter Sep 5, 2025
c46253b
data changelog
georg-schroeter Sep 5, 2025
7eb90b9
Merge pull request #76 from weindl/develop
weindl Sep 8, 2025
3e8ffb8
addressed comments
georg-schroeter Sep 8, 2025
0bcff8a
revision update of cellular data to 4.121
georg-schroeter Sep 8, 2025
179632e
updated date of release
georg-schroeter Sep 8, 2025
40018e5
updated date of release
georg-schroeter Sep 8, 2025
327f2cc
Merge pull request #831 from georg-schroeter/rc-4.12.0
georg-schroeter Sep 8, 2025
f1039af
merge master into develop
georg-schroeter Sep 8, 2025
e66a3eb
Merge pull request #834 from georg-schroeter/rc-4.12.0
georg-schroeter Sep 9, 2025
2a09286
Input data update to rev4.122 and related extension of bioenergy and …
weindl Sep 11, 2025
8902e89
Merge branch 'f_BEscenarios' into develop
weindl Sep 11, 2025
344d659
Merge pull request #77 from weindl/develop
weindl Sep 11, 2025
0ed6615
Update default.cfg
weindl Sep 12, 2025
dcf8954
Merge pull request #835 from weindl/f_BEscenarios
weindl Sep 12, 2025
e8770b8
Changes irrigation, urban, and land_convservation settings and docume…
codeZeilen Sep 18, 2025
87faebb
Updates input files in default config, scenarios, and FSEC and EAT pr…
codeZeilen Sep 19, 2025
4211e12
Makes LUH references more explicit
codeZeilen Sep 22, 2025
b7f2c3c
Adds LUH update to changelog
codeZeilen Sep 22, 2025
cc36548
bugfix 14_yield avoid division by zero for special cases
flohump Sep 22, 2025
7ee628f
Updates input data revision to rev4.124 which includes fixes of nitro…
codeZeilen Sep 24, 2025
f0da002
update based on discussion with Georg
flohump Sep 24, 2025
572aef9
Updates changelog to include data revision change to rev4.124
codeZeilen Sep 24, 2025
635f023
Clarifies comment on LUH and WDPA data in 22_land_conservation
codeZeilen Sep 24, 2025
62a41b0
Improves comment on conservation area allocation in 22_land_conservat…
codeZeilen Sep 24, 2025
2f7083f
Harmonize 2nd gen bioenergy demand for historic period based on defau…
flohump Sep 24, 2025
656169a
Merge pull request #839 from flohump/fix_bioen
flohump Sep 24, 2025
284c8d3
Merge branch 'develop' into f14_yield
georg-schroeter Sep 25, 2025
ed409ff
Merge pull request #69 from codeZeilen/fix/nitrogen-emissions-input-data
caviddhen Sep 26, 2025
ed8e7f7
before upstream pull
pvjeetze Sep 26, 2025
1e9d60b
merge conflict
pvjeetze Sep 26, 2025
2e2c7ee
revised naming of v13_tau
pvjeetze Sep 26, 2025
1b22856
Merge pull request #836 from codeZeilen/feature/luh3-update
georg-schroeter Sep 26, 2025
4e2d364
Updates input data revision to rev4.124 which includes fixes of nitro…
codeZeilen Sep 24, 2025
4e22cc2
Updates changelog to include data revision change to rev4.124
codeZeilen Sep 24, 2025
dac5090
bugfix in yield calibration to FAO in preloop.gms
FelicitasBeier Sep 26, 2025
ad2f452
Another < to <=
georg-schroeter Sep 26, 2025
12a8f89
Merge pull request #838 from codeZeilen/fix/nitrogen-emissions-input-…
codeZeilen Sep 26, 2025
805a7da
Merge pull request #837 from flohump/f14_yield
flohump Sep 26, 2025
da84900
Merge branch 'magpiemodel:develop' into develop
caviddhen Oct 2, 2025
579536b
calculate reference yields for data mismatches with total cropland to…
k4rst3ns Oct 6, 2025
4d30d5f
run renv write permission
pascal-sauer Oct 7, 2025
5b425ee
Merge pull request #844 from pascal-sauer/develop
pascal-sauer Oct 8, 2025
e4ebe93
Minor changes during from 4.13.0-rc
georg-schroeter Oct 8, 2025
e0c488a
Merge pull request #845 from georg-schroeter/minor_changes2
georg-schroeter Oct 9, 2025
96d1a59
Merge pull request #843 from k4rst3ns/f_fixYieldReference
k4rst3ns Oct 9, 2025
83011b8
updated input data revision
FelicitasBeier Oct 17, 2025
971bd16
Merge pull request #846 from FelicitasBeier/develop
pascal-sauer Oct 17, 2025
3ce6f62
rev4.126 and missing dir changes
georg-schroeter Oct 20, 2025
9bd0f88
missing gdx argument in FSEC output script
georg-schroeter Oct 20, 2025
ed31edc
update magpie4 version
georg-schroeter Oct 21, 2025
64d29fc
update magpie4 version
georg-schroeter Oct 21, 2025
8fcc0cc
release preparation
georg-schroeter Oct 21, 2025
e354452
update magpie4 version
georg-schroeter Oct 22, 2025
98c1ab4
added exemption from file size limit for release renv.lock
georg-schroeter Oct 22, 2025
ce2f6df
release date
georg-schroeter Oct 22, 2025
803cdc4
bump release date
georg-schroeter Oct 23, 2025
52e177a
missing LUH2 -> LUH3 change
georg-schroeter Oct 23, 2025
b343ca7
merge master into develop
georg-schroeter Oct 23, 2025
699550a
Merge pull request #848 from georg-schroeter/rc-4.13.0
georg-schroeter Oct 23, 2025
900d9a6
prevent check_config warnings for cfg$ options set in start_run() but…
georg-schroeter Oct 24, 2025
991de5e
changelog
georg-schroeter Oct 24, 2025
1675d1f
Merge pull request #70 from magpiemodel/develop
caviddhen Oct 30, 2025
716f60f
Merge pull request #849 from georg-schroeter/configcheck_warnings
pascal-sauer Nov 3, 2025
1053903
remove v39kHRc1000_FSECe_FSDP from weekly tests
pascal-sauer Nov 10, 2025
76f56c1
Merge branch 'develop' of https://github.com/caviddhen/magpie into de…
Nov 10, 2025
7114f75
suppress server unreachable warning as we have other repos
pascal-sauer Nov 10, 2025
ee04c36
Merge pull request #851 from pascal-sauer/fix-warning-server-unreachable
pascal-sauer Nov 11, 2025
aa8fe4e
Merge branch 'develop' of github.com:magpiemodel/magpie into remove_c…
pascal-sauer Nov 11, 2025
2147124
remove highres from test_runs
pascal-sauer Nov 11, 2025
5eddf1e
Merge pull request #850 from pascal-sauer/remove_c1000_FSECe_FSDP
pascal-sauer Nov 12, 2025
5169a59
Merge branch 'develop' of https://github.com/caviddhen/magpie into de…
Nov 12, 2025
525f782
update inputdata and changelog
Nov 13, 2025
8e77c6f
Update main.gms
caviddhen Nov 13, 2025
8ec8521
update scenario and FSEC cfg csv
Nov 14, 2025
0c8eeff
bugfix re/afforestation historical time steps
flohump Nov 16, 2025
deb086c
changelog
flohump Nov 17, 2025
7e816af
Merge pull request #852 from caviddhen/develop
pascal-sauer Nov 17, 2025
4c430c0
withr::defer remove f32_max_aff_area.cs4
pascal-sauer Nov 18, 2025
58381f9
changelog
pascal-sauer Nov 18, 2025
1a705cc
sleep comments
pascal-sauer Nov 20, 2025
4756647
Merge pull request #854 from pascal-sauer/develop
pascal-sauer Nov 20, 2025
9ccd629
Fix parenthesis placement in forestry discounting formula
mscrawford Nov 28, 2025
3e0478c
Merge pull request #855 from mscrawford/bugfix/forestry-discounting
mscrawford Nov 28, 2025
1b19f43
Merge branch 'develop' into f_fixHighRes
flohump Nov 28, 2025
5f0bc46
resolved merge conflict
pvjeetze Nov 28, 2025
9873556
updated start scripts
pvjeetze Dec 2, 2025
e088f43
Merge pull request #853 from flohump/f_fixHighRes
flohump Dec 5, 2025
a275406
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
pvjeetze Dec 10, 2025
f767cea
WIP input revision 4.128
pascal-sauer Dec 12, 2025
296b0f5
solve todos
pascal-sauer Dec 12, 2025
3eb8671
Update CHANGELOG.md
pascal-sauer Dec 15, 2025
66d6a5c
Merge pull request #856 from pascal-sauer/input4.128
pascal-sauer Dec 15, 2025
03d9512
Merge branch 'develop' into f_btc2
pvjeetze Dec 19, 2025
480e300
Merge pull request #805 from pvjeetze/f_btc2
pvjeetze Dec 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
^renv$
^renv\.lock$
^.*\.zenodo.json$
52 changes: 39 additions & 13 deletions .Rprofile
Original file line number Diff line number Diff line change
@@ -1,16 +1,42 @@
# source global .Rprofile (very important to load user specific settings)
# DO NOT EDIT THIS LINE!
if(file.exists("~/.Rprofile")) source("~/.Rprofile")
# | (C) 2008-2025 Potsdam Institute for Climate Impact Research (PIK)
# | authors, and contributors see CITATION.cff file. This file is part
# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of
# | AGPL-3.0, you are granted additional permissions described in the
# | MAgPIE License Exception, version 1.0 (see LICENSE file).
# | Contact: magpie@pik-potsdam.de
Sys.setenv(RENV_PATHS_LIBRARY = "renv/library")
if (Sys.info()[["sysname"]] == "Windows") {
# make renv use R's default download function to prevent
# curl: (35) schannel: next InitializeSecurityContext failed: Unknown error
# (0x80092012) - The revocation function was unable to check revocation for the certificate.
options(renv.download.override = utils::download.file)
}

# This profile can be used to link the model to a specified library snapshot
# (e.g. if your model version is from an older date and does not work with the
# newest libraries anymore)
# By default it is not active. Just uncomment the following lines and set the
# snapshot path to a path of your choice
# Please make also sure that in your config file this .Rprofile file is copied
# to the model output folder. Otherwise, the run itself will again use the
# default library set!
# do not check if library and renv.lock are in sync, because normally renv.lock does not exist
options(renv.config.synchronized.check = FALSE,
renv.config.user.profile = TRUE) # load user specific settings from ~/.Rprofile

# snapshot <- "/p/projects/rd3mod/R/libraries/snapshots/dec2016"
# if(file.exists(snapshot)) .libPaths(snapshot)
# the text "renvVersion" is required for a check in a coupling script, will be removed soon

source("renv/activate.R")

if (!"https://rse.pik-potsdam.de/r/packages" %in% getOption("repos")) {
options(repos = c(getOption("repos"), pik = "https://rse.pik-potsdam.de/r/packages"))
}

# bootstrapping, will only run once after this repo is freshly cloned
if (isTRUE(rownames(installed.packages(priority = "NA")) == "renv")) {
message("R package dependencies are not installed in this renv, installing now...")
renv::install("rmarkdown", prompt = FALSE) # rmarkdown is required to find dependencies in Rmd files
renv::hydrate(prompt = FALSE, report = FALSE) # auto-detect and install all dependencies
message("Finished installing R package dependencies.")
if (!("upstream" %in% gert::git_remote_list()$name)) {
gert::git_remote_add("https://github.com/magpiemodel/magpie.git", "upstream")
message("Added upstream git remote pointing to magpiemodel/magpie.")
}
}

# in case bootstrapping fails halfway, install piamenv and rely on requirement auto-fixing
if (tryCatch(utils::packageVersion("piamenv") < "0.5.5", error = function(error) TRUE)) {
renv::install("piamenv", prompt = FALSE)
}
6 changes: 6 additions & 0 deletions .codeCheck
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
capitalExclusionList:
- land
- iso
- type
- age
- k
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Handle line endings automatically for files detected as text
# and leave all files detected as binary untouched.
* text=auto
35 changes: 35 additions & 0 deletions .githooks/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/usr/bin/env Rscript

gmsRequiredVersion <- "0.24.1"
if (tryCatch(utils::packageVersion("gms") < gmsRequiredVersion, error = function(error) TRUE)) {
message("gms >= ", gmsRequiredVersion, " is required, installing now...")
install.packages("gms")
}

message("Checking files for tabs... ", appendLF = FALSE)
gms::checkNoTabs(pattern = "\\.(R|Rprofile|gms|cfg|bib)$",
excludeFolders = c("output", "renv", ".git"))
message("done.")

stagedFiles <- system("git diff --cached --name-only", intern = TRUE)

# run codeCheck only if .gms file is staged
if (any(endsWith(stagedFiles, ".gms"))) {
invisible(gms::codeCheck(strict = TRUE))
message("")
}


# make sure that files are not too big
maxFilesize <- 250 # kB
exemptFromLimit <- "^renv/archive/[0-9\\.]+_renv\\.lock$"

files <- union(system("git ls-tree -r HEAD --name-only", intern = TRUE), stagedFiles)
out <- data.frame(files = files, size = round(file.size(files) / 1024, 2))
out <- out[!is.na(out$size), ]
out <- out[out$size > maxFilesize & !grepl(exemptFromLimit, out$files), ]
if (nrow(out) > 0) {
stop(nrow(out), " files with size > ", maxFilesize, "kB detected: \n",
paste0(out$files, " (", out$size, "kB)", collapse = "\n"))
}
message("All files are smaller than ", maxFilesize, "kB\n")
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
53 changes: 53 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
## :bird: Description of this PR :bird:

- Briefly explain the purpose of this pull request

## :wrench: Checklist for PR creator :wrench:

- [ ] Label pull request [from the label list](https://github.com/magpiemodel/magpie/labels).
- **Low risk**: Simple bugfixes (missing files, updated documentation, typos) or changes in start or output scripts
- **Medium risk**: Uncritical changes in the model core (e.g. moderate modifications in non-default realizations)
- **High risk**: Critical changes in model core or default settings (e.g. changing a model default or adjusting a core mechanic in the model)

- [ ] Self-review own code
- No hard coded numbers and cluster/country/region names.
- The new code doesn't contain declared but unused parameters or variables.
- [`magpie4`](https://github.com/pik-piam/magpie4) R library has been updated accordingly and backwards compatible where necessary.
- `scenario_config.csv` has been updated accordingly (important if `default.cfg` has been updated)

- [ ] Document changes
- Add changes to `CHANGELOG.md`
- Where relevant, put In-code documentation comments
- Properly address updates in interfaces in the module documentations
- run [`goxygen::goxygen()`](https://github.com/pik-piam/goxygen) and verify the modified code is properly documented

- [ ] Perform test runs
- **Low risk**:
- Run a compilation check via `Rscript start.R --> "compilation check"`
- **Medium risk**:
- Run test runs via `Rscript start.R --> "test runs"`
- Check logs for errors/warnings
- **High risk**:
- Run test runs via `Rscript start.R --> "test runs"`
- Check logs for errors/warnings
- Default run from the PR target branch for comparison
- Provide relevant comparison plots (land-use, emissions, food prices, land-use intensity,...)

### :chart_with_downwards_trend: Performance changes :chart_with_upwards_trend:

- Current develop branch default : ** mins
- This PR's default : ** mins

## :rotating_light: Checklist for reviewer :rotating_light:

- PR is labeled correctly
- Code changes look reasonable
- No hard coded numbers and cluster/country/region names.
- No unnecessary increase in module interfaces
- model behavior/performance is satisfactory.
- Changes are properly documented
- `CHANGELOG` is updated correctly
- Updates in interfaces have been properly addressed in the module documentations
- In-code documentation looks appropriate
- [ ] content review done (at least 1)
- [ ] RSE review done (at least 1)
33 changes: 33 additions & 0 deletions .github/workflows/test-code.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
on:
push:
branches:
- main
- master
- develop
pull_request:
branches:
- main
- master
- develop

name: check

jobs:
check:
runs-on: ubuntu-22.04
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3

- name: Remove .Rprofile
run: rm .Rprofile

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true
extra-repositories: "https://rse.pik-potsdam.de/r/packages"

- name: pre-commit Hook
run: source(".githooks/pre-commit")
shell: Rscript {0}
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ magpie_calib.*

#ignore input files
*.cs*
!/data-changelog.csv
*.mz
*.rds
/input/
Expand All @@ -13,6 +14,7 @@ magpie_calib.*
*.gdx
*.rda
*.opt
*.op2
*.lst
/output/

Expand All @@ -24,6 +26,17 @@ magpie_calib.*

#ignore run specific files and folders
/225*/
/run_details/
/logs/
*.out
/scripts/npi_ndc/npi_ndc_overview.txt
Rplots.pdf

#ignore GAMS license
gamslice.txt

#ignore lock file
/.lock

/renv.lock
.Rproj.user
2 changes: 2 additions & 0 deletions .lintr
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
linters: lucode2::lintrRules()
encoding: "UTF-8"
15 changes: 0 additions & 15 deletions .travis.yml

This file was deleted.

131 changes: 131 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
{
"title": "MAgPIE - An Open Source land-use modeling framework",
"version": "4.13.0dev",
"creators": [
{
"name": "Dietrich, Jan Philipp",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0002-4309-6431"
},
{
"name": "Bodirsky, Benjamin Leon",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0002-8242-6712"
},
{
"name": "Weindl, Isabelle",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Humpenöder, Florian",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0003-2927-9407"
},
{
"name": "Stevanovic, Miodrag",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Kreidenweis, Ulrich",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Wang, Xiaoxi",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Karstens, Kristine",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Mishra, Abhijeet",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0002-8287-9922"
},
{
"name": "Beier, Felicitas Dorothea",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Molina Bacca, Edna Johanna",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0001-6530-1849"
},
{
"name": "von Jeetze, Patrick",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0002-1197-4412"
},
{
"name": "Windisch, Michael",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Crawford, Michael Scott",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0003-1282-400X"
},
{
"name": "Leip, Debbora",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Klein, David",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Singh, Vartika",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Ambrósio, Geanderson",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Araujo, Ewerton",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Biewald, Anne",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Sauer, Pascal",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0002-6856-8239"
},
{
"name": "Köberle, Alexandre",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0003-0328-4750"
},
{
"name": "Steinhauser, Jan",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0002-5989-6855"
},
{
"name": "Hötten, David",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Schröter, Georg",
"affiliation": "Potsdam Institute for Climate Impact Research"
},
{
"name": "Lotze-Campen, Hermann",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0002-0003-5508"
},
{
"name": "Popp, Alexander",
"affiliation": "Potsdam Institute for Climate Impact Research",
"orcid": "0000-0001-9500-1986"
}
],
"keywords": ["landuse", "modeling", "model", "nlp", "partial equilibrium"],
"license": {
"id": "AGPL-3.0-or-later"
},
"publication_date": "2025-10-23"
}
Loading