Skip to content
Snippets Groups Projects

Repository graph

You can move around the graph by using the arrow keys.
Select Git revision
  • 4cba526b1adbd10943f11cf985e43025a3df041d
  • master default protected
  • CraftyIntegration
  • Demand2
  • LU-demand-split
  • carbon
  • dietary_branch
  • fishSeafood
  • forest
  • forestry
  • ggcmi
  • juliette/documentation
  • juliette/work
  • land_share
  • natural_areas
  • overconsumption
  • protected_areas
  • roslyn_branch
  • solar
  • yieldshocks
  • AgrivoltaicsPaper
  • DownscalingPaper
  • ForestryPaper
  • UKLandFootprintPaper
  • RussiaUkrainePaper
  • Sams-ES-paper
  • Diet-Biodiversity-Paper
  • RCP_paper
28 results
  • Display full history
  • Display up to revision
Created with Raphaël 2.2.05Mar326Feb2322201918171298129Jan2519136518Dec171517Nov48Oct4129Sep2422159827Aug1627Jul327Feb428Jan109Oct84127Sep262320Aug166526Jul222120191716154126Jun25831May302322211687615Apr121110929Mar28272522191715141387527Feb261815141286130Jan241121Dec181716151428Nov22211615131211131Oct262019182113Sep31Aug2228Jul242253130Jun29212019131129May16151312210Apr24Mar232264223Feb2219Jan1013Dec24Nov22212014139320Oct1711429Sep22201813128131Aug302922211918151428Jul2713865330Jun292827232221191513121131May28161528Apr16151413121110729Mar262414131211865423Feb181398630Jan26241711921Dec201814131211108230Nov2821181514121110985131Oct2812Jul116543229Jun27166May5Feb415Oct25Sep181716151428Aug27262421201918161514136Initial work on minimum land cover (conversion restriction)....forgot to remove test for debugging.Fix for NaN price values.Fixed bugs, refactored land cover change, respect protected areasSSP tau filesRefactored parts relating to LandCoverTyperevert calibration valuesremove quoting symbol in file covid scenarioBug fixes: GAMS database landcover inputs, GAMS syntax errorsAdd multishock scnariosInitial changes to include forestry completed.Update calibration factors.Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2delete ...filesDelete ...Fill in blank country income groupsrestore ssp.csv fileMerge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2updated to take different ssp file as inputAdd long covid scenario in ssp fileAdd new ssp covid file and restore previous one ssp fileFurther work on forestry component.Further work on forestry and carbon components.Initial work on reading and processing carbon flux and wood yield data.Initial changes to include wood yields and carbon fluxes.Changed diet preferences and demand calculationjuliette/workjuliette/workChanged diet preferences and demand calculationchange ssp file for long recoveryUpdated ssp file with long covidadded diet and GDP shock filesupdate to gitignorediet and GDP shock ssp filesmerge remote into localDiet change and GDP shock udsmall fix (hopefully)Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2Fix for land allocation error in allocAreas method. Unprotected natural area was being calculated on more that one occasion within a timestep resulting in changing proportions of 'other natural' and 'forest' that should be protected. Area(s) of natural land that should be protected now updated at the start of each timestep and remain constant throughout the timestep.Another Tau interpolation fixImproved logging and fix tau interpolation
Loading