Commits · 8c9e04d56b15b8a9e2d39e7ad752eb0f78aecb0f · Land Use Lab / PLUM

Jan 20, 2023
- Alignment with main branch. Price adjustment update. · 8c9e04d5
  Bart Arendarczyk authored 2 years ago
  
  8c9e04d5
Jan 13, 2023
- Improved price adjustment and stock level control. · a4a56b9e
  Bart Arendarczyk authored 2 years ago
  
  a4a56b9e
Jan 09, 2023
- China/Taiwan FAO data correction. · ff3cdaf7
  Bart Arendarczyk authored 2 years ago
  
  ff3cdaf7
- ForestManager and other bug fixes. Minor data changes. · c604b501
  Bart Arendarczyk authored 2 years ago
  
  c604b501
Jan 04, 2023
- Changes to country data handling. Changes to wood production. · f205ebac
  Bart Arendarczyk authored 2 years ago
  
  Better handling of missing values in raster data.
  f205ebac
- FAO and country data update. · 11d0ff0e
  Bart Arendarczyk authored 2 years ago
  
  11d0ff0e
Nov 28, 2022
- Wood demand adjusted for potential yield. · 5df1c457
  Bart Arendarczyk authored 2 years ago
  
  5df1c457
- Changes to timber yield calculation and optimisation. · 39f3e716
  Bart Arendarczyk authored 2 years ago
  
  39f3e716
Nov 05, 2022
- Updated land cover age file. Other small changes. · 0c50c778
  Bart Arendarczyk authored 2 years ago
  
  0c50c778
Nov 02, 2022
- Changes to forestry data input. Added output files. · 9a37ce24
  Bart Arendarczyk authored 2 years ago
  
  9a37ce24
Oct 21, 2022
- Changes to land cover conversion costs and fert/irrig constraints. · 0eb673db
  Bart Arendarczyk authored 2 years ago
  
  Some merges from master branch.
  0eb673db
Oct 10, 2022
- Subsidies fix and animal production cost merge from main. · 77b7757c
  Bart Arendarczyk authored 2 years ago
  
  77b7757c
Jul 27, 2022
- Minor changes to carbon and forest rotation. · 2b9bcbb9
  Bart Arendarczyk authored 2 years ago
  
  2b9bcbb9
Jul 22, 2022
- Refactored conversion cost handling. Improved LogWriter. · e83a3b7f
  Bart Arendarczyk authored 2 years ago
  
  e83a3b7f
Jul 08, 2022
- Merged demand optimisation improvements. · d4e90b92
  Bart Arendarczyk authored 2 years ago
  
  d4e90b92
- Updated wood yield reader. Forest age now reset at rotation. · dac72cf9
  Bart Arendarczyk authored 2 years ago
  
  dac72cf9
Jun 09, 2022
- Correction to initial land cover files. · d9fa7b6c
  Bart Arendarczyk authored 2 years ago
  
  d9fa7b6c
Jun 08, 2022
- Updated 1970 hindcast data. · 7fd5fb76
  Bart Arendarczyk authored 2 years ago
  
  Second stage calib extra config option.
  7fd5fb76
- Shell scripts updates. · 4fbd4af8
  Bart Arendarczyk authored 2 years ago
  
  4fbd4af8
Jun 07, 2022
- Refactored GAMS code. Energycrops and carbon forest area limits. · 3c187fdd
  Bart Arendarczyk authored 2 years ago
  
  Initial timber forest area from Schulze et al. 2019.
  3c187fdd
Jun 01, 2022
- More options for carbon ETS. Improved international trade. · b0a439e0
  Bart Arendarczyk authored 2 years ago
  
  b0a439e0
May 21, 2022
- Price caps. · 8e103ed7
  Bart Arendarczyk authored 2 years ago
  
  8e103ed7
- Overhaul of carbon market. · 0a524459
  Bart Arendarczyk authored 2 years ago
  
  Improved handling of wood imports during calibration.
  0a524459
May 04, 2022
- Multithreading. Improved calibration. · 137003bc
  Bart Arendarczyk authored 2 years ago
  
  137003bc
Apr 16, 2022
- Refactoring and clean up. · a840d6eb
  Bart Arendarczyk authored 2 years ago
  
  Minor bug fixes. Merged new changes from master.
  a840d6eb
Apr 06, 2022
- Bug fixes. GAMS crash workaround. · 0a4414f2
  Bart Arendarczyk authored 2 years ago
  
  Updated land cover age file. Energycrop demand previously not carried through to GAMS.
  0a4414f2
Apr 02, 2022
- Fixed ruminant overproduction bug. · c137553c
  Bart Arendarczyk authored 2 years ago
  
  c137553c
Mar 28, 2022
- Major changes to wood and carbon. Refactored land cover data structures. · bfd78cd3
  Bart Arendarczyk authored 2 years ago
  
  bfd78cd3
Mar 08, 2022
- Minor refactoring and clean-up. · 9be41d48
  Bart Arendarczyk authored 3 years ago
  
  9be41d48
Mar 03, 2022
- Added compilePlum runtime limit · f2077484
  Bart Arendarczyk authored 3 years ago
  
  f2077484
Mar 02, 2022
- Changes to GAMS forestry code and other tweaks. · 281273c1
  Bart Arendarczyk authored 3 years ago
  
  281273c1
Feb 18, 2022
- Changes to land cover internal data structure. · f73c137b
  Bart Arendarczyk authored 3 years ago
  
  f73c137b
Feb 15, 2022
- Incorporated changes from master branch. · 5c005b06
  Bart Arendarczyk authored 3 years ago
  
  5c005b06
- Annualised wood harvest. · 2bc68eff
  Bart Arendarczyk authored 3 years ago
  
  2bc68eff
Feb 04, 2022
- Land cover serialized to binary file. · b23148e4
  Bart Arendarczyk authored 3 years ago
  
  b23148e4
Feb 03, 2022
- Binary file reader for carbon and wood yield data. · 8456f44a
  Bart Arendarczyk authored 3 years ago
  
  8456f44a
Oct 11, 2021
- Land cover areas serialized to XML for improved performance. · 363fc645
  Bart Arendarczyk authored 3 years ago
  
  363fc645
- Further work on ABC MCMC. · 46efe8a7
  Bart Arendarczyk authored 3 years ago
  
  46efe8a7
Oct 08, 2021
- Merge branch 'forestry' of git@git.ecdf.ed.ac.uk:lul/plumv2.git into forestry · 49331b2c
  Bart Arendarczyk authored 3 years ago
  
  49331b2c
- Wood trade constraint fix. · 8f0084db
  Bart Arendarczyk authored 3 years ago
  
  Various fixes. Code cleaned up.
  8f0084db