Code

MAgPIE release 4.8.2#726

Code

Merged

pascal-sauer merged 230 commits intomagpiemodel:mastermagpiemodel/magpie:masterfrom jdrtommey:developjdrtommey/magpie:developCopy head branch name to clipboardSep 24, 2024

+3,011-880

Commits

Commits on May 21, 2024

• refactor selfsuff_reduced

  DavidhoPIK

  committed
  74ed9a0

• added changelog entry, improved comments

  DavidhoPIK

  committed
  4c08628

Commits on May 22, 2024

• updated documentation the realization

  DavidhoPIK

  committed
  996e8e2

• added sticky livestock realization

  DavidhoPIK

  committed
  0393026

• improved documentation

  DavidhoPIK

  committed
  e8208bf

Commits on May 23, 2024

• updated default.cfg and changelog

  DavidhoPIK

  committed
  7239af1

• Merge branch 'develop' into develop_refactor_selfsuff_reduced

  DavidhoPIK

  committed
  7964d83

Commits on May 24, 2024

• use macro instead of new variable

  DavidhoPIK

  committed
  1ba2f7e

• minor updates in documentation

  DavidhoPIK

  committed
  20a966f

Commits on May 27, 2024

• added output report with corresponding r markdown

  DavidhoPIK

  committed
  147dcf2

• renamed report

  DavidhoPIK

  committed
  eec7b46

• added changelog entry

  DavidhoPIK

  committed
  8b0fe3b

• Update CHANGELOG.md

  DavidhoPIK

  authored
  48917e7

• moved changelog entry to added

  DavidhoPIK

  committed
  a963021

• added R generated updated of sections of modules

  DavidhoPIK

  committed
  32e2b07

Commits on May 28, 2024

• added David Hötten as author

  DavidhoPIK

  committed
  0c6897f

• Minor update of comment in EU_report.Rmd

  DavidhoPIK

  authored
  94ab66a

• Update modules/70_livestock/fbask_jan16_sticky/realization.gms

  Show description for 2f09d7f
  

  DavidhoPIK

  and

  tscheypidi

  authored
  2f09d7f

• minor refactor of EU_report.rmd

  DavidhoPIK

  committed
  53489dc

Commits on Jun 17, 2024

• rephrased and corrected module documentation

  DavidhoPIK

  committed
  a299087

• renamed macro to comply with naming convention

  DavidhoPIK

  committed
  f0cee84

• Merge branch 'develop' into develop_refactor_selfsuff_reduced

  DavidhoPIK

  committed
  9569825

Commits on Jun 20, 2024

• merge master into develop

  jdrtommey

  committed
  760397b

• Merge pull request magpiemodel#691 from jdrtommey/develop

  Show description for 3ac5aba
  pascal-sauer

  authored
  3ac5aba

Commits on Jun 21, 2024

• Merge branch 'develop' into add_EU_output_report

  DavidhoPIK

  authored
  0146086

• removed creation of validation subfolder

  DavidhoPIK

  committed
  773ace4

• Merge pull request magpiemodel#680 from DavidhoPIK/add_EU_output_report

  Show description for c3f649f
  DavidhoPIK

  authored
  c3f649f

• Merge branch 'develop' into develop_add_sticky_livestock_implementation

  DavidhoPIK

  authored
  e269739

• corrected type

  DavidhoPIK

  authored
  c26b75f

• Merge pull request magpiemodel#678 from DavidhoPIK/develop_add_sticky_livestock_implementation

  Show description for 1d06d91
  DavidhoPIK

  authored
  1d06d91

• rds_report check

  flohump

  committed
  2a8defc

• bugfix

  flohump

  committed
  ead3de4

• bugfix

  flohump

  committed
  790e829

• bugfix

  flohump

  committed
  f0ffea5

• bugfix

  flohump

  committed
  8e400c9

• added SHAPE

  flohump

  committed
  836d518

• added AR6_MAgPIE and AgMIP

  flohump

  committed
  612ce8e

• update agmip

  flohump

  committed
  2dfff7f

• piamInterface version

  flohump

  committed
  0f48ca6

• bugfix GLO World

  flohump

  committed
  e7223c0

Commits on Jun 24, 2024

• bugfix in start.R and output.R

  tscheypidi

  committed
  0c0bc8c

• Merge pull request magpiemodel#692 from flohump/f_report

  Show description for 4ca5a4c
  flohump

  authored
  4ca5a4c

• Merge pull request magpiemodel#693 from tscheypidi/develop

  Show description for a11836f
  tscheypidi

  authored
  a11836f

• updated start scripts and config for EAT project

  FelicitasBeier

  committed
  b3487aa

• switched to sticky_labor for all EAT runs in config

  FelicitasBeier

  committed
  1e7ed7a

• Merge pull request magpiemodel#677 from DavidhoPIK/develop_refactor_selfsuff_reduced

  Show description for 941c28b
  DavidhoPIK

  authored
  941c28b

Commits on Jun 26, 2024

• added potential forest area as output

  FelicitasBeier

  committed
  c4c2114

Commits on Jun 27, 2024

• bugfixes and clean up of EAT2p0 scripts and config

  FelicitasBeier

  committed
  df8c227

Commits on Jun 28, 2024

• update merge_report and rds_report

  flohump

  committed
  dfe8cd4

• changelog

  flohump

  committed
  26d30d0

• added consumption for non-ag water abstractions

  FelicitasBeier

  committed
  dd54179

• Merge branch 'develop' into DeepDive_Develop

  FelicitasBeier

  committed
  24c706d

• bugfix: domain violation

  FelicitasBeier

  committed
  cdbe7d0

• bugfix: domain violation 2

  FelicitasBeier

  committed
  edcbc6e

• bugfix: domain violation 3

  FelicitasBeier

  committed
  fdeb7c7

• add wtype as set

  FelicitasBeier

  committed
  ca30576

Commits on Jul 1, 2024

• set all EL2_Default switches to default to ensure that not overwritten by scenario settings in start script

  FelicitasBeier

  committed
  c49f7ee

• bugfix start script: bau setting for pal should be ssp2

  FelicitasBeier

  committed
  5fd020a

• Merge pull request magpiemodel#694 from flohump/f_report

  Show description for aafa9a5
  flohump

  authored
  aafa9a5

Commits on Jul 4, 2024

• updated preprocessing and paths

  FelicitasBeier

  committed
  2688063

• bugfix related to config in start scripts of EL2

  FelicitasBeier

  committed
  8243a66

Commits on Jul 5, 2024

• updated all preprocessing input vectors in configs

  FelicitasBeier

  committed
  0a9e9a7

• Merge branch 'develop' into DeepDive_Develop

  FelicitasBeier

  committed
  480dc97

• updated changelog

  FelicitasBeier

  committed
  87902af

• bugfix in agmip_report call in start script

  FelicitasBeier

  committed
  df4d28c

• fixed typo

  FelicitasBeier

  committed
  170a117

• Merge pull request magpiemodel#695 from FelicitasBeier/DeepDive_Develop

  Show description for a24cc98
  FelicitasBeier

  authored
  a24cc98

Commits on Jul 8, 2024

• added default column to config for clean up

  FelicitasBeier

  committed
  eb23e00

• renamed fsec scenario config to new convention

  FelicitasBeier

  committed
  4b9955f

• bugfix in default settings

  FelicitasBeier

  committed
  7f338f5

• added new project specific config files

  FelicitasBeier

  committed
  57a8a2b

• add genie and navigate project configs

  k4rst3ns

  committed
  1a502a2

• include option that makes feasibility easier

  FelicitasBeier

  committed
  12a8f9c

Commits on Jul 9, 2024

• Use 'find' instead of 'ls' to create the list of all MAgPIE reportings available in the results archive for shinyresults

  Show description for ee4ee68
  dklein-pik

  committed
  ee4ee68

• Merge pull request magpiemodel#696 from dklein-pik/develop

  Show description for 65395ee
  dklein-pik

  authored
  65395ee

• added configs for frst_shock, gcs and ngfs

  pvjeetze

  committed
  17fcff8

• first cleaning of scenario config + added configs for geniescp and navigate

  pvjeetze

  committed
  a2f554c

Commits on Jul 10, 2024

• Revert "first cleaning of scenario config + added configs for geniescp and navigate"

  Show description for 2c6cb02
  pvjeetze

  committed
  2c6cb02

• Merge branch 'fixConfig' of https://github.com/k4rst3ns/magpie into fixConfig

  pvjeetze

  committed
  2319006

• removed default columns from project configs

  pvjeetze

  committed
  8852354

• Add oil and sugar needed as ingredient for MP/scp production as additional demand.

  flohump

  committed
  1460d2a

Commits on Jul 11, 2024

• Fader GHG policy country

  flohump

  committed
  d58e86d

• partial commit to save work

  flohump

  committed
  7fb19d7

Commits on Jul 12, 2024

• Add oil and sugar needed as ingredient for MP/scp production as additional demand.

  flohump

  committed
  3679f7d

• add mail-type FAIL

  pascal-sauer

  committed
  94d3965

Commits on Jul 15, 2024

• revision of units and scalar names

  flohump

  committed
  691ec01

• updated to iteration 12

  FelicitasBeier

  committed
  ace41f6

• replace tabs with spaces

  flohump

  committed
  6907c61

• Merge pull request magpiemodel#699 from pascal-sauer/develop

  Show description for 9488396
  pascal-sauer

  authored
  9488396

Commits on Jul 16, 2024

• revision scp-based milk

  flohump

  committed
  f7ea2a9

• Merge branch 'develop' of github.com:magpiemodel/magpie into f_MP

  flohump

  committed
  d881fdf

• Clean-up of main scenario_config.csv

  weindl

  authored
  ae1dfc3

• Update scenario_config.csv

  weindl

  authored
  9433a2c

Commits on Jul 17, 2024

• updated Eat Lancet columns and Eat Lancet project config

  FelicitasBeier

  committed
  cabe833

• adjusted start scripts for LAMA and EAT

  FelicitasBeier

  committed
  4811f8e

• updated changelog

  FelicitasBeier

  committed
  782375b

• replace , with ; in navigate config

  FelicitasBeier

  committed
  829ed16

• bugfix quotes

  k4rst3ns

  committed
  1384942

Commits on Jul 18, 2024

• added out of bounds check

  tscheypidi

  committed
  03cac2c

• Update project_GCS.R

  weindl

  authored
  feaa8d1

• Change the logic used to decide whether bioenergy demand and ghg prices are read from a REMIND report: Decide individually for demand and price whether they are read from a report. Previously, they…

  Show description for 67035cf
  dklein-pik

  committed
  67035cf

• Update GENIE project files

  jansteinhauser

  committed
  bb4be69

• Merge branch 'fixConfig' of https://github.com/k4rst3ns/magpie into fixConfig

  jansteinhauser

  committed
  a1c3431

• Add entry to CHANGELOG.md

  dklein-pik

  committed
  3954d3f

• added optional fat for scp-based meat alternatives

  flohump

  committed
  dd74dd4

• Merge pull request magpiemodel#702 from dklein-pik/develop

  Show description for c905dc2
  dklein-pik

  authored
  c905dc2

• Apply suggestions from code review

  Show description for 277d21f
  

  tscheypidi

  and

  flohump

  authored
  277d21f

• update

  flohump

  committed
  5002cd8

• Merge branch 'develop' of github.com:magpiemodel/magpie into f_MP

  Show description for ed254ca
  flohump

  committed
  ed254ca

• Merge pull request magpiemodel#701 from tscheypidi/develop

  Show description for 4596f3a
  tscheypidi

  authored
  4596f3a

• switched time steps to less_TS for better magicc results

  FelicitasBeier

  committed
  f9d16ca

• bugfix

  FelicitasBeier

  committed
  b772452

Commits on Jul 19, 2024

• Merge branch 'develop' of github.com:magpiemodel/magpie into f_faderGHG

  flohump

  committed
  d997826

• update

  flohump

  committed
  669017e

• bugfix

  flohump

  committed
  4d4233d

• bugfix

  flohump

  committed
  13709ef

• update

  flohump

  committed
  a4597fe

• 80_optimization abort GAMS in case of execution errors

  flohump

  committed
  a016d26

• Merge pull request magpiemodel#703 from flohump/f_fix

  Show description for a0246e9
  flohump

  authored
  a0246e9

• Merge branch 'develop' of github.com:magpiemodel/magpie into f_faderGHG

  flohump

  committed
  83007d4

• - **56_ghg_policy** added optional temporal and regional fader for GHG emission pricing policy

  flohump

  committed
  6c0bfe5

• - **56_ghg_policy** added optional temporal and regional fader for GHG emission pricing policy

  flohump

  committed
  3e577f0

• Merge pull request magpiemodel#704 from flohump/f_faderGHG

  Show description for 4c14926
  flohump

  authored
  4c14926

Commits on Jul 21, 2024

• save

  flohump

  committed
  bca09d9

• save

  flohump

  committed
  eee6654

Commits on Jul 22, 2024

• rename

  flohump

  committed
  8901669

• update

  flohump

  committed
  754b98a

Commits on Jul 23, 2024

• Merge pull request magpiemodel#698 from flohump/f_MP

  Show description for 92d984c
  flohump

  authored
  92d984c

• Merge branch 'develop' of github.com:magpiemodel/magpie into f_peatland2

  flohump

  committed
  ea175ad

• documentation

  flohump

  committed
  3bf94db

Commits on Jul 24, 2024

• documentation

  flohump

  committed
  2f039d4

Commits on Jul 25, 2024

• revision of scaling factor

  flohump

  committed
  e5d77ad

• defaults

  flohump

  committed
  b93ab28

Commits on Jul 26, 2024

• update

  flohump

  committed
  0bb2b69

• Merge branch 'develop' into DeepDive_Develop

  FelicitasBeier

  committed
  1ba39de

• bugfix in parameter declaration of food module

  FelicitasBeier

  committed
  0dbddcf

• Merge pull request magpiemodel#705 from FelicitasBeier/DeepDive_Develop

  Show description for ba89ab1
  FelicitasBeier

  authored
  ba89ab1

Commits on Jul 30, 2024

• add partition=priority

  pascal-sauer

  committed
  835b194

• Merge pull request magpiemodel#707 from pascal-sauer/develop

  Show description for 4488c1c
  pascal-sauer

  authored
  4488c1c

Commits on Jul 31, 2024

• modify standby runs to include parition information

  jdrtommey

  committed
  1c8c2ff

Commits on Aug 1, 2024

• Merge pull request magpiemodel#708 from jdrtommey/feature/standby_scripts

  Show description for 001e999
  jdrtommey

  authored
  001e999

Commits on Aug 5, 2024

• replaced gdx with gdx2 require/library statements and added missing library/require gdx2 statements

  tscheypidi

  committed
  caf708d

• updated CHANGELOG

  tscheypidi

  committed
  7fce62f

Commits on Aug 7, 2024

• mrdownscale output script

  pascal-sauer

  committed
  c22704e

Commits on Aug 8, 2024

• use downscaleRunESM

  pascal-sauer

  committed
  141cc01

• remove priority information from job submission scripts

  jdrtommey

  committed
  a239e10

• Merge pull request magpiemodel#712 from jdrtommey/develop

  Show description for 5843931
  jdrtommey

  authored
  5843931

• Merge pull request magpiemodel#710 from tscheypidi/develop

  Show description for e38329e
  tscheypidi

  authored
  e38329e

Commits on Aug 9, 2024

• Merge branch 'magpiemodel:develop' into develop

  pascal-sauer

  authored
  e611cc7

• Merge branch 'develop' of https://github.com/magpiemodel/magpie into develop

  pascal-sauer

  committed
  e0eda2a

• mrdownscale script

  pascal-sauer

  committed
  85c19ca

• Merge branch 'develop' of github.com:pascal-sauer/magpiemodel into develop

  pascal-sauer

  committed
  2db015e

Commits on Aug 12, 2024

• test

  flohump

  committed
  19a0fbb

Commits on Aug 13, 2024

• test

  flohump

  committed
  b9714cd

• test

  flohump

  committed
  83349da

Commits on Aug 15, 2024

• bugfix

  flohump

  committed
  d80f704

• test

  flohump

  committed
  df505c4

• update

  flohump

  committed
  37ebeca

• Merge branch 'develop' of https://github.com/magpiemodel/magpie into f_peatland2

  Show description for 0412e2d
  flohump

  committed
  0412e2d

• update

  flohump

  committed
  2f8c182

Commits on Aug 16, 2024

• changelog

  flohump

  committed
  84986ff

• update changelog

  flohump

  committed
  f0981f7

Commits on Aug 20, 2024

• bugfix for variables levels not obeying the bounds in nlp_par, conopt changed to conopt3

  flohump

  committed
  f7acc2d

Commits on Aug 21, 2024

• doc forestry

  flohump

  committed
  94f2f30

Commits on Aug 28, 2024

• Merge branch 'develop' into fixConfig

  k4rst3ns

  committed
  8960cb1

• updated EAT2p0 script to refer to new config file

  FelicitasBeier

  committed
  5980aa6

• bugfix lamaclima script

  FelicitasBeier

  committed
  e2b3fae

Commits on Aug 30, 2024

• Update scenario_config_gcs.csv to account for additional GCS scenarios

  weindl

  authored
  83c7542

• cleaned up EL2 AgMIP start script

  FelicitasBeier

  committed
  a6a5609

• bugfix for noCC scenario

  FelicitasBeier

  committed
  5011a60

Commits on Sep 3, 2024

• update doc

  flohump

  committed
  0286b8b

Commits on Sep 5, 2024

• Update CHANGELOG.md

  Show description for 89a3e7d
  

  k4rst3ns

  and

  pvjeetze

  authored
  89a3e7d

• Merge pull request magpiemodel#700 from k4rst3ns/fixConfig

  Show description for 555623c
  k4rst3ns

  authored
  555623c

• Merge branch 'develop' of https://github.com/magpiemodel/magpie into f_peatland2

  Show description for aeb5c01
  flohump

  committed
  aeb5c01

• update R packages

  flohump

  committed
  a884e2c

Commits on Sep 6, 2024

• Update AgroForestry ABCDR

  flohump

  committed
  79138f5

Commits on Sep 9, 2024

• added output script for conversion of validation.mif file into validation.rds

  flohump

  committed
  4cda7f6

• update start script

  flohump

  committed
  ad9d2b5

• additional data update additional_data_rev4.53.tgz

  flohump

  committed
  d412aec

• update start script

  flohump

  committed
  f417459

Commits on Sep 10, 2024

• bugfix in calc_calib.R to be compatible with gdx2 package

  tscheypidi

  committed
  3f0e645

• Merge pull request magpiemodel#716 from tscheypidi/develop

  Show description for 2a2e344
  tscheypidi

  authored
  2a2e344

Commits on Sep 11, 2024

• update start script

  flohump

  committed
  4e882c4

• Added convertToNetCDF output script

  mscrawford

  committed
  e801bcd

Commits on Sep 12, 2024

• bugfix peatland

  flohump

  committed
  3c35246

Commits on Sep 13, 2024

• bugfix 35_natveg

  flohump

  committed
  1585a96

• changelog

  flohump

  committed
  905875f

• Merge pull request magpiemodel#714 from flohump/f_peatland2

  Show description for 284c5a3
  flohump

  authored
  284c5a3

Commits on Sep 16, 2024

• Merge branch 'develop' of https://github.com/magpiemodel/magpie into develop

  pascal-sauer

  committed
  3a0b9ba

• changelog

  pascal-sauer

  committed
  0499bda

• Merge pull request magpiemodel#713 from pascal-sauer/develop

  Show description for 58d1391
  pascal-sauer

  authored
  58d1391

Commits on Sep 17, 2024

• update ABCDR

  flohump

  committed
  dc26bf9

• update ABCDR

  flohump

  committed
  3dde5cb

• update highres output script

  flohump

  committed
  239a180

• Merge pull request magpiemodel#719 from flohump/f_ABCDR

  Show description for 753a4db
  flohump

  authored
  753a4db

• merge develop

  flohump

  committed
  c7a601a

• update highres

  flohump

  committed
  8c23b6b

• typo fix

  flohump

  committed
  ef3728e

Commits on Sep 18, 2024

• update magpie4 R version

  flohump

  committed
  98e53fb

• Merge pull request magpiemodel#720 from flohump/f_peatland2

  Show description for 60a4f79
  flohump

  authored
  60a4f79

• Merge branch 'develop' into DeepDive_Develop

  FelicitasBeier

  committed
  65db837

• fix merge conflicts

  FelicitasBeier

  committed
  5051b82

• Merge pull request magpiemodel#715 from FelicitasBeier/DeepDive_Develop

  Show description for 3163bfa
  flohump

  authored
  3163bfa

• added SEALS allocation script

  pvjeetze

  committed
  23ca6a7

• updated changelog

  pvjeetze

  committed
  1f503af

• added scenario config to set SSP2 fix

  pvjeetze

  committed
  40a442a

• updated copyright year

  pvjeetze

  committed
  98778a4

Commits on Sep 19, 2024

• update changelog

  pvjeetze

  committed
  eaadd8c

• Merge pull request magpiemodel#718 from mscrawford/develop

  Show description for d253bf3
  mscrawford

  authored
  d253bf3

• Update scripts/output/extra/runSEALSallocation.R

  Show description for 6aef8ed
  

  pvjeetze

  and

  pascal-sauer

  authored
  6aef8ed

• Update scripts/output/extra/runSEALSallocation.R

  Show description for e859db9
  

  pvjeetze

  and

  pascal-sauer

  authored
  e859db9

• Update scripts/output/extra/runSEALSallocation.R

  Show description for b13da8f
  

  pvjeetze

  and

  pascal-sauer

  authored
  b13da8f

• changed source path of miniforge3

  pvjeetze

  committed
  c04f45b

• Merge branch 'f_mag-seals' of https://github.com/pvjeetze/magpie into f_mag-seals

  pvjeetze

  committed
  acbd0cc

• bugfix

  pvjeetze

  committed
  5e8f173

• shift to sticky as default

  emolinab

  committed
  0fb4578

• Update scripts/output/extra/runSEALSallocation.R

  Show description for ff6244b
  

  pvjeetze

  and

  pascal-sauer

  authored
  ff6244b

• Merge pull request magpiemodel#723 from emolinab/develop

  Show description for cdc40d2
  emolinab

  authored
  cdc40d2

Commits on Sep 20, 2024

• Merge branch 'f_mag-seals' of github.com:pvjeetze/magpie into develop

  pascal-sauer

  committed
  d5b319f

• additional fixes, including run submissions of Foote

  pvjeetze

  committed
  759ff44

• Merge pull request magpiemodel#721 from pvjeetze/f_mag-seals

  Show description for 2929204
  pascal-sauer

  authored
  2929204

Commits on Sep 23, 2024

• Merge branch 'develop' of github.com:magpiemodel/magpie into develop

  pascal-sauer

  committed
  a317dfb

• renv 1.0.8

  pascal-sauer

  committed
  aba4eb1

• piamenv 0.5.5

  pascal-sauer

  committed
  f2f0171

• require magpie4 2.12.6

  pascal-sauer

  committed
  41e8044

• Merge pull request magpiemodel#724 from pascal-sauer/develop

  Show description for 388f87a
  pascal-sauer

  authored
  388f87a

Commits on Sep 24, 2024

• renv 1.0.9

  pascal-sauer

  committed
  42741ba

• Merge branch 'develop' of github.com:magpiemodel/magpie into develop

  pascal-sauer

  committed
  321b3af

• Merge pull request magpiemodel#725 from pascal-sauer/develop

  Show description for 0e4a9ba
  pascal-sauer

  authored
  0e4a9ba

• magpie release 4.8.2

  jdrtommey

  committed
  9d021a8