Skip to content
Snippets Groups Projects

Repository graph

You can move around the graph by using the arrow keys.
Select Git revision
  • 8b043cce42adde84fae3ecc9ade4e4f092c3d6f8
  • 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.017Apr1615107131Mar2925241918161210985326Feb2322201918171298129Jan2519136518Dec171517Nov48Oct4129Sep2422159827Aug1627Jul327Feb428Jan109Oct84127Sep262320Aug166526Jul222120191716154126Jun25831May302322211687615Apr121110929Mar28272522191715141387527Feb261815141286130Jan241121Dec181716151428Nov22211615131211131Oct262019182113Sep31Aug2228Jul242253130Jun29212019131129May16151312210Apr24Mar232264223Feb2219Jan1013Dec24Nov22212014139320Oct1711429Sep22201813128131Aug302922211918151428Jul2713865330Jun292827232221191513121131May28161528Apr16151413121110729Mar262414131211865423Feb181398630Jan26241711921Dec201814131211108230Nov2821181514121110985131Oct2812Jul116543229Jun27166May5Feb415Oct25Sep181716151428Aug27Merge branch 'master' of https://git.ecdf.ed.ac.uk/lul/plumv2Tau files new storylinesFixes to create shock script and change to createScenario script to take end year as an arguement when implementing shocks.Refactored again to allow for shocks to plateaurefactored shock creation script for PLUMRefactored shock code and removal of obsolete dietary code.Initial work to factor in ecological succession of natural areas.Minor changes to ForestManager.Added ForestManager class.Minor change to deal with missing values in carbon/wood files.Added carbon demand from external file.Added carbon market.Efficiency - conversion costs now only read once.Minor clean up.Added land cover conversion cost.unprotectedAreas, minimumLandCover and GAMS calc. changes/fixes.Forest conversion (minimumLandCover) restriction loosened.Bug fixes. Code cleaned up.Bug fixes (minimumLandCover FPE).30% protected areasFurther work on minimum land cover and bug fixes.Minimum land cover implemented.Change to how landCoverChange is calculated in GAMS.Initial 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 groups