Commits · bf6228d61798e39c1af5f5cfc82f3a8a625ac00e · Land Use Lab / PLUM

Mar 28, 2019
- Revert tradeBarriers file · bf6228d6
  R0slyn authored 6 years ago
  
  bf6228d6
Mar 27, 2019
- Price markup at country level · 72ec5c16
  Peter Alexander authored 6 years ago
  
  72ec5c16
Mar 25, 2019
- Correct oilcrop energy content · a8978a0d
  Peter Alexander authored 6 years ago
  
  a8978a0d
Mar 22, 2019
- Fixes related to combining of oilcrops/pulses and profit-max · af85bf02
  Peter Alexander authored 6 years ago
  
  af85bf02
Mar 19, 2019
- updated prices with new barrier file. · a26b727e
  R0slyn authored 6 years ago
  
  a26b727e
Mar 17, 2019
- Remove sugar as a feed crop from least cost opt · 09597682
  Peter Alexander authored 6 years ago
  
  09597682
- Code and logfile tidy up. · b6adb259
  Peter Alexander authored 6 years ago
  
  b6adb259
- Trying to get the feed amount vaguely correct with profit max · 5a5ccb2d
  Peter Alexander authored 6 years ago
  
  5a5ccb2d
- Value changes related to represented crops · a702e6fd
  Peter Alexander authored 6 years ago
  
  a702e6fd
Mar 15, 2019
- Update complie command · b692bfaa
  Peter Alexander authored 6 years ago
  
  b692bfaa
- Merge · 8072b7f2
  Peter Alexander authored 6 years ago
  
  8072b7f2
- Added tag Sams-ES-paper for changeset 81ca48dea19c · b304cb48
  Peter Alexander authored 6 years ago
  
  b304cb48
- Changes to stop demand going mad due to rebasing · 58f37876
  Peter Alexander authored 6 years ago
  
  58f37876
- Calculate demand when income does not support subsistence level. · c604f250
  Peter Alexander authored 6 years ago
  
  c604f250
Mar 14, 2019
- Use single price markup factor per commodity between demand and production prices · f313e8d6
  Peter Alexander authored 6 years ago
  
  f313e8d6
Mar 13, 2019
- Changes to demand output file · 5e294afa
  alexanpe authored 6 years ago
  
  5e294afa
Mar 08, 2019
- Try to solve demand multiple times until finding a solution · 58fd672b
  Peter Alexander authored 6 years ago
  
  58fd672b
- Output detailed demand results for each country · 249644d5
  Peter Alexander authored 6 years ago
  
  249644d5
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