Commits · 169332d8412754cab45ff0c0dc252b200120119f · Land Use Lab / PLUM

Mar 22, 2023
- Removed unnecessary import causing compiler issue. · 169332d8
  Bart Arendarczyk authored 2 years ago
  
  169332d8
Mar 21, 2023
- Revised implementation of forestry and carbon. · 40e2d1fd
  Bart Arendarczyk authored 2 years ago
  
  40e2d1fd
Mar 20, 2023
- Switch statement fix - issue with older compiler. · d463e461
  Bart Arendarczyk authored 2 years ago
  
  d463e461
Mar 14, 2023
- Fixed calculation issue with trade barriers. · 10ef6d14
  Bart Arendarczyk authored 2 years ago
  
  10ef6d14
Mar 04, 2023
- Forestry and carbon fixes & some parameter adjustments. · 22095f91
  Bart Arendarczyk authored 2 years ago
  
  22095f91
Feb 15, 2023
- FCR adjustments. · ede7dd90
  Bart Arendarczyk authored 2 years ago
  
  ede7dd90
- Disabled subsidies. Parameter calibrations and small fixes. · 5b78246e
  Bart Arendarczyk authored 2 years ago
  
  5b78246e
Feb 13, 2023
- Subsidy rates fix. · 5bdb7825
  Bart Arendarczyk authored 2 years ago
  
  5bdb7825
Feb 07, 2023
- Initial crop distributions. · 2ce494ed
  Bart Arendarczyk authored 2 years ago
  
  2ce494ed
Feb 01, 2023
- Calibrations and small fixes. · da86fccb
  Bart Arendarczyk authored 2 years ago
  
  da86fccb
Jan 31, 2023
- Demand solver bug fix. · e75a9c2e
  Bart Arendarczyk authored 2 years ago
  
  e75a9c2e
- Deserialization fix. Conversion cost changes. · 8b55965e
  Bart Arendarczyk authored 2 years ago
  
  8b55965e
Jan 25, 2023
- Land conversion cost adjustments. · 033ddae9
  Bart Arendarczyk authored 2 years ago
  
  033ddae9
- Hilda plus sparse/no vegetation reclassified to natural. · e897e18c
  Bart Arendarczyk authored 2 years ago
  
  e897e18c
- Fixed consumer price multithread race condition. · 26f4cd57
  Bart Arendarczyk authored 2 years ago
  
  26f4cd57
Jan 20, 2023

Clean up and small bug fixes. · 0f0644c2
Bart Arendarczyk authored 2 years ago

0f0644c2
Serialization bug fix. · 245fe24d
Bart Arendarczyk authored 2 years ago

245fe24d

# Conflicts:
#	GAMS/IntExtOpt.gms
#	data/bioenergy_gen2_iiasa.csv
#	data/craftyCountries.csv
#	data/ssp.csv
#	data/ssp_covid.csv
#	data/tradeBarriers.csv
#	debug_config.properties
#	scripts/compilePlum.sh
#	scripts/createScenarios.sh
#	scripts/createShockFiles.R
#	scripts/runPlum.sh
#	src/ac/ed/lurg/InternationalMarket.java
#	src/ac/ed/lurg/ModelConfig.java
#	src/ac/ed/lurg/ModelMain.java
#	src/ac/ed/lurg/Timestep.java
#	src/ac/ed/lurg/country/AbstractCountryAgent.java
#	src/ac/ed/lurg/country/CompositeCountryManager.java
#	src/ac/ed/lurg/country/CountryAgent.java
#	src/ac/ed/lurg/country/CountryAgentManager.java
#	src/ac/ed/lurg/country/CountryPrice.java
#	src/ac/ed/lurg/country/GlobalPrice.java
#	src/ac/ed/lurg/country/SingleCountry.java
#	src/ac/ed/lurg/country/SubsidyRateManager.java
#	src/ac/ed/lurg/country/TradeConstraint.java
#	src/ac/ed/lurg/country/TradeManager.java
#	src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java
#	src/ac/ed/lurg/country/crafty/CraftyProdManager.java
#	src/ac/ed/lurg/country/gams/GamsCountryInput.java
#	src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java
#	src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
#	src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java
#	src/ac/ed/lurg/demand/AbstractDemandManager.java
#	src/ac/ed/lurg/demand/AbstractSSPDemandManager.java
#	src/ac/ed/lurg/demand/BaseConsumpManager.java
#	src/ac/ed/lurg/demand/BioenergyDemandManager.java
#	src/ac/ed/lurg/demand/DemandManagerFromFile.java
#	src/ac/ed/lurg/demand/ElasticDemandManager.java
#	src/ac/ed/lurg/demand/PriceMarkUps.java
#	src/ac/ed/lurg/landuse/CropUsageData.java
#	src/ac/ed/lurg/landuse/LandUseItem.java

f0cd88d9

Alignment with main branch. Price adjustment update. · 8c9e04d5
Bart Arendarczyk authored 2 years ago

8c9e04d5

Jan 13, 2023
- Improved price adjustment and stock level control. · a4a56b9e
  Bart Arendarczyk authored 2 years ago
  
  a4a56b9e
Jan 09, 2023
- China/Taiwan FAO data correction. · ff3cdaf7
  Bart Arendarczyk authored 2 years ago
  
  ff3cdaf7
- ForestManager and other bug fixes. Minor data changes. · c604b501
  Bart Arendarczyk authored 2 years ago
  
  c604b501
Jan 04, 2023
- Changes to country data handling. Changes to wood production. · f205ebac
  Bart Arendarczyk authored 2 years ago
  
  Better handling of missing values in raster data.
  f205ebac
- FAO and country data update. · 11d0ff0e
  Bart Arendarczyk authored 2 years ago
  
  11d0ff0e
Nov 28, 2022
- Wood demand adjusted for potential yield. · 5df1c457
  Bart Arendarczyk authored 2 years ago
  
  5df1c457
- Changes to timber yield calculation and optimisation. · 39f3e716
  Bart Arendarczyk authored 2 years ago
  
  39f3e716
Nov 14, 2022
- Allow LPJ-GUESS columns names to be configured, rather than set in the code · 9246d502
  Peter Alexander authored 2 years ago
  
  9246d502
Nov 05, 2022
- Updated land cover age file. Other small changes. · 0c50c778
  Bart Arendarczyk authored 2 years ago
  
  0c50c778
Nov 02, 2022
- Changes to forestry data input. Added output files. · 9a37ce24
  Bart Arendarczyk authored 2 years ago
  
  9a37ce24
Oct 28, 2022
- Land cover file output bug fix. · 4e6294f9
  Bart Arendarczyk authored 2 years ago
  
  4e6294f9
Oct 26, 2022
- Fixed abandoned pastures. · 0f515f57
  Bart Arendarczyk authored 2 years ago
  
  0f515f57
Oct 21, 2022
- Changes to land cover conversion costs and fert/irrig constraints. · 0eb673db
  Bart Arendarczyk authored 2 years ago
  
  Some merges from master branch.
  0eb673db
Oct 10, 2022
- Subsidies fix and animal production cost merge from main. · 77b7757c
  Bart Arendarczyk authored 2 years ago
  
  77b7757c
Oct 06, 2022
- Improved allocation of energycrop demand. · 62be5f91
  Bart Arendarczyk authored 2 years ago
  
  62be5f91
Sep 07, 2022
- Irrigation constraints year no longer changed during calibration. · b7cf42e6
  Bart Arendarczyk authored 2 years ago
  
  b7cf42e6
Sep 02, 2022
- Option to disable imports update for CRAFTY agents. · b2a274e9
  Bart Arendarczyk authored 2 years ago
  
  b2a274e9
Aug 31, 2022
- Ruminants and monogastrics trade parameters tweak. · fbffa545
  Bart Arendarczyk authored 2 years ago
  
  fbffa545
Aug 29, 2022
- Modified ruminants/monogastrics trade and cost parameters. · 646ded85
  Bart Arendarczyk authored 2 years ago
  
  646ded85
Aug 24, 2022
- Additional trade barrier for ruminants. · 549cd450
  Bart Arendarczyk authored 2 years ago
  
  549cd450
Aug 23, 2022
- Added animal production cost to improve imports/exports. · 6a9cc12a
  Bart Arendarczyk authored 2 years ago
  
  6a9cc12a