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

release MAgPIE 4.9.0 #756

Merged
merged 274 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
274 commits
Select commit Hold shift + click to select a range
134ada7
pkgType
pascal-sauer Sep 24, 2024
20e7ac8
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
Sep 24, 2024
8dc7d46
Updated change log
Sep 24, 2024
88503ba
merge master into develop
jdrtommey Sep 24, 2024
391a188
Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017
flohump Sep 24, 2024
62dfe6c
GDP2017 input file update rev4.112
flohump Sep 24, 2024
50aaadd
Edited changelog
Sep 24, 2024
e1df200
Merge pull request #728 from jdrtommey/develop
jdrtommey Sep 24, 2024
fcdf2ae
Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017
flohump Sep 24, 2024
7e22298
count-up start script
flohump Sep 24, 2024
6b93227
bugfix
flohump Sep 24, 2024
e7eb67c
Fixed gti conflict in Changelog
Sep 25, 2024
0a39ce2
Merge branch 'develop' into waterTest
vartika271987 Sep 25, 2024
59f0599
Merge pull request #727 from vartika271987/waterTest
vartika271987 Sep 26, 2024
63dd571
Update config/default.cfg
flohump Sep 26, 2024
51b94fc
Update config/default.cfg
flohump Sep 26, 2024
8b03f07
Update modules/39_landconversion/calib/input.gms
flohump Sep 26, 2024
672a0f7
Update modules/29_cropland/detail_apr24/input.gms
flohump Sep 26, 2024
ea4ed1f
Update config/default.cfg
flohump Sep 26, 2024
13ab4a1
update TC module and monetary units
flohump Sep 26, 2024
16cc022
Merge branch 'develop' of github.com:magpiemodel/magpie into gdp2017
flohump Sep 26, 2024
b649f77
updated some more currency units
Sep 26, 2024
8f33e04
macc USD unit corrections
flohump Sep 26, 2024
82c5f15
Merge branch 'gdp2017' of github.com:caviddhen/magpie into gdp2017
flohump Sep 26, 2024
2d2c3d6
update in livestock regression and cost share regressions
Sep 26, 2024
9ace917
defaults
flohump Sep 26, 2024
e4e09b8
defaults
flohump Sep 26, 2024
bf485ed
Update config/projects/scenario_config_fsec.csv
flohump Sep 27, 2024
11de788
bugfix macc USD + land conversions cost calib
flohump Sep 27, 2024
878d2d1
bugfix sticky_labor
flohump Sep 27, 2024
d797404
bugfix warnings
flohump Sep 27, 2024
e24ba0b
FSEC calib factors
flohump Sep 27, 2024
1c467f3
fix warnings
flohump Sep 27, 2024
fa640a9
H16 calib factors
flohump Sep 27, 2024
b9a6940
update GDP17
flohump Oct 1, 2024
1f5f594
update start scripts
flohump Oct 2, 2024
52090d1
magpie4 lib version
flohump Oct 2, 2024
e7e62d7
bugfix plantation growth curves
flohump Oct 2, 2024
98e6fd1
update scaling factors
flohump Oct 2, 2024
019121a
start scripts update
flohump Oct 2, 2024
c5c92aa
bugfix
flohump Oct 2, 2024
60d5bb8
scaling update
flohump Oct 2, 2024
82fb440
start scripts
flohump Oct 2, 2024
774765e
start script update
flohump Oct 3, 2024
95feb29
Update scaling factors and start scripts
flohump Oct 3, 2024
8ef5c64
Merge pull request #717 from caviddhen/gdp2017
flohump Oct 3, 2024
bd5d8d3
2005 -> 2017 for REMIND coupling
orichters Oct 4, 2024
3d40b84
Merge pull request #729 from orichters/develop
orichters Oct 7, 2024
064cd47
bugfix tree cover on cropland
flohump Oct 14, 2024
58cfd17
added option to turn off future bioplastic demand
Oct 14, 2024
f00d6a3
set s62_include_bioplastic to default value
Oct 14, 2024
c491be7
Merge pull request #731 from deleip/bioplastic_fix
deleip Oct 15, 2024
7d851fb
Merge branch 'develop' of github.com:magpiemodel/magpie into f_ABCDR
flohump Oct 15, 2024
b7fda06
changelog
flohump Oct 15, 2024
c98299c
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
pascal-sauer Oct 16, 2024
f3bea2e
renv 1.0.11
pascal-sauer Oct 16, 2024
408062e
prevent warning by installing rmarkdown
pascal-sauer Oct 16, 2024
8a85fd1
Merge pull request #733 from pascal-sauer/develop
pascal-sauer Oct 16, 2024
29b3595
Merge pull request #732 from flohump/f_ABCDR
flohump Oct 17, 2024
1d3b234
update input files
flohump Oct 17, 2024
389b22d
bugfix
flohump Oct 17, 2024
4264621
bugfix resubmit.R and changelog
flohump Oct 18, 2024
79c633a
count-up versions in start scripts
flohump Oct 18, 2024
379b088
SHAPE scenarios start year of dietary shift changed to 2025
flohump Oct 18, 2024
9d70e39
update R packages and start scripts
flohump Oct 19, 2024
74e7c2a
Merge pull request #734 from flohump/f_updateInput
flohump Oct 19, 2024
1baf266
check if regional AR exceeds global AR limit
flohump Oct 21, 2024
9ac2af8
Merge pull request #735 from flohump/f_updateInput
flohump Oct 22, 2024
63d96f3
added SSP1-MC, SSP2-MC and SSP5-MC to scenario_config
flohump Oct 24, 2024
890353b
bugfix
flohump Oct 24, 2024
435e527
Update
flohump Oct 24, 2024
3bf13a8
changelog
flohump Oct 24, 2024
7db3bc3
Merge pull request #736 from flohump/f_updateInput
flohump Oct 25, 2024
1879c5f
bugfix age-class
flohump Oct 26, 2024
162048e
bugfix
flohump Oct 26, 2024
d28d56a
bugfix
flohump Oct 26, 2024
6aec7dc
update
flohump Oct 26, 2024
3afc331
test
flohump Oct 27, 2024
3f492da
test
flohump Oct 27, 2024
1abf76d
test
flohump Oct 27, 2024
f2a7044
test
flohump Oct 27, 2024
a687663
test
flohump Oct 27, 2024
68a0eac
test
flohump Oct 27, 2024
5ecc0a9
bugfix
flohump Oct 27, 2024
ae79626
test
flohump Oct 27, 2024
981756c
update
flohump Oct 27, 2024
47af91c
age-class update
flohump Oct 27, 2024
a7bfcf6
changelog
flohump Oct 27, 2024
7eb9e6b
changelog
flohump Oct 27, 2024
606689d
changelog
flohump Oct 27, 2024
9a09d4c
changelog
flohump Oct 27, 2024
91b5c6e
update
flohump Oct 27, 2024
e826a09
Update modules/28_ageclass/oct24/preloop.gms
flohump Oct 28, 2024
a9f2de7
peatland considered during disaggregation
pvjeetze Oct 29, 2024
12c7df6
changelog
pvjeetze Oct 29, 2024
091622c
update of usda cost shares
Oct 29, 2024
8ca3f86
Merge pull request #737 from flohump/f_ageclass
flohump Oct 31, 2024
de33503
bugfix output scripts report
flohump Oct 31, 2024
e073d78
Update rds_report.R
FelicitasBeier Oct 31, 2024
02fdf50
Update rds_report_iso.R
FelicitasBeier Oct 31, 2024
752524b
bugfix
Oct 31, 2024
ae906dd
updated changelog
Oct 31, 2024
dd71fec
Merge pull request #740 from flohump/f_fixreport
pascal-sauer Nov 1, 2024
227eb63
check unit format in rds_report
pascal-sauer Nov 1, 2024
a5b6b22
clarify
pascal-sauer Nov 1, 2024
af0fa82
linter
pascal-sauer Nov 1, 2024
5bce70c
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
Nov 1, 2024
629d61a
bugfix
flohump Nov 3, 2024
3e7dcd3
Merge branch 'develop' of github.com:magpiemodel/magpie into f_mag-seals
flohump Nov 3, 2024
b99affc
Tol_Feas_Min = 3.e-13
flohump Nov 4, 2024
b86f689
update
flohump Nov 4, 2024
141a0bc
test
flohump Nov 4, 2024
509595d
update
flohump Nov 4, 2024
52fbed0
Merge pull request #743 from pascal-sauer/develop
pascal-sauer Nov 4, 2024
0f61722
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
Nov 4, 2024
cf61653
updated input tgz
Nov 4, 2024
8897503
update
flohump Nov 4, 2024
f8348d7
bugfix
flohump Nov 4, 2024
47a8258
bugfix
flohump Nov 5, 2024
65ccea5
bugfix
flohump Nov 5, 2024
9a1e2b9
test
flohump Nov 5, 2024
43f1357
test
flohump Nov 5, 2024
d1931dd
added newline at end of files
Nov 5, 2024
1e439cd
update
flohump Nov 5, 2024
a07bd31
update
flohump Nov 5, 2024
1fac4e5
test
flohump Nov 5, 2024
6a8a23f
bugfix
flohump Nov 5, 2024
492c783
update
flohump Nov 5, 2024
99e0890
fix
flohump Nov 5, 2024
d905f25
update
flohump Nov 5, 2024
a3743a6
update
flohump Nov 5, 2024
a378239
update
flohump Nov 5, 2024
4ab91f8
incorporate comments
Nov 5, 2024
ba9483d
test
flohump Nov 5, 2024
af74fd2
update
flohump Nov 5, 2024
d386fb1
test
flohump Nov 5, 2024
44bfabf
updated preprocessing
Nov 5, 2024
47f3227
bugfix
flohump Nov 5, 2024
fe8cd67
update
flohump Nov 6, 2024
a798fc1
updated input data in start scripts
Nov 6, 2024
84436ed
test
flohump Nov 6, 2024
2d3a1de
Merge pull request #741 from deleip/f_usdaUpdate
deleip Nov 6, 2024
815f223
bugfix
flohump Nov 6, 2024
7cd247a
Merge branch 'develop' of github.com:magpiemodel/magpie into f_fixOpti
flohump Nov 6, 2024
6592c04
changelog
flohump Nov 6, 2024
aa034ef
bugfix typo
flohump Nov 6, 2024
1a84ac8
update start scripts
flohump Nov 6, 2024
3323a4e
remove scaling for 29_cropland
flohump Nov 8, 2024
0ebe136
start script update counter
flohump Nov 8, 2024
942b8ee
test
flohump Nov 8, 2024
286158d
test
flohump Nov 8, 2024
1b22c3d
test
flohump Nov 8, 2024
6917a6a
test
flohump Nov 9, 2024
e38e1d2
test
flohump Nov 10, 2024
18ce375
update
flohump Nov 10, 2024
2acb913
update
flohump Nov 10, 2024
321bea6
Merge pull request #744 from flohump/f_fixOpti
flohump Nov 11, 2024
3bcd119
resolved merge conflict
pvjeetze Nov 11, 2024
274dedf
resolved merge conflicts
pvjeetze Nov 11, 2024
6565d7a
bugfix vm_land
flohump Nov 11, 2024
f817640
test
flohump Nov 11, 2024
84bfeee
test
flohump Nov 11, 2024
a173ead
test
flohump Nov 11, 2024
6edaf63
test
flohump Nov 11, 2024
1e3f522
revert
flohump Nov 12, 2024
8e865af
update
flohump Nov 12, 2024
d9af1da
Merge branch 'develop' of github.com:magpiemodel/magpie into f_fixOpti
flohump Nov 13, 2024
a3ff847
fix
flohump Nov 13, 2024
9e0c3bd
update
flohump Nov 13, 2024
5eb9664
bugfixes
flohump Nov 13, 2024
6cc883e
bugfix
flohump Nov 13, 2024
172f8c3
codeCheck update
flohump Nov 13, 2024
d785b7f
Merge pull request #738 from pvjeetze/f_mag-seals
pvjeetze Nov 13, 2024
1f39058
removed neg scaling factors
flohump Nov 13, 2024
3a4ddd8
clean-up scaling factors
flohump Nov 14, 2024
77cb4d5
Merge branch 'develop' of github.com:magpiemodel/magpie into f_fixOpti
flohump Nov 14, 2024
849c9a0
Update CHANGELOG.md
flohump Nov 14, 2024
6069d07
Update modules/44_biodiversity/bii_target/equations.gms
flohump Nov 14, 2024
9d89010
Update modules/44_biodiversity/bii_target/preloop.gms
flohump Nov 14, 2024
ad9bc11
Update modules/44_biodiversity/bii_target_apr24/preloop.gms
flohump Nov 14, 2024
01af64c
remove i44_biome_area_reg from presolve
flohump Nov 14, 2024
3888668
removed duplicate code
flohump Nov 14, 2024
6642735
update start script
flohump Nov 14, 2024
3bb99fc
magpie4 lib
flohump Nov 14, 2024
408e5a8
Merge pull request #745 from flohump/f_fixOpti
flohump Nov 15, 2024
1946d58
bugfix c60_bioenergy_subsidy
flohump Nov 18, 2024
ae7b978
update R libs
flohump Nov 19, 2024
541a4d0
doc config
flohump Nov 19, 2024
776f1fd
Merge branch 'develop' of github.com:flohump/magpie into f_peatland2
flohump Nov 19, 2024
453fec9
change subsidy to 200
flohump Nov 19, 2024
c8af317
update
flohump Nov 19, 2024
db4675f
Merge branch 'f_fixOpti' of github.com:flohump/magpie into f_peatland2
flohump Nov 19, 2024
c177383
mrdowscale scripts
pascal-sauer Nov 19, 2024
cc57e14
move to added
pascal-sauer Nov 19, 2024
3e65e6b
peatland exo option
flohump Nov 19, 2024
2471108
npi reversal
flohump Nov 19, 2024
c1e2427
npi reversal
flohump Nov 19, 2024
545fc3d
update calib factor
flohump Nov 19, 2024
0a8eaa7
Merge pull request #747 from flohump/f_fixOpti
flohump Nov 19, 2024
a10f51c
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
flohump Nov 19, 2024
ad2a144
revert
flohump Nov 19, 2024
3654769
log
flohump Nov 19, 2024
50f57c8
Merge branch 'develop' of https://github.com/magpiemodel/magpie into …
flohump Nov 19, 2024
c9f19ca
update
flohump Nov 19, 2024
9bc340b
test
flohump Nov 20, 2024
85270d1
update
flohump Nov 20, 2024
811adb3
update
flohump Nov 20, 2024
c77d3f4
update
flohump Nov 20, 2024
3f9827f
update
flohump Nov 20, 2024
e9a2363
removed grasslands realization
flohump Nov 20, 2024
8726ddf
Merge branch 'develop' into develop
pascal-sauer Nov 20, 2024
88fa677
Merge pull request #748 from pascal-sauer/develop
pascal-sauer Nov 20, 2024
863fe6d
Merge branch 'develop' of github.com:magpiemodel/magpie into f_npi
flohump Nov 20, 2024
32d659a
Merge branch 'develop' of github.com:magpiemodel/magpie into f_peatland2
flohump Nov 20, 2024
94ce089
bugfix
flohump Nov 20, 2024
5b1ccec
bugfix
flohump Nov 20, 2024
e2648b1
bugfix
flohump Nov 20, 2024
7c8cb0f
Merge pull request #749 from flohump/f_npi
flohump Nov 20, 2024
bea967d
Merge branch 'develop' of github.com:magpiemodel/magpie into f_peatland2
flohump Nov 20, 2024
9508bcf
bugfix
flohump Nov 21, 2024
32585c3
Merge pull request #752 from flohump/f_npi
flohump Nov 21, 2024
b341ae7
updates
flohump Nov 21, 2024
2c7e5be
Merge pull request #751 from flohump/f_grass
flohump Nov 21, 2024
4a44206
Merge branch 'develop' of github.com:magpiemodel/magpie into f_peatland2
flohump Nov 22, 2024
38349ef
bugfix remove empty files file
flohump Nov 22, 2024
4dd6b3f
Merge pull request #753 from flohump/f_grass
pascal-sauer Nov 22, 2024
b558f9c
Merge branch 'develop' of github.com:magpiemodel/magpie into f_peatland2
flohump Nov 22, 2024
e632d7d
bugfix
flohump Nov 22, 2024
70990a9
test
flohump Nov 23, 2024
60c56e4
bugfix
flohump Nov 23, 2024
e993340
bugfix removal grassland realisation
flohump Nov 24, 2024
c03a114
renamed mapping
flohump Nov 25, 2024
48f84f5
update start script
flohump Nov 25, 2024
8e21df5
Merge pull request #754 from flohump/f_grass
flohump Nov 25, 2024
212b4fe
Merge branch 'develop' of github.com:magpiemodel/magpie into f_peatland2
flohump Nov 25, 2024
b1e7f23
Merge pull request #750 from flohump/f_peatland2
flohump Nov 25, 2024
c49c11f
bugfix fader
flohump Nov 29, 2024
c0d3d3f
update fader default
flohump Nov 29, 2024
711f9c2
update magpie4 version
flohump Dec 2, 2024
9340349
bugfix timber config
flohump Dec 2, 2024
2f1efb9
Update default.cfg
mishkos Dec 2, 2024
adc36cc
Update start_npi_ndc.R
mishkos Dec 2, 2024
9e79cb7
Update CHANGELOG.md
mishkos Dec 2, 2024
87428b9
additional_data_rev4.59.tgz
flohump Dec 2, 2024
41624b5
bugfix vm_carbon_stock.l in equations
flohump Dec 2, 2024
f5e1215
renamed _country_dummy to _country_switch in all modules
flohump Dec 2, 2024
93ef0e9
renamed _country_dummy to _country_switch in all modules
flohump Dec 2, 2024
e2e6481
add source
flohump Dec 2, 2024
66d69ab
Merge pull request #755 from flohump/f_fixfader
flohump Dec 3, 2024
7056f39
magpie release 4.9.0
pascal-sauer Dec 5, 2024
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
3 changes: 2 additions & 1 deletion .Rprofile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ if (!"https://rse.pik-potsdam.de/r/packages" %in% getOption("repos")) {
# 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)) {
Expand All @@ -37,5 +38,5 @@ if (isTRUE(rownames(installed.packages(priority = "NA")) == "renv")) {

# 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", type = getOption("pkgType"), prompt = FALSE)
renv::install("piamenv", prompt = FALSE)
}
4 changes: 2 additions & 2 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "MAgPIE - An Open Source land-use modeling framework",
"version": "4.8.2",
"version": "4.9.0",
"creators": [
{
"name": "Dietrich, Jan Philipp",
Expand Down Expand Up @@ -123,5 +123,5 @@
"license": {
"id": "AGPL-3.0-or-later"
},
"publication_date": "2024-09-24"
"publication_date": "2024-12-05"
}
51 changes: 47 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,50 @@
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [4.9.0] - 2024-12-05

### changed
- **35_natveg** revised age-class initialization of secondary forest
- **38_factor_costs** updated use of USDA cost shares
- **config** changed default input data to use 2017USD
- **config** default for `c60_bioenergy_subsidy` changed from 369 to 246 USD17MER per ton
- **config** SHAPE scenarios start year of dietary shift changed to 2025
- **config** updated input data to rev4.114
- **core** number of age-classes doubled from 150 to 300 years for better match of growth curves with potential natural vegetation.
- **extra/disaggregation** Peatland now considered in disaggregation of land pools
- **inputdata** changed GDP base year from 2005USD to 2017USD
- **module_documentation** all references to USD05 changed to USD17
- **modules** update of scaling factors in several modules
- **scripts** NPI/NDC policies synced to the year 2025 - update of additional data to `additional_data_rev4.59.tgz`
- **scripts** REMIND coupling reads data in US$2017, not US$2005
- **scripts** renamed disaggregation_mrdownscale.R -> mrdownscale_LUH2.R

### added
- **32_forestry** added option s32_npi_ndc_reversal
- **35_natveg** added option s35_npi_ndc_reversal
- **56_ghg_policy** added new interface pcm_carbon_stock to avoid use of vm_carbon_stock.l in equations
- **58_peatland** added option for exogenous peatland rewetting
- **62_material** added switch to turn off future material demand for bioplastic
- **config** added SSP1-POP-GDP SSP2-POP-GDP and SSP5-POP-GDP
- **modules[29-35]** added initial values for ov_bv for better starting point
- **scripts** add mrdownscale script (0.5deg downscaling using LandUseInit as reference)

### removed
- **13_tau** removed interface `fm_pastr_tau_hist`
- **31_past** removed `grasslands_apr22` realization

### fixed
- **10_land** Simplified land transition matrix for improved feasibility
- **11_costs** changed equation to fix bug in total water cost calculation
- **28_ageclass** bugfix input data unit and code clean-up. Renamed `feb21` realization to `oct24`
- **29_cropland** treecover age-class growth was not working properly because ac_sub was erroneously not fixed
- **44_biodiversity** bugfix biorealm_biome.cs3 in input data (shares did not add-up to 1)
- **56_ghg_policy** Fader for GHG emission pricing policy
- **70_livestock** bugfix scaling.gms file in wrong folder
- **config** additional data increased to `additional_data_rev4.58.tgz` which fixes missing gdp2017 conversions in f20_processing_unitcosts
- **config** settings in default.cfg for some switches in `73_timber` did not work correctly
- **scripts** script/output/extra/resubmit.R


## [4.8.2] - 2024-09-24

Expand All @@ -26,7 +70,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **scripts** `.nc` files are no longer created by default after disaggregation
- **scripts** output/extra/highres.R use default 13_tc realization
- **scripts** rewrite of merge_report.R based on rds files and rbind, which allows for more flexibility when merging reports. Avoid inconsistent use of "GLO" instead of "World" in report.rds files.

- **modules** renamed `country_dummy` to `country_switch` in all modules

### added
- **42_water_demand** added water abstraction type dimension for non-ag uses
Expand All @@ -43,7 +87,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **scripts** added script for automatic submission of SEALS allocation runs `./extra/runSEALSallocation.R`
- **scripts** added start script for 'Healthly Landscapes' paper `paper_healthyLscps.R`


### fixed
- **15_food** fixing parameter declaration of i15_processed_kcal_structure_iso
- **35_natveg** bugfix secdforest and other land restoration to avoid double-counting of restoration in equation `q29_land_snv`
Expand Down Expand Up @@ -79,7 +122,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **config** update to input data rev4.109. In the previous rev4.108, MER GDP was wrong and was identical to PPP GDP



## [4.8.0] - 2024-06-10

### changed
Expand Down Expand Up @@ -1009,7 +1051,8 @@ This release version is focussed on consistency between the MAgPIE setup and the
First open source release of the framework. See [MAgPIE 4.0 paper](https://doi.org/10.5194/gmd-12-1299-2019) for more information.


[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.8.2...develop
[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.9.0...develop
[4.9.0]: https://github.com/magpiemodel/magpie/compare/v4.8.2...v4.9.0
[4.8.2]: https://github.com/magpiemodel/magpie/compare/v4.8.1...v4.8.2
[4.8.1]: https://github.com/magpiemodel/magpie/compare/v4.8.0...v4.8.1
[4.8.0]: https://github.com/magpiemodel/magpie/compare/v4.7.3...v4.8.0
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ abstract: The *Model of Agricultural Production and its Impact on the Environmen
exogenously given population in 10 food energy categories, based on regional diets.
Future trends in food demand are derived from a cross-country regression analysis,
based on future scenarios on GDP and population growth.
version: 4.8.2
date-released: 2024-09-24
version: 4.9.0
date-released: 2024-12-05
repository-code: https://github.com/magpiemodel/magpie
keywords:
- landuse
Expand Down
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ Imports:
m4fsdp,
madrat,
magclass (>= 6.14.0),
magpie4 (>= 2.12.6),
magpie4 (>= 2.15.8),
MagpieNCGains,
magpiesets,
magpiesets (>= 0.46.1),
mip,
mrcommons,
patchwork,
piamenv (>= 0.5.5),
piamInterfaces (>= 0.20.7),
piamInterfaces (>= 0.37.1),
piamutils,
quitte,
raster,
Expand All @@ -40,7 +40,7 @@ Imports:
Suggests:
goxygen,
languageserver,
mrdownscale (>= 0.23.0),
mrdownscale (>= 0.28.0),
qgraph,
shinyresults,
XML
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ https://www.pik-potsdam.de/research/projects/activities/land-use-modelling/magpi
A framework description paper has been published in
Geoscientific Model Development (GMD): https://doi.org/10.5194/gmd-12-1299-2019

The model documentation for version 4.8.2 can be found at
https://rse.pik-potsdam.de/doc/magpie/4.8.2/
The model documentation for version 4.9.0 can be found at
https://rse.pik-potsdam.de/doc/magpie/4.9.0/

A most recent version of the documentation can also be extracted from the
model source code via the R package goxygen
Expand Down Expand Up @@ -226,7 +226,7 @@ [email protected]
Please contact [email protected]

## CITATION
See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.8.2/#how-to-cite) in the model documentation for information how to cite the model.
See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.9.0/#how-to-cite) in the model documentation for information how to cite the model.

## AUTHORS
See list of authors in CITATION.cff
Expand Down
Loading