Commits · 3841372f19e234c9f8ff1132624fbf432ff8dfd4 · Land Use Lab / PLUM

Nov 16, 2018
- Stop exiting on allocation error. · 3841372f
  Peter Alexander authored 6 years ago
  
  3841372f
Nov 15, 2018
- Automated merge with bundle:/var/folders/q0/_71d_v6x7_db44ndq976wzym0000gn/T/SourceTreeTemp.RypA6t · 58406de8
  Peter Alexander authored 6 years ago
  
  58406de8
- Allow maps of yields shocks to be specified · 36de1719
  Peter Alexander authored 6 years ago
  
  36de1719
- merge land allocation fix changes · 1be7c885
  R0slyn authored 6 years ago
  
  1be7c885
- fix to incorporate seed and waste losses into production passed from GAMS to... · d32c19ed
  R0slyn authored 6 years ago
  
  fix to incorporate seed and waste losses into production passed from GAMS to Java, incl change to fbs method. Outputting demand for Frances and hacky code for Trump stuff.
  d32c19ed
Nov 13, 2018
- Fix allocation of land use change issue "This should never happen.. " error · 38f223e4
  Peter Alexander authored 6 years ago
  
  38f223e4
Nov 12, 2018
- merge subsidies changes · adfa7e1d
  R0slyn authored 6 years ago
  
  adfa7e1d
- Tidy up 'TRADE_BARRIER_MULTIPLIER' remove S on end to keep consistent and... · 4bb1ca5e
  R0slyn authored 6 years ago
  
  Tidy up 'TRADE_BARRIER_MULTIPLIER' remove S on end to keep consistent and change initial price values
  4bb1ca5e
Nov 11, 2018
- Allow subsidy rate file to be change in config · a2e7aa34
  Peter Alexander authored 6 years ago
  
  a2e7aa34
- Tidy up parameters added then not used · 3a753837
  Peter Alexander authored 6 years ago
  
  3a753837
- Allow setting of subsidy rates · 6095d077
  Peter Alexander authored 6 years ago
  
  6095d077
- Merge · 892698fe
  Peter Alexander authored 6 years ago
  
  892698fe
- Set initial prices from parameters · 862df6d1
  Peter Alexander authored 6 years ago
  
  862df6d1
Nov 01, 2018
- tweaks to create shock file script · bf17fa48
  R0slyn authored 6 years ago
  
  bf17fa48
- adding shock package to compile plum script · 0796efca
  R0slyn authored 6 years ago
  
  0796efca
Oct 31, 2018
- merging with climate yield shock changes · 24ac672d
  R0slyn authored 6 years ago
  
  24ac672d
- small tweaks · a04321dc
  R0slyn authored 6 years ago
  
  a04321dc
Oct 26, 2018
- Changes for yield shock adjustments · 7d64c671
  Peter Alexander authored 6 years ago
  
  7d64c671
Oct 20, 2018
- Automated merge with bundle:/var/folders/q0/_71d_v6x7_db44ndq976wzym0000gn/T/SourceTreeTemp.0bJmgZ · df7d90e2
  Peter Alexander authored 6 years ago
  
  df7d90e2
- Change to LPJ yield calib factors · 1d2d232f
  Peter Alexander authored 6 years ago
  
  1d2d232f
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