Commits · 72d2a3139567a996f4c18bc8c3fbe514701b484b · Land Use Lab / PLUM

Browse files

Apr 16, 2021
- 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
Jan 05, 2021
- Changes to specific target diet · 412b223a
  Peter Alexander authored Jan 5, 2021
  
  412b223a
Dec 18, 2020
- fix for small but confusing typo. · 9d7e0e22
  rhenry2 authored Dec 18, 2020
  
  9d7e0e22
Dec 17, 2020
- Fix for shock method. · 5e09e20f
  rhenry2 authored Dec 17, 2020
  
  5e09e20f
Dec 15, 2020
- Changes to fix suitable area aggregation difference, honour protected areas... · 9e02313e
  Roslyn Henry authored Dec 15, 2020
  9e02313e
Nov 17, 2020
- Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2 · 230facb6
  rhenry2 authored Nov 17, 2020
  
  230facb6
- Files for Frances's runs · a607aceb
  rhenry2 authored Nov 17, 2020
  
  a607aceb
Nov 04, 2020
- changes for summarising UK land use script · 2c776864
  HENRY Roslyn authored Nov 4, 2020
  
  2c776864
- Post processing files for Frances · 72b28e6c
  rhenry2 authored Nov 4, 2020
  
  72b28e6c
Oct 04, 2020
- Updated HE file · 0694ab79
  rhenry2 authored Oct 4, 2020
  
  0694ab79
Oct 01, 2020
- Updating protected areas file to 2019 WDPA version, courteousy of Martin Jung. · 32bb54e8
  rhenry2 authored Oct 1, 2020
  
  32bb54e8