Merging changes from master (!3) · Merge requests · Land Use Lab / PLUM

Closed s1713176 requested to merge master into subnational_inequality 6 months ago

Aug 21, 2024
- compilePlum.sh fix. · 08956891
  Bart Arendarczyk authored 6 months ago
  
  08956891
- GAMS debug files not saved by default. · 5ddc689e
  Bart Arendarczyk authored 6 months ago
  
  5ddc689e
Aug 07, 2024
- Added forestry documentation. · bb9a7365
  Bart Arendarczyk authored 7 months ago
  
  bb9a7365
Aug 01, 2024
- reorder elements of irrigConstraintByFarmingType · ebb702d3
  jburns10 authored 7 months ago
  
  ebb702d3
Jul 22, 2024
- Fixed issue with forced protected areas. · 7853c98e
  Bart Arendarczyk authored 7 months ago
  
  7853c98e
Jul 15, 2024
- IRRIGATION_CONSTRAINT now two constraints that act on location and · 70a6b458
  jburns10 authored 7 months ago
  
  farming_type, location
  70a6b458
Jul 03, 2024
- Improved wood yield function fitting. · f3d39a51
  Bart Arendarczyk authored 8 months ago
  
  f3d39a51
- Improvements and fixes to carbon market. · 7bca0293
  Bart Arendarczyk authored 8 months ago
  
  7bca0293
Jun 21, 2024
- Fixed bug with agrivoltaics land cover when switched off. · 6757f59c
  Bart Arendarczyk authored 8 months ago
  
  6757f59c
Jun 18, 2024
- Refactoring and PV fixes. · 12de71fd
  Bart Arendarczyk authored 8 months ago
  
  12de71fd
Jun 17, 2024
- Updated cluster scripts. · ee1406ba
  Bart Arendarczyk authored 8 months ago
  
  ee1406ba
- Merge · a95d57bc
  Bart Arendarczyk authored 8 months ago
  
  a95d57bc
Jun 14, 2024
- Forestry data year not changed when CHANGE_YIELD_DATA_YEAR false. · aa45c61e
  Bart Arendarczyk authored 8 months ago
  
  aa45c61e
Jun 12, 2024
- Calibration. · fe4808ee
  Bart Arendarczyk authored 9 months ago
  
  fe4808ee
- Sigmoid function for dietary preferences change. · 0a702a0f
  Bart Arendarczyk authored 9 months ago
  
  0a702a0f
- Clustering confined to FPUs. · 331f3aa4
  Bart Arendarczyk authored 9 months ago
  
  331f3aa4
- Some improvements. · 7b3edfac
  Bart Arendarczyk authored 9 months ago
  
  7b3edfac
Jun 08, 2024
- Calibrations. · f8584e14
  Bart Arendarczyk authored 9 months ago
  
  f8584e14
- Changes to objective function. · 5141cf30
  Bart Arendarczyk authored 9 months ago
  
  5141cf30
Jun 07, 2024
- Calibration. · 1998818e
  Bart Arendarczyk authored 9 months ago
  
  1998818e
- Some changes to CalibrationManager to avoid over fitting. · ab95fb64
  Bart Arendarczyk authored 9 months ago
  
  ab95fb64
- Calibration. · 38c3db37
  Bart Arendarczyk authored 9 months ago
  
  38c3db37
- Various improvements. · 02680225
  Bart Arendarczyk authored 9 months ago
  
  02680225
Jun 06, 2024
- Fixed issue with monogastric demand. · e4d83db7
  Bart Arendarczyk authored 9 months ago
  
  e4d83db7
- Changes to calibration routine and other adjustments. · 514b8b90
  Bart Arendarczyk authored 9 months ago
  
  514b8b90
Jun 05, 2024
- Calibrations. · 8f4d6ac4
  Bart Arendarczyk authored 9 months ago
  
  8f4d6ac4
- Calibrations and fixes. · 381916fa
  Bart Arendarczyk authored 9 months ago
  
  381916fa
Jun 04, 2024
- Calibrations. · 0e37dbf7
  Bart Arendarczyk authored 9 months ago
  
  0e37dbf7
Jun 03, 2024
- Calibration fix. · 1190bb4a
  Bart Arendarczyk authored 9 months ago
  
  1190bb4a
- Wood price markups fix and some changes to land conversion costs. · 47497281
  Bart Arendarczyk authored 9 months ago
  
  47497281
- Clustering adjustment. · 0113aaee
  Bart Arendarczyk authored 9 months ago
  
  0113aaee
- Fixed issue with wood price markups. · b524bcfc
  Bart Arendarczyk authored 9 months ago
  
  b524bcfc
Jun 02, 2024
- Small land abandonment change. · dcec60de
  Bart Arendarczyk authored 9 months ago
  
  dcec60de
Jun 01, 2024
- Allow excess imports to avoid solution failure. · 084965d3
  Bart Arendarczyk authored 9 months ago
  
  084965d3
May 31, 2024
- Fixed issue with price markups. · 5f01b5b4
  Bart Arendarczyk authored 9 months ago
  
  5f01b5b4
- Calibrations. · 66cc558d
  Bart Arendarczyk authored 9 months ago
  
  66cc558d
May 30, 2024
- Calibrations. · bea5b8a2
  Bart Arendarczyk authored 9 months ago
  
  bea5b8a2
- Minor calibrations. · e62b712b
  Bart Arendarczyk authored 9 months ago
  
  e62b712b
May 29, 2024
- Updated ssp_sims.csv. · b11edf01
  Bart Arendarczyk authored 9 months ago
  
  b11edf01
- Removed BioenergyDemandManager. Now handled by EnergyDemandManager. · 9265576b
  Bart Arendarczyk authored 9 months ago
  
  9265576b
- Calibrations and fixes. · 00804427
  Bart Arendarczyk authored 9 months ago
  
  00804427
May 23, 2024
- Neugarten Biod&NCP maps (30,50%) projected to longlat 0.5, 0.5 res · b71caec8
  jburns10 authored 9 months ago
  
  b71caec8
May 16, 2024
- Solar and forestry fixes. · 5db3fe61
  Bart Arendarczyk authored 9 months ago
  
  5db3fe61
May 05, 2024
- Separate agrivoltaics demand. · ee2085f8
  Bart Arendarczyk authored 10 months ago
  
  ee2085f8
May 04, 2024
- Solar optimisation using NPV. · e5c381e1
  Bart Arendarczyk authored 10 months ago
  
  e5c381e1
May 02, 2024
- Minor changes. · 92a96046
  Bart Arendarczyk authored 10 months ago
  
  92a96046
- Some fixes and refactoring. · 480e7720
  Bart Arendarczyk authored 10 months ago
  
  480e7720
Apr 26, 2024
- Fixed trade constraint issue when supply zero. Refactored FPUManager. · 57662783
  Bart Arendarczyk authored 10 months ago
  
  57662783
- Land cover change downscaling respects maximum cropland and PV area. · b5ad7adf
  Bart Arendarczyk authored 10 months ago
  
  b5ad7adf
Apr 20, 2024
- Photovoltaics initial land cover and extent limits. · 6a2ee93d
  Bart Arendarczyk authored 10 months ago
  
  6a2ee93d
Apr 17, 2024
- Refactored food demand calculation. Improved consistency of demand fractions. · 1333a6c4
  Bart Arendarczyk authored 10 months ago
  
  1333a6c4
Apr 15, 2024
- Automated calibration. Changed objective to maximise net present value. · ce872d6e
  Bart Arendarczyk authored 10 months ago
  
  ce872d6e
Mar 13, 2024
- Photovoltaics and agrivoltaics. · eb96c77d
  Bart Arendarczyk authored 1 year ago
  
  eb96c77d

Merging changes from master

Merge request reports

Activity