Commits · 8ca21e04ea4c470a37b776bb3869bb336dcb138e · Land Use Lab / PLUM · GitLab

Snippets Groups Projects

Oct 19, 2018
- removing obselete tradebarriersdummy file · 8ca21e04
  R0slyn authored 6 years ago
  
  8ca21e04
- Tidy financial speculation shock. Adjustment to read in tradebarriers file · f674ee0f
  R0slyn authored 6 years ago
  
  f674ee0f
Oct 18, 2018
- Commiting merge with Peter's changes · e69ca9ce
  R0slyn authored 6 years ago
  
  e69ca9ce
- removing old simulation files · 8815c6e6
  R0slyn authored 6 years ago
  
  8815c6e6
- changes to implement shocks, with exception of climate · 470a7494
  R0slyn authored 6 years ago
  
  470a7494
Oct 02, 2018
- Changes to force protected areas to be respected (over time). · bc18a8ad
  Peter Alexander authored 6 years ago
  
  bc18a8ad
Oct 01, 2018
- Set max irrig amount for setaside to get zero intensity for that crop · 1e30e1b4
  Peter Alexander authored 6 years ago
  
  1e30e1b4
Sep 13, 2018
- changes to fix bioenergy, GAMs wasn't outputting energy crop export levels. · f5dec23a
  R0slyn authored 6 years ago
  
  f5dec23a
Aug 31, 2018
- Potential fixes to energy crop issues with profit optimisation · d565e7e8
  Peter Alexander authored 6 years ago
  
  d565e7e8
Aug 22, 2018
- Change price used for production based on whether for domestic or export markets · d36cde23
  Peter Alexander authored 6 years ago
  
  d36cde23
Jul 28, 2018
- More config changes arising from feed and waste changes · 6b6de6ad
  Peter Alexander authored 6 years ago
  
  6b6de6ad
Jul 24, 2018
- More config tweaks · 06540c9e
  Peter Alexander authored 6 years ago
  
  06540c9e
- More changes to match feed amounts · 81f55825
  Peter Alexander authored 6 years ago
  
  81f55825
Jul 22, 2018
- Losses per crop type and feed adjustments · 0afe2306
  Peter Alexander authored 6 years ago
  
  0afe2306
Jul 05, 2018
- Recalibration based on setaside changes · 4210be50
  Peter Alexander authored 6 years ago
  
  4210be50
Jul 03, 2018
- Changes for separating out setaside/fallow as a new crop type · 085d206a
  Peter Alexander authored 6 years ago
  
  085d206a
Jul 01, 2018
- Output food balance sheet type data · efb08792
  Peter Alexander authored 6 years ago
  
  efb08792
- Change params for ssp6 · 535705f5
  Peter Alexander authored 6 years ago
  
  535705f5
Jun 30, 2018
- Reverse some of the previous parameter changes · c205bc45
  Peter Alexander authored 6 years ago
  
  c205bc45
- Apply unhandled crop adjustment to irrigation water constraint · 000ddea1
  Peter Alexander authored 6 years ago
  
  000ddea1
Jun 29, 2018
- Merge of profit max optimisation option · 52406810
  Peter Alexander authored 6 years ago
  
  52406810
- Added tag Diet-Biodiversity-Paper for changeset 655ee163e0fd · 12c3e6db
  Peter Alexander authored 6 years ago
  
  12c3e6db
Jun 21, 2018
- Merge from default · 7f6eccb3
  Peter Alexander authored 6 years ago
  
  7f6eccb3
- Further changes to PA and clustering · fec57148
  Peter Alexander authored 6 years ago
  
  Diet-Biodiversity-Paper
  
  fec57148
Jun 20, 2018
- Fix NPE in debug / output code · 4aa3993d
  Peter Alexander authored 6 years ago
  
  4aa3993d
- Fix to issues with PA not being aggregated correctly · 9736907d
  Peter Alexander authored 6 years ago
  
  9736907d
Jun 19, 2018
- Output total suitable land · 21c044f1
  Peter Alexander authored 6 years ago
  
  21c044f1
- Tricky merge... · 7132eb2f
  Peter Alexander authored 6 years ago
  
  7132eb2f
- Merge · 00e2f354
  Peter Alexander authored 6 years ago
  
  00e2f354
- Merge of diet branch to main · 0636818e
  Peter Alexander authored 6 years ago
  
  0636818e
Jun 13, 2018
- Changes to simplify configuration · 3edd10dc
  Peter Alexander authored 6 years ago
  
  3edd10dc
- runPlum.sh changes to be more compatible with KIT cluster · c00b2be5
  Peter Alexander authored 6 years ago
  
  c00b2be5
Jun 11, 2018
- Remove outputting of animal products as if they were crops · 9cac30ee
  Peter Alexander authored 6 years ago
  
  9cac30ee
May 29, 2018
- merged default into dietary branch · 5cf6df90
  R0slyn authored 6 years ago
  
  5cf6df90
- new files added and script files amended in partial merge with default · 9a0f8d86
  R0slyn authored 6 years ago
  
  9a0f8d86
- Removing obsolete files. · bf61342e
  R0slyn authored 6 years ago
  
  bf61342e
- adding simulation files and PA files with new names. · 72115a74
  R0slyn authored 6 years ago
  
  72115a74
- small tweaks in source files, mainly text. · 8b043cce
  R0slyn authored 6 years ago
  
  8b043cce
May 16, 2018
- Changes to support running with multiple code branches from runPlum.sh script · 888dde30
  Peter Alexander authored 6 years ago
  
  888dde30
May 15, 2018
- Fixes to new profit max. optimisation. · 9e51b03a
  Peter Alexander authored 6 years ago
  
  9e51b03a