Commits · dadec8a9e406cd9e6da4f86552d9da3e9198ba47 · Land Use Lab / PLUM

Browse files

Jun 28, 2021
- Fix for yield shock creation. · dadec8a9
  rhenry2 authored Jun 28, 2021
  
  dadec8a9
Jun 07, 2021
- Honour spatial arrangement of protected areas throughout simulation, not only when forced. · c3eaa31e
  rhenry2 authored Jun 7, 2021
  
  c3eaa31e
May 27, 2021
- Add exception log to concat output. · 44240e8d
  rhenry2 authored May 27, 2021
  
  44240e8d
- Documentation for running PLUM on Eddie · 2f8bf11a
  rhenry2 authored May 27, 2021
  
  2f8bf11a
May 26, 2021
- Check to make sure rebased demand is affordable. · 6b64bf62
  rhenry2 authored May 26, 2021
  
  6b64bf62
Apr 19, 2021
- Removing obsolete data files, adding documentation for shock generation, tweak... · ce344f9c
  rhenry2 authored Apr 19, 2021
  ce344f9c
Apr 17, 2021
- Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2 · f0df1526
  Juliette Maire authored Apr 17, 2021
  f0df1526
- Tau files new storylines · fe59ad72
  Juliette Maire authored Apr 17, 2021
  
  fe59ad72
Apr 16, 2021
- Fixes to create shock script and change to createScenario script to take end... · 00b6985f
  rhenry2 authored Apr 16, 2021
  00b6985f
- Refactored again to allow for shocks to plateau · 53f8407f
  rhenry2 authored Apr 16, 2021
  
  53f8407f
- refactored shock creation script for PLUM · 72d2a313
  rhenry2 authored Apr 16, 2021
  
  72d2a313
Apr 15, 2021
- Refactored shock code and removal of obsolete dietary code. · a5a21c8c
  rhenry2 authored Apr 15, 2021
  
  a5a21c8c
Mar 09, 2021
- 30% protected areas · 8b117135
  rhenry2 authored Mar 9, 2021
  
  8b117135
Mar 03, 2021
- ...forgot to remove test for debugging. · 5c497ae1
  rhenry2 authored Mar 3, 2021
  
  5c497ae1
- Fix for NaN price values. · ad1d39e7
  rhenry2 authored Mar 3, 2021
  
  ad1d39e7
Feb 26, 2021
- SSP tau files · 19c2545a
  rhenry2 authored Feb 26, 2021
  
  19c2545a
Feb 23, 2021
- revert calibration values · f5ef0b4f
  rhenry2 authored Feb 23, 2021
  
  f5ef0b4f
Feb 22, 2021
- remove quoting symbol in file covid scenario · 09594624
  MAIRE Juliette authored Feb 22, 2021
  
  09594624
Feb 20, 2021
- Add multishock scnarios · 5a136fee
  MAIRE Juliette authored Feb 20, 2021
  
  5a136fee
Feb 19, 2021
- Update calibration factors. · 2eb084f8
  rhenry2 authored Feb 19, 2021
  
  2eb084f8
- Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2 · 2471532a
  rhenry2 authored Feb 19, 2021
  
  2471532a
- Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2 · e3540c9d
  MAIRE Juliette authored Feb 19, 2021
  e3540c9d
- delete ...files · 77c55e64
  MAIRE Juliette authored Feb 19, 2021
  
  77c55e64
- Delete ... · 865dcafb
  Juliette Maire authored Feb 19, 2021
  
  865dcafb
- Fill in blank country income groups · 7e6d550d
  rhenry2 authored Feb 19, 2021
  
  7e6d550d
- restore ssp.csv file · b1f911a0
  MAIRE Juliette authored Feb 19, 2021
  
  b1f911a0
Feb 18, 2021
- Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2 · 23ec19f7
  MAIRE Juliette authored Feb 18, 2021
  23ec19f7
- updated to take different ssp file as input · 3aac767c
  Juliette Maire authored Feb 18, 2021
  
  3aac767c
- Add long covid scenario in ssp file · 1cd2bc19
  MAIRE Juliette authored Feb 18, 2021
  
  1cd2bc19
- Add new ssp covid file and restore previous one ssp file · 9b3eee82
  MAIRE Juliette authored Feb 18, 2021
  
  9b3eee82
Feb 01, 2021
- Changed diet preferences and demand calculation · e06e3532
  MAIRE Juliette authored Feb 1, 2021
  
  e06e3532
Jan 29, 2021
- Updated ssp file with long covid · 29513741
  MAIRE Juliette authored Jan 29, 2021
  
  29513741
Jan 25, 2021
- added diet and GDP shock files · d4ceadf9
  MAIRE Juliette authored Jan 25, 2021
  
  d4ceadf9
- update to gitignore · 696ed3ae
  MAIRE Juliette authored Jan 25, 2021
  
  696ed3ae
- diet and GDP shock ssp files · de9f6505
  MAIRE Juliette authored Jan 25, 2021
  
  de9f6505
Jan 19, 2021
- small fix (hopefully) · 7d3258f2
  rhenry2 authored Jan 19, 2021
  
  7d3258f2
Jan 13, 2021
- Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2 · ed34f530
  rhenry2 authored Jan 13, 2021
  
  ed34f530
- Fix for land allocation error in allocAreas method. Unprotected natural area... · bba5e9ca
  rhenry2 authored Jan 13, 2021
  bba5e9ca
Jan 06, 2021
- Another Tau interpolation fix · 4e99b473
  Peter Alexander authored Jan 6, 2021
  
  4e99b473
- Improved logging and fix tau interpolation · 86ec71bc
  Peter Alexander authored Jan 6, 2021
  
  86ec71bc