Commits · bce2ba6e0234d22fe8e45b59b5d04b006951d970 · Land Use Lab / PLUM · GitLab

Snippets Groups Projects

Mar 07, 2019
- Set demand price based on global average, implying mark-up from supply price · bce2ba6e
  alexanpe authored 6 years ago
  
  bce2ba6e
Mar 05, 2019
- Minor changes for testing demand system · 1e2c3dd1
  alexanpe authored 6 years ago
  
  1e2c3dd1
Feb 27, 2019
- Some improvements in demand related to nonfood · 05bfae9a
  alexanpe authored 6 years ago
  
  05bfae9a
- Use previous demand results as initial conditions · 0602d142
  alexanpe authored 6 years ago
  
  0602d142
Feb 26, 2019
- Fix to infeasible demand problems · 9d442d3b
  alexanpe authored 6 years ago
  
  9d442d3b
Feb 18, 2019
- fix error in calculating weighted price. · 3992454e
  R0slyn authored 6 years ago
  
  3992454e
Feb 15, 2019
- revert recent changes. · dd055aa9
  R0slyn authored 6 years ago
  
  dd055aa9
Feb 14, 2019
- further changes to commodity demand. Added animal product calorie values in real terms. · 1519a7be
  R0slyn authored 6 years ago
  
  1519a7be
- tweak to handle non-food commodity price passed to gams. · 7f22d888
  R0slyn authored 6 years ago
  
  7f22d888
- updated base fract and subsidy files. · 0d56f551
  R0slyn authored 6 years ago
  
  kcal values for commodity type. Outputting first gen bioenergy demand. adjust prices passed to demand in similar terms to G&G model.
  0d56f551
Feb 12, 2019
- Changes for conversion · 1310f2b6
  alexanpe authored 6 years ago
  
  1310f2b6
Feb 08, 2019
- merging oilcrops and pulses into one commodity type · 21796b4d
  R0slyn authored 6 years ago
  
  21796b4d
Feb 06, 2019
- Start of change to combine Oilcrops and Pulses · e8e7ab96
  alexanpe authored 6 years ago
  
  e8e7ab96
Feb 01, 2019
- Rebase elastic demand projections · 16f66571
  Peter Alexander authored 6 years ago
  
  16f66571
- Changes to factor out rebasing adjustment of food demand · afa42328
  Peter Alexander authored 6 years ago
  
  afa42328
Jan 30, 2019
- More price elasticity changes · ceec879b
  Peter Alexander authored 6 years ago
  
  ceec879b
Jan 24, 2019
- First stage of integrating demand system with price elasticity. · 73dc1fd7
  Peter Alexander authored 6 years ago
  
  73dc1fd7
Jan 11, 2019
- Changes to trade data. · 7bc5745a
  R0slyn authored 6 years ago
  
  7bc5745a
Dec 21, 2018
- new trade barriers file and tweak to move transport costs · a226878e
  R0slyn authored 6 years ago
  
  a226878e
- yield shock maps and climate shock probabilities related to ssp/rcp · 133ea8ce
  R0slyn authored 6 years ago
  
  133ea8ce
Dec 18, 2018
- Merge · 0ed54d12
  Peter Alexander authored 6 years ago
  
  0ed54d12
Dec 17, 2018
- Set CRAFTY countries from configuration · 309f4edb
  Peter Alexander authored 6 years ago
  
  309f4edb
- Changes to take productions from Crafty · a0ecef11
  Peter Alexander authored 6 years ago
  
  a0ecef11
Dec 16, 2018
- Factor out AbstractCountryAgent · 648c639d
  Peter Alexander authored 6 years ago
  
  648c639d
Dec 15, 2018
- Stop exception due to "World" in base_consump.csv · 2fd7239f
  Peter Alexander authored 6 years ago
  
  View commits for tag Sams-ES-paper Sams-ES-paper
  
  2fd7239f
- Merge · d4eb4c83
  Peter Alexander authored 6 years ago
  
  d4eb4c83
- Change in PLUM input data (removing redundant rows, e.g. Hong Kong) due to script clean up · 6cdaccc4
  Peter Alexander authored 6 years ago
  
  6cdaccc4
Dec 14, 2018
- Output animal numbers file for CH4 emissions estimates · 8d77f8fc
  Peter Alexander authored 6 years ago
  
  8d77f8fc
- Add pruneOutputs.sh and change to column headings refleced in concatOutputLc.sh · 8e1b1a11
  Peter Alexander authored 6 years ago
  
  8e1b1a11
Nov 28, 2018
- tweak to only output traded crops for crafty · 1777708b
  R0slyn authored 6 years ago
  
  1777708b
- added method for outputting prices for crafty and land use for just UK for RUGS scenario stuff. · d897f009
  R0slyn authored 6 years ago
  
  d897f009
Nov 22, 2018
- Merge · eb8998ac
  Peter Alexander authored 6 years ago
  
  eb8998ac
- Fix issue with ruminants going to zero for profit max constrained by... · 1a46184b
  Peter Alexander authored 6 years ago
  
  Fix issue with ruminants going to zero for profit max constrained by production (rather than net prod)
  1a46184b
Nov 21, 2018
- Reverted changes in 487 - changing profit max constraint from production to net production · e3e43543
  Peter Alexander authored 6 years ago
  
  e3e43543
Nov 16, 2018
- Constraint profit max GAMS version by production, rather than product after animal feed · 9757d061
  Peter Alexander authored 6 years ago
  
  9757d061
- different implementation of fix · 15cfaf0c
  R0slyn authored 6 years ago
  
  15cfaf0c
- Changing seed waste fix. Reverting netImportCost removal. · 0b3591c9
  R0slyn authored 6 years ago
  
  0b3591c9
- 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