diff --git a/GAMS/IntExtOpt.gms b/GAMS/IntExtOpt.gms
index b066c30996d16008ffd92399ffce8242328bb4ca..87cdb46b6d4eb88284092adb4a19abff4cede7d8 100644
--- a/GAMS/IntExtOpt.gms
+++ b/GAMS/IntExtOpt.gms
@@ -51,7 +51,7 @@
PARAMETER woodYieldRota(location) wood yield from forest rotation - tC per ha;
PARAMETER woodYieldLUC(land_cover_before, land_cover_after, location) wood yield from land cover change;
PARAMETER forestRotationPeriod(location) timber forest rotation period - years;
- PARAMETER conversionCost(land_cover_before, land_cover_after) cost of converting from one land cover to another - $1000 per ha;
+ PARAMETER conversionCost(land_cover_before, land_cover_after, location) cost of converting from one land cover to another - $1000 per ha;
SCALAR meatEfficency efficiency of converting feed and pasture into animal products;
SCALAR fertiliserUnitCost fert cost at max fert rate;
@@ -139,7 +139,7 @@ $gdxin
woodSupplyRota
woodSupplyLUC
- forestryCost
+ forestryCost(location)
carbonFlux(location) total carbon flux - Mt C
carbonCredits(location)
* A "artificial variable for debugging https://www.gams.com/blog/2017/07/misbehaving-model-infeasible/"
@@ -180,12 +180,12 @@ $gdxin
PASTURE_LAND_COVER_CALC(location) pasture area (land cover) equals pasture area (land use)
LAND_COVER_CHANGE_CALC(land_cover, location) "calc land cover change. landCoverChange(A, A, location) defined as unchanged land cover"
LAND_COVER_CHANGE_CONSTRAINT(land_cover, location) conservation of land area
- CONVERSION_COST(location) cost of land cover conversion
+ CONVERSION_COST_CALC(location) cost of land cover conversion
WOOD_SUPPLY_ROTA_CALC
WOOD_SUPPLY_LUC_CALC
WOOD_SUPPLY_CONSTRAINT
- FORESTRY_COST_CALC
+ FORESTRY_COST_CALC(location)
CARBON_FLUX_CALC(location) calc carbon flux
CARBON_CREDIT_CALC(location)
@@ -253,7 +253,7 @@ $gdxin
LAND_COVER_CHANGE_CONSTRAINT(land_cover, location) .. sum(land_cover_after, landCoverChange(land_cover, land_cover_after, location)) =E= previousLandCoverArea(land_cover, location);
- CONVERSION_COST(location) .. totalConversionCost(location) =E= sum((land_cover_before, land_cover_after), landCoverChange(land_cover_before, land_cover_after, location) * conversionCost(land_cover_before, land_cover_after));
+ CONVERSION_COST_CALC(location) .. totalConversionCost(location) =E= sum((land_cover_before, land_cover_after), landCoverChange(land_cover_before, land_cover_after, location) * conversionCost(land_cover_before, land_cover_after, location));
************* Forestry ***********************************
@@ -263,9 +263,8 @@ $gdxin
WOOD_SUPPLY_CONSTRAINT .. woodSupplyRota =G= demand('wood') + exportAmount('wood') - importAmount('wood');
- FORESTRY_COST_CALC .. forestryCost =E= sum(location, landCoverArea('timberForest', location) * forestManagementCost / forestRotationPeriod(location)) +
- sum(location, landCoverArea('carbonForest', location) * forestManagementCost / carbonHorizon) +
- woodSupplyLUC * vegClearingCostRate;
+ FORESTRY_COST_CALC(location) .. forestryCost(location) =E= landCoverArea('timberForest', location) * forestManagementCost / forestRotationPeriod(location) +
+ landCoverArea('carbonForest', location) * forestManagementCost / carbonHorizon;
*********** Carbon fluxes ***********************************
@@ -288,7 +287,7 @@ $gdxin
COST_CALC .. total_cost =E= sum((crop, location), cropArea(crop, location) * unitCost(crop, location) * (1-subsidyRate(crop))) * domesticPriceMarkup +
sum(location, totalConversionCost(location)) +
- forestryCost +
+ sum(location, forestryCost(location)) +
sum(import_types, importPrices(import_types) * importAmount(import_types)) -
sum(import_types, exportPrices(import_types) * exportAmount(import_types));
@@ -310,6 +309,9 @@ $gdxin
SOLVE LAND_USE USING NLP MINIMIZING total_cost;
+* Try solving again if not locally optimal
+ if ((LAND_USE.modelstat ne 2), SOLVE LAND_USE USING NLP MINIMIZING total_cost;)
+
display previousCropArea, irrigMaxRate, otherIntensity.L, fertI.L, irrigI.L, cropArea.L;
display netSupply.l, demand, ruminantFeed.l, monogastricFeed.l, exportAmount.l;
diff --git a/GAMS/IntExtOpt.~gm b/GAMS/IntExtOpt.~gm
deleted file mode 100644
index b59dfcf68239b6e5a84400d277207d8c31b21039..0000000000000000000000000000000000000000
--- a/GAMS/IntExtOpt.~gm
+++ /dev/null
@@ -1,382 +0,0 @@
-
- SET all_types / monogastrics, ruminants, cereals, oilcropspulses, wheat, maize, rice, oilcrops, pulses, starchyRoots, fruitveg, sugar, energycrops, pasture, setaside/;
-
- SET crop(all_types) / wheat, maize, rice, oilcrops, pulses, starchyRoots, fruitveg, sugar, energycrops, pasture, setaside /;
- SET crop_less_pasture(crop) / wheat, maize, rice, oilcrops, pulses, starchyRoots, fruitveg, sugar, energycrops, setaside/;
- SET cereal_crop(crop) / wheat, maize, rice /;
- SET oilpulse_crop(crop) / oilcrops, pulses /;
- SET feed_crop(crop) / wheat, maize, rice, oilcrops, pulses, starchyRoots, fruitveg, pasture/;
- SET feed_crop_less_pasture(feed_crop) / wheat, maize, rice, oilcrops, pulses, starchyRoots, fruitveg /;
- SET import_crop(all_types) / monogastrics, ruminants, wheat, maize, rice, oilcrops, pulses, starchyRoots, fruitveg, sugar, energycrops/;
-
- SET land_cover / cropland, pasture, timberForest, carbonForest, natural/;
- SET forested(land_cover) / timberForest, carbonForest, natural /;
- SET managed_forest(land_cover) / timberForest, carbonForest /;
- SET non_timber_forest(land_cover) / cropland, pasture, carbonForest, natural/;
- SET exc_natural(land_cover) / cropland, pasture, timberForest/;
- ALIAS (land_cover, land_cover_before);
- ALIAS (land_cover, land_cover_after);
-
- SET location;
- PARAMETER suitableLandArea(location) areas of land in Mha;
- PARAMETER previousCropArea(crop, location) areas for previous timestep in Mha;
- PARAMETER previousFertIntensity(crop, location);
- PARAMETER previousIrrigIntensity(crop, location);
- PARAMETER previousOtherIntensity(crop, location);
- PARAMETER previousRuminantFeed(crop);
- PARAMETER previousMonogastricFeed(crop);
- PARAMETER previousImportAmount(all_types);
- PARAMETER previousExportAmount(all_types);
- PARAMETER yieldNone(crop, location) yield in t per ha;
- PARAMETER yieldFertOnly(crop, location) yield in t per ha;
- PARAMETER yieldIrrigOnly(crop, location) yield in t per ha;
- PARAMETER yieldBoth(crop, location) yield in t per ha;
- PARAMETER yieldShock(crop, location) rate of yield shock;
- PARAMETER fertParam(crop, location) yield response to fertilizer parameter;
- PARAMETER irrigParam(crop, location) yield response to irrigation parameter;
- PARAMETER demand(all_types) in t;
- PARAMETER exportPrices(import_crop) prices for exports;
- PARAMETER importPrices(import_crop) prices for imports;
- PARAMETER maxNetImport(import_crop) maximum net import for each crop based on world market;
- PARAMETER minNetImport(import_crop) minimum net import for each crop based on world market;
- PARAMETER irrigCost(location) irrigation cost in cost per 1000 Mlitre or Mha for each litre per m2;
- PARAMETER irrigMaxRate(crop, location) max water application rate irrigation in litre per m2;
- PARAMETER irrigConstraint(location) max water available for irrigation in litre per m2;
- PARAMETER minDemandPerCereal(cereal_crop) min demand for each cereal crop as factor of all cereals;
- PARAMETER minDemandPerOilcrop(oilpulse_crop) min demand for oilcrop pulses as factor of total;
- PARAMETER seedAndWasteRate(all_types) rate of use for seed and waste combined;
- PARAMETER subsidyRate(crop) rates of subsidy compared to costs;
-
- SCALAR meatEfficency efficiency of converting feed and pasture into animal products;
- SCALAR fertiliserUnitCost fert cost at max fert rate;
- SCALAR otherIParam yield response to other intensity;
- SCALAR otherICost cost of other intensity;
- SCALAR unhandledCropRate rate of fruit veg and other crops not modelled;
- SCALAR setAsideRate rate of set aside and failed crop;
- SCALAR domesticPriceMarkup factor price increased from cost of production;
- SCALAR maxLandExpansionRate max rate of country land expansion;
-
- PARAMETER previousLandCoverArea(land_cover, location) land cover area in Mha;
-
- PARAMETER carbonFluxRate(land_cover_before, land_cover_after, location) carbon flux - MtC-eq per Mha;
- PARAMETER woodYieldLuc(land_cover_before, land_cover_after, location) wood yield - MtC-eq per Mha;
- PARAMETER woodYieldRota(land_cover_before, land_cover_after, location)
- SCALAR carbonPrice price of carbon - $1000 per tonne;
- SCALAR woodPrice price of wood and timber - $1000 per tC-eq;
- PARAMETER timberForestYield(location);
-
- PARAMETER conversionCost(land_cover, land_cover) cost of converting from one land cover to another;
- PARAMETER infrastructureCost(location);
-
- SCALAR netPresentValueFactor;
- SCALAR forestRotationPeriod;
- SCALAR timberMaxNetImport;
- SCALAR timberMinNetImport;
-
-*$gdxin "C:\Users\Bart\Documents\PhD\GAMS testing area\_gams_java_gdb1.gdx"
-$gdxin %gdxincname%
-$load location, suitableLandArea, demand
-$load previousCropArea, previousFertIntensity, previousIrrigIntensity, previousOtherIntensity, previousRuminantFeed, previousMonogastricFeed, previousImportAmount, previousExportAmount
-$load yieldNone, yieldFertOnly, yieldIrrigOnly, yieldBoth, yieldShock
-$load fertParam, irrigParam, otherIParam, exportPrices, importPrices, maxNetImport, minNetImport, unhandledCropRate, setAsideRate, maxLandExpansionRate, subsidyRate
-$load meatEfficency, otherICost, irrigCost, irrigMaxRate, irrigConstraint, fertiliserUnitCost, domesticPriceMarkup, minDemandPerCereal, minDemandPerOilcrop, seedAndWasteRate
-$load previousLandCoverArea, carbonFluxRate, woodYieldLuc, carbonPrice, woodPrice
-$load conversionCost, timberForestYield, woodYieldRota, infrastructureCost, netPresentValueFactor, forestRotationPeriod, timberMaxNetImport, timberMinNetImport
-$gdxin
-
- SCALAR delta "use to smooth power function see 7.5 www.gams.com/dd/docs/solversconopt.pdf" / 0.00000000001 /;
-
- demand(cereal_crop) = demand('cereals') * minDemandPerCereal(cereal_crop);
- demand(oilpulse_crop) = demand('oilcropspulses') * minDemandPerOilcrop(oilpulse_crop);
-
- previousCropArea(crop_less_pasture, location) = previousCropArea(crop_less_pasture, location) * (1.0 - unhandledCropRate);
-
- PARAMETER cropDM(crop) kg DM per kg of feed the conversion from feed to meat is done in the R animal product index. Pasture is in DM terms already
- / wheat 0.87
- maize 0.86
- rice 0.89
- oilcrops 0.96
- pulses 0.31
- starchyRoots 0.25
- fruitveg 0.1
- sugar 1
- pasture 1 / ;
-
- PARAMETER prodCost(crop) cost per ha before intensity values not including fertiliser or irrigation i.e. seed spray and other. In 1000 $ per ha
- / wheat 0.32
- maize 0.31
- rice 0.36
- oilcrops 0.2
- pulses 0.31
- starchyRoots 3.14
- fruitveg 4.0
- sugar 3.0
- energyCrops 0.34 / ;
-
- PARAMETER baseCost(crop);
- PARAMETER otherIntCost(crop);
- baseCost(crop) = prodCost(crop)*0.3;
- otherIntCost(crop) = baseCost(crop)*0.7 + otherICost;
- baseCost('pasture') = 0.04;
- otherIntCost('pasture') = 0.8 + otherICost;
-
- SCALAR naturalDecreaseMaxRate / 1 /;
- SCALAR naturalWoodHarvestMaxRate / 0.02 /;
- woodYieldLuc('carbonForest', 'naturalNew', location) = woodYieldLuc('carbonForest', 'pasture', location);
- woodYieldLuc('natural', 'naturalNew', location) = woodYieldLuc('natural', 'pasture', location);
- conversionCost(land_cover, 'naturalNew') = conversionCost(land_cover, 'natural');
- conversionCost('natural', 'naturalNew') = 0;
-
- woodYieldLuc('carbonForest', land_cover, location) = 0;
-
- carbonFluxRate('natural', 'naturalNew', location) = carbonFluxRate('natural', 'pasture', location);
- carbonFluxRate('carbonForest', 'naturalNew', location) = carbonFluxRate('natural', 'pasture', location);
- carbonFluxRate('pasture', 'naturalNew', location) = carbonFluxRate('pasture', 'natural', location);
- carbonFluxRate('cropland', 'naturalNew', location) = carbonFluxRate('cropland', 'natural', location);
-
- SCALAR forestRotationCost;
- forestRotationCost = 0.1;
- SCALAR woodHarvestParam / 1.897 /;
-
- VARIABLES
- cropArea(crop, location) total area for crops - Mha
- fertI(crop, location) fertilizer intensity for each crop - factor between 0 and 1
- irrigI(crop, location) irrigation intensity for each crop - factor between 0 and 1
- otherIntensity(crop, location)
- ruminantFeed(crop) amount of feed for ruminant animals - Mt
- monogastricFeed(crop) amount of feed for monogatric animals - Mt
- importAmount(all_types) imports of crops and meat - Mt
- exportAmount(all_types) exports of crops and meat - Mt
- yield(crop, location) yield per area for each crop - t per ha
- unitCost(crop, location) cost per area for each crop - cost
- net_supply(crop) supply after exports and feed
- totalFeedDM total feed dry matter
- landCoverArea(land_cover, location) land cover area in Mha
- landCoverChange(land_cover_before, land_cover_after, location) land cover change in Mha
- totalConversionCost(location) land cover conversion cost - $1000 per ha
- woodHarvestLuc(location) wood harvested due to land cover change - Mt C-eq
- woodHarvestRota(location) wood harvested from timber forest rotation - Mt C-eq
- totalWoodHarvest(location) total wood harvested from all activities - Mt C-eq
- woodExported total wood sold - Mt C-eq
- carbonFlux(location) total carbon flux - Mt C
- loggingCost(location) cost of logging forest
-* A "artificial variable for debugging https://www.gams.com/blog/2017/07/misbehaving-model-infeasible/"
- total_cost total cost of domestic supply including net imports;
-
- POSITIVE VARIABLE cropArea, fertI, irrigI, otherIntensity, ruminantFeed, monogastricFeed, importAmount, exportAmount,
- totalFeedDM, landCoverArea, landCoverChange, totalConversionCost, woodHarvestLuc, woodHarvestRota,
- totalWoodHarvest, woodExported
-
-* POSITIVE VARIABLE A;
-
- EQUATIONS
- UNIT_COST_EQ(crop, location) cost per area - $1000 per ha or $billion per Mha
- YIELD_EQ(crop, location) yield given chosen intensity - tonnes per hectare
- CROP_DEMAND_CONSTRAINT(crop) satisfy demand for individual crops
- TOTAL_CEREAL_DEMAND_CONSTRAINT satisfy demand for combined cereals
- TOTAL_OIL_PULSE_DEMAND_CONSTRAINT satisfy demand for combined oilcrops and pulses
- RUMINANT_DEMAND_CONSTRAINT satisfy demand for ruminant products
- MONOGASTRICS_DEMAND_CONSTRAINT satisfy demand for monogastric products
- TOTAL_NON_PASTURE_FEED_DM_CALC calc total feed dry matter not including pasture
- FEED_MIX_CONSTRAINT(feed_crop_less_pasture) limit amount of feed for each feed crop
- MAX_FERT_INTENSITY_CONSTRAINT(crop, location) constraint on maximum fertilizer intensity
- MAX_IRRIG_INTENSITY_CONSTRAINT(crop, location) constraint on maximum irrigation intensity
- MAX_OTHER_INTENSITY_CONSTRAINT(crop, location)
- SETASIDE_AREA_CALC(location)
- MAX_NET_IMPORT_CONSTRAINT(import_crop) constraint on max net imports
- MIN_NET_IMPORT_CONSTRAINT(import_crop) constraint on min net imports
- PASTURE_IMPORT_CONSTRAINT constraint to not import pasture
- PASTURE_EXPORT_CONSTRAINT constraint to not export pasture
- IRRIGATION_CONSTRAINT(location) constraint on water usage
- NET_SUPPLY_EQ(crop) calc net supply for crops
-
- CROPLAND_LAND_COVER_CALC(location) cropland area equals sum of all crop areas
- PASTURE_LAND_COVER_CALC(location) pasture area (land cover) equals pasture area (land use)
- LAND_COVER_CHANGE_CALC(land_cover, location) calc land cover change
- LAND_COVER_CHANGE_CONSTRAINT(land_cover, location) conservation of land area
- NATURAL_CONVERSION_CONSTRAINT(exc_natural, location) can't create primary natural area
- NATURAL_CONTRACTION_CONSTRAINT(location)
- CONVERSION_COST(location) cost of land cover conversion
-
- WOOD_HARVEST_LUC_CALC(location) calc wood harvested from LUC
- WOOD_HARVEST_ROTA_CALC(location) calc wood harvested from timber forest rotation
- TOTAL_WOOD_HARVEST_CALC(location) total wood harvested
- NATURAL_WOOD_HARVEST_CONSTRAINT(location)
- WOOD_MAX_EXPORT_CONSTRAINT constraint on maximum wood export
- WOOD_MIN_TRADE_CONSTRAINT constraint on minimum wood export
- WOOD_MAX_TRADE_CONSTRAINT
- WOOD_ROTA_EXPORT_CONSTRAINT must export all wood produced from timber forest rotation
-
-* WOOD_ROTA_TO_LUC_CONSTRAINT
- LOGGING_COST_CALC(location)
- CARBON_FLUX_CALC(location) calc carbon flux
- COST_EQ total cost objective function;
-
- UNIT_COST_EQ(crop, location) .. unitCost(crop, location) =E= ( baseCost(crop) +
- fertiliserUnitCost * fertI(crop, location) +
- irrigCost(location) * irrigMaxRate(crop, location) * irrigI(crop, location) +
- otherIntCost(crop) * otherIntensity(crop, location)
- );
-
- YIELD_EQ(crop, location) .. yield(crop, location) =E= (
- yieldNone(crop, location) +
- (yieldFertOnly(crop, location) - yieldNone(crop, location)) * (1 - exp(-fertParam(crop, location)*fertI(crop, location))) +
- (yieldIrrigOnly(crop, location) - yieldNone(crop, location)) * (1 - exp(-irrigParam(crop, location)*irrigI(crop, location))) +
- (yieldBoth(crop, location) + yieldNone(crop, location) - yieldFertOnly(crop, location) - yieldIrrigOnly(crop, location)) *
- (1 - exp(-fertParam(crop, location)*fertI(crop, location))) * (1 - exp(-irrigParam(crop, location)*irrigI(crop, location)))
- ) * (1 - exp(-otherIntensity(crop, location)*otherIParam));
-
- NET_SUPPLY_EQ(crop) .. net_supply(crop) =E= sum(location, cropArea(crop, location) * yield(crop, location)) * (1 - seedAndWasteRate(crop)) - ruminantFeed(crop) - monogastricFeed(crop) + importAmount(crop) - exportAmount(crop);
-
- CROP_DEMAND_CONSTRAINT(crop) .. net_supply(crop) =G= demand(crop);
-
- TOTAL_CEREAL_DEMAND_CONSTRAINT .. sum(cereal_crop, net_supply(cereal_crop)) =G= demand('cereals');
-
- TOTAL_OIL_PULSE_DEMAND_CONSTRAINT .. sum(oilpulse_crop, net_supply(oilpulse_crop)) =G= demand('oilcropspulses');
-
- RUMINANT_DEMAND_CONSTRAINT .. meatEfficency * sum(feed_crop, ruminantFeed(feed_crop) * cropDM(feed_crop)) * (1 - seedAndWasteRate('ruminants')) =G= (demand('ruminants') - importAmount('ruminants') + exportAmount('ruminants'));
-
- MONOGASTRICS_DEMAND_CONSTRAINT .. meatEfficency * sum(feed_crop_less_pasture, monogastricFeed(feed_crop_less_pasture) * cropDM(feed_crop_less_pasture)) * (1 - seedAndWasteRate('monogastrics')) =G= (demand('monogastrics') - importAmount('monogastrics') + exportAmount('monogastrics'));
-
- TOTAL_NON_PASTURE_FEED_DM_CALC .. totalFeedDM =E= sum(feed_crop_less_pasture, (ruminantFeed(feed_crop_less_pasture) + monogastricFeed(feed_crop_less_pasture)) * cropDM(feed_crop_less_pasture));
- FEED_MIX_CONSTRAINT(feed_crop_less_pasture) .. (ruminantFeed(feed_crop_less_pasture) + monogastricFeed(feed_crop_less_pasture)) * cropDM(feed_crop_less_pasture) =L= totalFeedDM * 0.7;
-
- MAX_FERT_INTENSITY_CONSTRAINT(crop, location) .. fertI(crop, location) =L= 1;
- MAX_IRRIG_INTENSITY_CONSTRAINT(crop, location) .. irrigI(crop, location) =L= 1;
- MAX_OTHER_INTENSITY_CONSTRAINT(crop, location) .. otherIntensity(crop, location) =L= 1;
-
- SETASIDE_AREA_CALC(location) .. cropArea('setaside', location) =E= sum(crop_less_pasture, cropArea(crop_less_pasture, location)) * setAsideRate;
-
- MAX_NET_IMPORT_CONSTRAINT(import_crop) .. importAmount(import_crop) - exportAmount(import_crop) =L= maxNetImport(import_crop);
- MIN_NET_IMPORT_CONSTRAINT(import_crop) .. importAmount(import_crop) - exportAmount(import_crop) =G= minNetImport(import_crop);
- PASTURE_IMPORT_CONSTRAINT .. importAmount('pasture') =E= 0;
- PASTURE_EXPORT_CONSTRAINT .. exportAmount('pasture') =E= 0;
-
- IRRIGATION_CONSTRAINT(location) .. irrigConstraint(location) * suitableLandArea(location) * (1.0 - unhandledCropRate) =G= sum(crop, irrigMaxRate(crop, location) * irrigI(crop, location) * cropArea(crop, location));
-
- CROPLAND_LAND_COVER_CALC(location) .. landCoverArea('cropland', location) =E= sum(crop_less_pasture, cropArea(crop_less_pasture, location)) / (1.0 - unhandledCropRate);
-
- PASTURE_LAND_COVER_CALC(location) .. landCoverArea('pasture', location) =E= cropArea('pasture', location);
-
-
- LAND_COVER_CHANGE_CALC(land_cover, location) .. landCoverArea(land_cover, location) =E= previousLandCoverArea(land_cover, location) +
- sum(land_cover_before, landCoverChange(land_cover_before, land_cover, location)) -
- sum(land_cover_after, landCoverChange(land_cover, land_cover_after, location));
-
-* landCoverChange(A, A, location) defined as unchanged land cover
- LAND_COVER_CHANGE_CONSTRAINT(land_cover, location) .. sum(land_cover_after, landCoverChange(land_cover, land_cover_after, location)) =E= previousLandCoverArea(land_cover, location);
-
- NATURAL_CONVERSION_CONSTRAINT(exc_natural, location) .. landCoverChange(exc_natural, 'natural', location) =E= 0;
-
- NATURAL_CONTRACTION_CONSTRAINT(location) .. landCoverArea('natural', location) =G= previousLandCoverArea('natural', location) * (1 - naturalDecreaseMaxRate);
-
- CONVERSION_COST(location) .. totalConversionCost(location) =E= sum((land_cover_before, land_cover_after), landCoverChange(land_cover_before, land_cover_after, location) * conversionCost(land_cover_before, land_cover_after)) +
- sum(exc_natural, landCoverChange('natural', exc_natural, location) * infrastructureCost(location));
-
-* Wood from land cover change
-* WOOD_HARVEST_LUC_CALC(location) .. woodHarvestLuc(location) =E= sum((land_cover_before, land_cover_after), landCoverChange(land_cover_before, land_cover_after, location) * woodYieldLuc(land_cover_before, land_cover_after, location));
-
- WOOD_HARVEST_LUC_CALC(location) .. woodHarvestLuc(location) =E= woodYieldLuc('natural', 'naturalNew', location) * landCoverChange('natural', 'naturalNew', location);
-
-* Wood from timberForest rotation = harvest from new forest + existing forest
- WOOD_HARVEST_ROTA_CALC(location) .. woodHarvestRota(location) =E= [ sum(non_timber_forest, landCoverChange(non_timber_forest, 'timberForest', location) * woodYieldRota(non_timber_forest, 'timberForest', location)) +
- landCoverChange('timberForest', 'timberForest', location) * timberForestYield(location)
- ] / forestRotationPeriod;
-
- TOTAL_WOOD_HARVEST_CALC(location) .. totalWoodHarvest(location) =E= woodHarvestLuc(location) + woodHarvestRota(location);
-
- NATURAL_WOOD_HARVEST_CONSTRAINT(location) .. woodHarvestLuc(location) =L= previousLandCoverArea('natural', location) * woodYieldLuc('natural', 'naturalNew', location) * naturalWoodHarvestMaxRate;
-
- WOOD_MAX_EXPORT_CONSTRAINT .. woodExported =L= sum(location, totalWoodHarvest(location));
-
- WOOD_MIN_TRADE_CONSTRAINT .. 0 - woodExported =L= timberMaxNetImport;
-
- WOOD_MAX_TRADE_CONSTRAINT .. 0 - woodExported =G= timberMinNetImport;
-
-* Must sell timber producted in timberForest
- WOOD_ROTA_EXPORT_CONSTRAINT .. woodExported =G= sum(location, woodHarvestRota(location));
-
-* WOOD_ROTA_TO_LUC_CONSTRAINT .. sum(location, woodHarvestLuc(location)) =L= sum(location, woodHarvestRota(location)) * 2;
-
- LOGGING_COST_CALC(location) .. loggingCost(location) =E= 0.04 + 0.06 * landCoverChange('natural', 'naturalNew', location) / [previousLandCoverArea('natural', location) + delta] *
- landCoverChange('natural', 'naturalNew', location) * woodYieldLuc('natural', 'naturalNew', location);
-
- CARBON_FLUX_CALC(location) .. carbonFlux(location) =E= sum((land_cover_before, land_cover_after), landCoverChange(land_cover_before, land_cover_after, location) * carbonFluxRate(land_cover_before, land_cover_after, location));
-
-
- COST_EQ .. total_cost =E=
- (
- ( SUM((crop, location), cropArea(crop, location) * unitCost(crop, location) * (1-subsidyRate(crop))) ) * domesticPriceMarkup +
-
- SUM(import_crop, importAmount(import_crop) * importPrices(import_crop) - exportAmount(import_crop) * exportPrices(import_crop)) +
-
- SUM(location, totalConversionCost(location)) +
-
- [SUM((managed_forest, location), landCoverArea(managed_forest, location) * forestRotationCost) - woodExported * woodPrice] + SUM(location, loggingCost(location)) +
-
- SUM(location, carbonFlux(location)) * carbonPrice
- );
-
- MODEL LAND_USE /ALL/ ;
- fertI.L(crop, location) = previousFertIntensity(crop, location);
- irrigI.L(crop, location) = previousIrrigIntensity(crop, location);
- otherIntensity.L(crop, location) = previousOtherIntensity(crop, location);
- cropArea.L(crop, location) = previousCropArea(crop, location);
- landCoverArea.L(land_cover, location) = previousLandCoverArea(land_cover, location);
- landCoverChange.L(land_cover, land_cover, location) = previousLandCoverArea(land_cover, location);
- ruminantFeed.L(feed_crop) = previousRuminantFeed(feed_crop);
- monogastricFeed.L(feed_crop) = previousMonogastricFeed(feed_crop);
- importAmount.L(all_types) = previousImportAmount(all_types);
- exportAmount.L(all_types) = previousExportAmount(all_types);
- woodHarvestRota.L(location) = previousLandCoverArea('timberForest', location) * timberForestYield(location) / forestRotationPeriod;
- totalConversionCost.L(location) = previousLandCoverArea('timberForest', location) * conversionCost('timberForest', 'timberForest');
-
- LAND_USE.OptFile = 1;
-
-* display landCoverChange.L
-
- SOLVE LAND_USE USING NLP MINIMIZING total_cost;
-
- display previousCropArea, irrigMaxRate, otherIntensity.L, fertI.L, irrigI.L, cropArea.L;
- display net_supply.l, demand, ruminantFeed.l, monogastricFeed.l, importAmount.l, exportAmount.l;
-
-* Calculate summary information used in Java process
- parameter totalProd(all_types);
- parameter totalProdCost(all_types);
- parameter totalArea(crop);
- parameter totalCropland(location);
- parameter netImportAmount(all_types);
- parameter netImportCost(all_types);
- parameter feedCostRate(feed_crop);
- parameter productionShock(all_types);
- scalar netCarbonFlux;
-
-* Production quantities based on smaller area (before unhandledCropArea adjustment applied)
- totalProd(crop) = sum(location, cropArea.l(crop, location) * yield.l(crop, location));
- productionShock(crop) = sum(location, cropArea.l(crop, location) * yield.l(crop, location) * yieldShock(crop, location));
- totalProd('ruminants') = meatEfficency*(sum(feed_crop, ruminantFeed.l(feed_crop) * cropDM(feed_crop)));
- totalProd('monogastrics') = meatEfficency*(sum(feed_crop, monogastricFeed.l(feed_crop) * cropDM(feed_crop)));
-
-* Cost based on adjusted area
- cropArea.l(crop_less_pasture, location) = cropArea.l(crop_less_pasture, location) / (1.0 - unhandledCropRate);
- totalProdCost(crop) = sum(location, unitCost.l(crop, location) * cropArea.l(crop, location));
- totalCropland(location) = sum(crop_less_pasture, cropArea.l(crop_less_pasture, location));
- totalArea(crop) = sum(location, cropArea.l(crop, location));
-
- feedCostRate(feed_crop)$[totalProd(feed_crop) <> 0] = totalProdCost(feed_crop) / totalProd(feed_crop);
- totalProdCost('ruminants') = sum(feed_crop, ruminantFeed.l(feed_crop) * feedCostRate(feed_crop));
- totalProdCost('monogastrics') = sum(feed_crop, monogastricFeed.l(feed_crop) * feedCostRate(feed_crop));
-
- netImportCost(import_crop) = importAmount.l(import_crop) * importPrices(import_crop) - exportAmount.l(import_crop) * exportPrices(import_crop);
- netImportAmount(import_crop) = importAmount.l(import_crop) - exportAmount.l(import_crop);
-
- netCarbonFlux = SUM(location, carbonFlux.L(location));
-
- Scalar totalCostsLessLU;
-
- totalCostsLessLU = sum(crop,totalProdCost(crop))+ sum(import_crop,netImportCost(import_crop));
-
-
- Scalar ms 'model status', ss 'solve status';
- ms=LAND_USE.modelstat;
- ss=LAND_USE.solvestat;
diff --git a/src/ac/ed/lurg/InternationalMarket.java b/src/ac/ed/lurg/InternationalMarket.java
index 62a23ca5afdcf4bc2a77ff87714054bef5570ac6..790fec5c2967dccb33fa36e97003b9e7780dd7e5 100644
--- a/src/ac/ed/lurg/InternationalMarket.java
+++ b/src/ac/ed/lurg/InternationalMarket.java
@@ -132,11 +132,11 @@ public class InternationalMarket {
GlobalPrice prevPrice = worldPrices.get(crop);
double imports = totalImportCommodities.containsKey(crop) ? totalImportCommodities.get(crop) : 0.0;
double exportsBeforeTransportLosses = totalExportCommodities.containsKey(crop) ? totalExportCommodities.get(crop) : 0.0;
- LogWriter.println(timestep.getYear() + " Updating " + crop.getGamsName() + " prices");
+ LogWriter.println(timestep.getYear() + " Updating " + crop.getGamsName() + " prices", 2);
GlobalPrice adjustedPrice = prevPrice.createWithUpdatedMarketPrices(imports, exportsBeforeTransportLosses, timestep, totalProduction.get(crop), true);
- LogWriter.println( String.format("Price for %s updated from %s to %s \n", crop.getGamsName(), prevPrice, adjustedPrice));
+ LogWriter.println( String.format("Price for %s updated from %s to %s \n", crop.getGamsName(), prevPrice, adjustedPrice), 2);
if (adjustedPrice.getStockLevel() < 0)
- LogWriter.println("Global stocks are below zero" + crop.getGamsName() + ", " + timestep.getYear());
+ LogWriter.println("Global stocks are below zero" + crop.getGamsName() + ", " + timestep.getYear(), 2);
worldPrices.put(crop, adjustedPrice);
}
@@ -158,11 +158,11 @@ public class InternationalMarket {
totalCarbonSequestered = Math.max(totalCarbonSequestered, 0.0000001); // avoid division by 0
GlobalPrice prevCPrice = carbonPrice;
- LogWriter.println(timestep.getYear() + " Updating carbon price");
+ LogWriter.println(timestep.getYear() + " Updating carbon price", 2);
GlobalPrice adjustedCPrice = prevCPrice.createWithUpdatedMarketPrices(totalCarbonImport, totalCarbonExport, timestep, totalCarbonSequestered, false);
- LogWriter.println( String.format("Price for carbon updated from %s to %s \n", prevCPrice, adjustedCPrice));
+ LogWriter.println( String.format("Price for carbon updated from %s to %s \n", prevCPrice, adjustedCPrice), 2);
if (adjustedCPrice.getStockLevel() < 0)
- LogWriter.println("Global stocks are below zero carbon, " + timestep.getYear());
+ LogWriter.println("Global stocks are below zero carbon, " + timestep.getYear(), 2);
carbonPrice = adjustedCPrice;
// Update timber price
@@ -185,11 +185,11 @@ public class InternationalMarket {
}
totalWoodProduction = Math.max(totalWoodProduction, 0.0000001); // avoid division by 0
GlobalPrice prevTPrice = woodPrice;
- LogWriter.println(timestep.getYear() + " Updating wood price");
+ LogWriter.println(timestep.getYear() + " Updating wood price", 2);
GlobalPrice adjustedTPrice = prevTPrice.createWithUpdatedMarketPrices(totalWoodImport, totalWoodExport, timestep, totalWoodProduction, true);
- LogWriter.println( String.format("Price for wood updated from %s to %s \n", prevTPrice, adjustedTPrice));
+ LogWriter.println( String.format("Price for wood updated from %s to %s \n", prevTPrice, adjustedTPrice), 2);
if (adjustedTPrice.getStockLevel() < 0)
- LogWriter.println("Global stocks are below zero wood, " + timestep.getYear());
+ LogWriter.println("Global stocks are below zero wood, " + timestep.getYear(), 2);
woodPrice = adjustedTPrice;
// Cap prices
@@ -238,13 +238,13 @@ public class InternationalMarket {
try {
String fileStr = ModelConfig.IS_CALIBRATION_RUN ? ModelConfig.SERIALIZED_INTERNATIONAL_MARKET_FILE : ModelConfig.CHECKPOINT_INTERNATIONAL_MARKET_FILE;
- LogWriter.println("Starting serializing GlobalPrice to " + fileStr);
+ LogWriter.println("Starting serializing GlobalPrice to " + fileStr, 2);
FileOutputStream fileOut = new FileOutputStream(fileStr);
ObjectOutputStream out = new ObjectOutputStream(fileOut);
out.writeObject(pricesToSerialize);
out.close();
fileOut.close();
- LogWriter.println("Serialized international market data is saved");
+ LogWriter.println("Serialized international market data is saved", 2);
} catch (IOException i) {
i.printStackTrace();
}
@@ -259,7 +259,7 @@ public class InternationalMarket {
initGlobalPrices = (List<Object>) in.readObject();
in.close();
fileIn.close();
- LogWriter.println("Deserialized " + ModelConfig.SERIALIZED_INTERNATIONAL_MARKET_FILE);
+ LogWriter.println("Deserialized " + ModelConfig.SERIALIZED_INTERNATIONAL_MARKET_FILE, 2);
return initGlobalPrices;
} catch (IOException i) {
LogWriter.printlnError("Problem deserializing " + ModelConfig.SERIALIZED_INTERNATIONAL_MARKET_FILE);
@@ -279,7 +279,7 @@ public class InternationalMarket {
GlobalPrice preShock = worldPrices.get(crop);
double factor = 1.0 + entry.getValue();
GlobalPrice adjustedPrice = preShock.createPriceAdjustedByFactor(factor);
- LogWriter.println(String.format("applyPriceShocks: %s adjusting price by %.4f to export price %.2f", crop.getFaoName(), factor, adjustedPrice.getExportPrice()));
+ LogWriter.println(String.format("applyPriceShocks: %s adjusting price by %.4f to export price %.2f", crop.getFaoName(), factor, adjustedPrice.getExportPrice()), 2);
worldPrices.put(crop, adjustedPrice);
}
}
@@ -288,11 +288,11 @@ public class InternationalMarket {
for (Map.Entry<CropType, GlobalPrice> entry : worldPrices.entrySet()) {
double stocklevel = entry.getValue().getStockLevel();
if (stocklevel < 0) {
- LogWriter.println(String.format("negativeStockLevelsExist: %s has negative stock %.3f", entry.getKey().getFaoName(), stocklevel));
+ LogWriter.println(String.format("negativeStockLevelsExist: %s has negative stock %.3f", entry.getKey().getFaoName(), stocklevel), 2);
return true;
}
}
- LogWriter.println(String.format("No negative stocks found"));
+ LogWriter.println(String.format("No negative stocks found"), 2);
return false;
}
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index c333559734e1d79ced03bad6f7826ec9b7f54229..537f4feb18cb995aa84ca54dfc918a8c7d8ff7ce 100755
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -261,15 +261,38 @@ public class ModelConfig {
public static final String EXPORT_RESTRICTIONS_FILE = getProperty("EXPORT_RESTRICTIONS_FILE", OUTPUT_DIR + File.separator+ "exportrestictions.csv");
// Wood/carbon data
- public static final String WOOD_AND_CARBON_DIR = getProperty("WOOD_AND_CARBON_DIR");
- public static final String WOOD_YIELD_FORS_TO_PAST_FILENAME = "landsymm_plutW_from_forC_to_past.dat";
- public static final String WOOD_YIELD_FORS_TO_CROP_FILENAME = "landsymm_plutW_from_forC_to_crop.dat";
- public static final String WOOD_YIELD_FORS_TO_NTRL_FILENAME = "landsymm_plutW_from_forC_to_ntrl.dat";
- public static final String WOOD_YIELD_FORS_TO_FORS_FILENAME = "landsymm_plutW_from_forC_to_forC.dat";
- public static final String WOOD_YIELD_NTRL_TO_PAST_FILENAME = "landsymm_plutW_from_ntrl_to_past.dat";
- public static final String WOOD_YIELD_NTRL_TO_CROP_FILENAME = "landsymm_plutW_from_ntrl_to_crop.dat";
- public static final String WOOD_YIELD_NTRL_TO_FORS_FILENAME = "landsymm_plutW_from_ntrl_to_forC.dat";
- public static final String WOOD_YIELD_ROTA_FILENAME = "landsymm_pcutW_sts_forC.dat";
+ public static final String FORESTRY_DIR = getProperty("FORESTRY_DIR");
+
+ public static final String WOOD_YIELD_FORS_TO_PAST_FILENAME = getProperty("WOOD_YIELD_FORS_TO_PAST_FILENAME", "landsymm_plutW_from_forC_to_past.dat");
+ public static final String WOOD_YIELD_FORS_TO_CROP_FILENAME = getProperty("WOOD_YIELD_FORS_TO_CROP_FILENAME", "landsymm_plutW_from_forC_to_crop.dat");
+ public static final String WOOD_YIELD_FORS_TO_NTRL_FILENAME = getProperty("WOOD_YIELD_FORS_TO_NTRL_FILENAME", "landsymm_plutW_from_forC_to_ntrl.dat");
+ public static final String WOOD_YIELD_FORS_TO_FORS_FILENAME = getProperty("WOOD_YIELD_FORS_TO_FORS_FILENAME", "landsymm_plutW_from_forC_to_forC.dat");
+ public static final String WOOD_YIELD_NTRL_TO_PAST_FILENAME = getProperty("WOOD_YIELD_NTRL_TO_PAST_FILENAME", "landsymm_plutW_from_ntrl_to_past.dat");
+ public static final String WOOD_YIELD_NTRL_TO_CROP_FILENAME = getProperty("WOOD_YIELD_NTRL_TO_CROP_FILENAME", "landsymm_plutW_from_ntrl_to_crop.dat");
+ public static final String WOOD_YIELD_NTRL_TO_FORS_FILENAME = getProperty("WOOD_YIELD_NTRL_TO_FORS_FILENAME", "landsymm_plutW_from_ntrl_to_forC.dat");
+ public static final String WOOD_YIELD_ROTA_FILENAME = getProperty("WOOD_YIELD_ROTA_FILENAME", "landsymm_pcutW_sts_forC.dat");
+
+ public static final String C_FLUX_NTRL_TO_CROP_FILENAME = getProperty("C_FLUX_NTRL_TO_CROP_FILENAME", "landsymm_plutC_from_ntrl_to_crop.dat");
+ public static final String C_FLUX_NTRL_TO_PAST_FILENAME = getProperty("C_FLUX_NTRL_TO_PAST_FILENAME", "landsymm_plutC_from_ntrl_to_past.dat");
+ public static final String C_FLUX_NTRL_TO_FORS_FILENAME = getProperty("C_FLUX_NTRL_TO_FORS_FILENAME", "landsymm_plutC_from_ntrl_to_forC.dat");
+ public static final String C_FLUX_NTRL_TO_NTRL_FILENAME = getProperty("C_FLUX_NTRL_TO_NTRL_FILENAME", "landsymm_plutC_from_ntrl_to_ntrl.dat");
+ public static final String C_FLUX_CROP_TO_CROP_FILENAME = getProperty("C_FLUX_CROP_TO_CROP_FILENAME", "landsymm_plutC_from_crop_to_crop.dat");
+ public static final String C_FLUX_CROP_TO_PAST_FILENAME = getProperty("C_FLUX_CROP_TO_PAST_FILENAME", "landsymm_plutC_from_crop_to_past.dat");
+ public static final String C_FLUX_CROP_TO_FORS_FILENAME = getProperty("C_FLUX_CROP_TO_FORS_FILENAME", "landsymm_plutC_from_crop_to_forC.dat");
+ public static final String C_FLUX_CROP_TO_NTRL_FILENAME = getProperty("C_FLUX_CROP_TO_NTRL_FILENAME", "landsymm_plutC_from_crop_to_ntrl.dat");
+ public static final String C_FLUX_PAST_TO_CROP_FILENAME = getProperty("C_FLUX_PAST_TO_CROP_FILENAME", "landsymm_plutC_from_past_to_crop.dat");
+ public static final String C_FLUX_PAST_TO_PAST_FILENAME = getProperty("C_FLUX_PAST_TO_PAST_FILENAME", "landsymm_plutC_from_past_to_past.dat");
+ public static final String C_FLUX_PAST_TO_FORS_FILENAME = getProperty("C_FLUX_PAST_TO_FORS_FILENAME", "landsymm_plutC_from_past_to_forC.dat");
+ public static final String C_FLUX_PAST_TO_NTRL_FILENAME = getProperty("C_FLUX_PAST_TO_NTRL_FILENAME", "landsymm_plutC_from_past_to_ntrl.dat");
+ public static final String C_FLUX_FORS_TO_CROP_FILENAME = getProperty("C_FLUX_FORS_TO_CROP_FILENAME", "landsymm_plutC_from_forC_to_crop.dat");
+ public static final String C_FLUX_FORS_TO_PAST_FILENAME = getProperty("C_FLUX_FORS_TO_PAST_FILENAME", "landsymm_plutC_from_forC_to_past.dat");
+ public static final String C_FLUX_FORS_TO_FORS_FILENAME = getProperty("C_FLUX_FORS_TO_FORS_FILENAME", "landsymm_plutC_from_forC_to_forC.dat");
+ public static final String C_FLUX_FORS_TO_NTRL_FILENAME = getProperty("C_FLUX_FORS_TO_NTRL_FILENAME", "landsymm_plutC_from_forC_to_ntrl.dat");
+ public static final String C_FLUX_NTRL_FILENAME = getProperty("C_FLUX_NTRL_FILENAME", "cflux_landsymm_sts_ntrl.dat");
+ public static final String C_FLUX_CROP_FILENAME = getProperty("C_FLUX_CROP_FILENAME", "cflux_landsymm_sts_crop.dat");
+ public static final String C_FLUX_PAST_FILENAME = getProperty("C_FLUX_PAST_FILENAME", "cflux_landsymm_sts_past.dat");
+ public static final String C_FLUX_FORS_FILENAME = getProperty("C_FLUX_FORS_FILENAME", "cflux_landsymm_sts_forC.dat");
+
public static final String LAND_COVER_AGE_DIST_FILENAME = SPATIAL_DATA_DIR + File.separator + "land_cover_age_dist.txt";
public static final int LAND_COVER_INIT_AGE_GROUP_SIZE = getIntProperty("LAND_COVER_INIT_AGE_GROUP_SIZE", 10); // years
@@ -296,7 +319,7 @@ public class ModelConfig {
public static final boolean IS_CALIBRATION_RUN = getBooleanProperty("IS_CALIBRATION_RUN", false);
public static final String CALIB_DIR = IS_CALIBRATION_RUN ? OUTPUT_DIR : getProperty("CALIB_DIR", OUTPUT_DIR);
public static final int END_FIRST_STAGE_CALIBRATION = getIntProperty("END_FIRST_STAGE_CALIBRATION", 5);
- public static final int END_SECOND_STAGE_CALIBRATION = getIntProperty("END_SECOND_STAGE_CALIBRATION", 15);
+ public static final int END_SECOND_STAGE_CALIBRATION = getIntProperty("END_SECOND_STAGE_CALIBRATION", -1);
public static final String SERIALIZED_LAND_USE_FILENAME = "landUseRaster.ser";
public static final String SERIALIZED_CROP_USAGE_FILENAME = "countryCropUsages.ser";
public static final String SERIALIZED_INTERNATIONAL_MARKET_FILENAME = "internationalMarket.ser";
@@ -378,7 +401,9 @@ public class ModelConfig {
public static final double PASTURE_DECREASE_COST = getDoubleProperty("PASTURE_DECREASE_COST", LAND_CHANGE_COST);
public static final double CROP_DECREASE_COST = getDoubleProperty("CROP_DECREASE_COST", 1.65 * LAND_CHANGE_COST);
public static final double PASTURE_INCREASE_COST = getDoubleProperty("PASTURE_INCREASE_COST", 0.35 * LAND_CHANGE_COST * CROP_TO_PASTURE_COST_FACTOR * AGRI_LAND_EXPANSION_COST_FACTOR);
- public static final double MANAGED_FOREST_INCREASE_COST = getDoubleProperty("MANAGED_FOREST_INCREASE_COST", 2 * LAND_CHANGE_COST); // $1000/ha
+ public static final double MANAGED_FOREST_INCREASE_COST = getDoubleProperty("MANAGED_FOREST_INCREASE_COST", LAND_CHANGE_COST); // $1000/ha
+ public static final double MANAGED_FOREST_DECREASE_COST = getDoubleProperty("MANAGED_FOREST_DECREASE_COST", LAND_CHANGE_COST); // $1000/ha
+
public static final double TECHNOLOGY_CHANGE_ANNUAL_RATE = getDoubleProperty("TECHNOLOGY_CHANGE_ANNUAL_RATE", 0.002);
public static final int TECHNOLOGY_CHANGE_START_STEP = getIntProperty("TECHNOLOGY_CHANGE_START_STEP", 0);
@@ -438,6 +463,7 @@ public class ModelConfig {
public static final double MAX_CHINA_LAND_EXPANSION_RATE = getDoubleProperty("MAX_CHINA_LAND_EXPANSION_RATE", 0.011*0.4); // 1.1% max forest change 40% of natural land is forest
public static final boolean DEBUG_JUST_DEMAND_OUTPUT = getBooleanProperty("DEBUG_JUST_DEMAND_OUTPUT", false);
+ public static final int DEBUG_LOG_LEVEL = getIntProperty("DEBUG_LEVEL", 2); // Print only events below this level. Errors & Warnings always printed (0); Solve status (1); Global events (2); Country events (3)
public static final boolean DEBUG_LIMIT_COUNTRIES = getBooleanProperty("DEBUG_LIMIT_COUNTRIES", false);
public static final String DEBUG_COUNTRY_NAME = getProperty("DEBUG_COUNTRY_NAME", "China");
public static final String GAMS_COUNTRY_TO_SAVE = getProperty("GAMS_COUNTRY_TO_SAVE", "China");;
@@ -484,14 +510,12 @@ public class ModelConfig {
public static final double IND_ROUNDWOOD_DEMAND_ELASTICITY = getDoubleProperty("IND_ROUNDWOOD_DEMAND_ELASTICITY", 0.3123881);
public static final double FUELWOOD_DEMAND_ELASTICITY = getDoubleProperty("FUELDWOOD_DEMAND_ELASTICITY", -0.3598551);
public static final double WOOD_BIOMASS_CONVERSION_FACTOR = getDoubleProperty("WOOD_BIOMASS_CONVERSION_FACTOR", 3e-7); // m3 to MtC-eq p.16 [https://doi.org/10.5194/gmd-13-5425-2020]
- public static final double DISCOUNT_RATE = getDoubleProperty("DISCOUNT_RATE", 0.01); // for calculating rotation period
- public static final double VEGETATION_CLEARING_COST = getDoubleProperty("VEGETATION_CLEARING_COST", 0.0001); //$1000/tC
+ public static final double DISCOUNT_RATE = getDoubleProperty("DISCOUNT_RATE", 0.05); // for calculating rotation period
+ public static final double VEGETATION_CLEARING_COST = getDoubleProperty("VEGETATION_CLEARING_COST", 0.001); //$1000/tC
public static final double FOREST_MANAGEMENT_COST = IS_FORESTRY_ON ? getDoubleProperty("FOREST_ESTABLISHMENT_COST", 5.0) : 0.0; // establishment, management etc. $1000/ha
public static final double WOOD_TRADE_BARRIER = getDoubleProperty("WOOD_TRADE_BARRIER", 0.2); //$1000/tC
- public static final double INIT_WOOD_PRICE = IS_FORESTRY_ON ? getDoubleProperty("INIT_WOOD_PRICE", 0.2) : 0.0; // $1000/tC-eq
+ public static final double INIT_WOOD_PRICE = IS_FORESTRY_ON ? getDoubleProperty("INIT_WOOD_PRICE", 0.38) : 0.0; // $1000/tC-eq
public static final boolean ENABLE_VEGETATION_CLEARANCE_COST = getBooleanProperty("ENABLE_VEGETATION_CLEARANCE_COST", false); // calculates cost of clearing vegetation even if forestry off
- // When forestry enabled, conversion cost based on amount of biomass cleared
- public static final double MANAGED_FOREST_DECREASE_COST = IS_FORESTRY_ON || ENABLE_VEGETATION_CLEARANCE_COST ? getDoubleProperty("MANAGED_FOREST_DECREASE_COST", 0.1 * LAND_CHANGE_COST) : getDoubleProperty("MANAGED_FOREST_DECREASE_COST", 0.5 * LAND_CHANGE_COST); // $1000/ha
// Carbon
public static final boolean IS_CARBON_ON = getBooleanProperty("IS_CARBON_ON", false);
diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java
index 4c0a8899405b38f9608156c6714560ba46a355dc..dc11361025604485dac88771b96a84718ca0f1c2 100644
--- a/src/ac/ed/lurg/ModelMain.java
+++ b/src/ac/ed/lurg/ModelMain.java
@@ -710,7 +710,7 @@ public class ModelMain {
carbonUsageDataMap = (Map<CompositeCountry, CarbonUsageData>) in.readObject();
in.close();
fileIn.close();
- LogWriter.println("Deserialized " + ModelConfig.SERIALIZED_CARBON_USAGE_FILE);
+ LogWriter.println("Deserialized " + ModelConfig.SERIALIZED_CARBON_USAGE_FILE, 2);
return carbonUsageDataMap;
} catch (IOException i) {
LogWriter.printlnError("Problem deserializing " + ModelConfig.SERIALIZED_CARBON_USAGE_FILE);
diff --git a/src/ac/ed/lurg/carbon/CarbonFluxItem.java b/src/ac/ed/lurg/carbon/CarbonFluxItem.java
index deab4f7f5e935ae7f8179ec22dd3fbcc2bfd5575..e62718d6372b1bb10d0cac2dd0f150ee91e1444c 100644
--- a/src/ac/ed/lurg/carbon/CarbonFluxItem.java
+++ b/src/ac/ed/lurg/carbon/CarbonFluxItem.java
@@ -7,7 +7,6 @@ import java.util.HashMap;
import java.util.Map;
import ac.ed.lurg.ModelConfig;
-import ac.ed.lurg.Timestep;
import ac.ed.lurg.landuse.LandCoverTile;
import ac.ed.lurg.landuse.LccKey;
import ac.ed.lurg.types.LandCoverType;
@@ -16,7 +15,8 @@ import ac.ed.lurg.types.LandProtectionType;
public class CarbonFluxItem implements RasterItem, Serializable {
private static final long serialVersionUID = 440720456140537815L;
- Map<LccKey, Double> carbonFluxRate = new HashMap<LccKey, Double>();
+ // X to Y conversion (new land cover) = conversion flux + ecosystem flux. X to X conversion (existing land cover) = ecosystem flux
+ Map<LccKey, Double> carbonFluxRate = new HashMap<LccKey, Double>();
Map<LccKey, Double> carbonCreditRate = new HashMap<LccKey, Double>();
diff --git a/src/ac/ed/lurg/carbon/CarbonFluxReader.java b/src/ac/ed/lurg/carbon/CarbonFluxReader.java
index 8913655e594c3d3b0597ea95c957d42709dfb6e6..cdc9c7e520040c5fef2faf5af39948e7b48c60bb 100644
--- a/src/ac/ed/lurg/carbon/CarbonFluxReader.java
+++ b/src/ac/ed/lurg/carbon/CarbonFluxReader.java
@@ -14,7 +14,7 @@ import ac.sac.raster.RasterKey;
import ac.sac.raster.RasterSet;
public class CarbonFluxReader {
- private static final int MIN_COLS = ModelConfig.CARBON_WOOD_MAX_TIME + 2;
+ private static final int MIN_COLS = ModelConfig.CARBON_WOOD_MAX_TIME + 2 + 1; // max age + lat + lon + age=0
private static final double CONVERSION_FACTOR = 10.0; // convert kgC/m2 to tC/ha
private RasterHeaderDetails rasterProj;
private String[] header = new String[MIN_COLS];
@@ -31,36 +31,36 @@ public class CarbonFluxReader {
public CarbonFluxRasterSet getCarbonFluxes(RasterSet<LandUseItem> landUseRaster, Timestep timestep) {
CarbonFluxRasterSet cFluxData = new CarbonFluxRasterSet(rasterProj);
- getCarbonFluxesConversion("cflux_ntrl_to_past.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.NATURAL, LandCoverType.PASTURE));
- getCarbonFluxesConversion("cflux_ntrl_to_forC.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.NATURAL, LandCoverType.CARBON_FOREST));
- getCarbonFluxesConversion("cflux_ntrl_to_forC.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.NATURAL, LandCoverType.TIMBER_FOREST));
- getCarbonFluxesConversion("cflux_ntrl_to_crop.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.NATURAL, LandCoverType.CROPLAND));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_NTRL_TO_PAST_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.NATURAL, LandCoverType.PASTURE));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_NTRL_TO_FORS_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.NATURAL, LandCoverType.CARBON_FOREST));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_NTRL_TO_FORS_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.NATURAL, LandCoverType.TIMBER_FOREST));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_NTRL_TO_CROP_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.NATURAL, LandCoverType.CROPLAND));
- getCarbonFluxesConversion("cflux_past_to_ntrl.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.PASTURE, LandCoverType.NATURAL));
- getCarbonFluxesConversion("cflux_past_to_forC.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.PASTURE, LandCoverType.CARBON_FOREST));
- getCarbonFluxesConversion("cflux_past_to_forC.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.PASTURE, LandCoverType.TIMBER_FOREST));
- getCarbonFluxesConversion("cflux_past_to_crop.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.PASTURE, LandCoverType.CROPLAND));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_PAST_TO_NTRL_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.PASTURE, LandCoverType.NATURAL));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_PAST_TO_FORS_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.PASTURE, LandCoverType.CARBON_FOREST));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_PAST_TO_FORS_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.PASTURE, LandCoverType.TIMBER_FOREST));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_PAST_TO_CROP_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.PASTURE, LandCoverType.CROPLAND));
- getCarbonFluxesConversion("cflux_forC_to_ntrl.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CARBON_FOREST, LandCoverType.NATURAL));
- getCarbonFluxesConversion("cflux_forC_to_past.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CARBON_FOREST, LandCoverType.PASTURE));
- getCarbonFluxesConversion("cflux_forC_to_forC.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CARBON_FOREST, LandCoverType.TIMBER_FOREST));
- getCarbonFluxesConversion("cflux_forC_to_crop.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CARBON_FOREST, LandCoverType.CROPLAND));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_FORS_TO_NTRL_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CARBON_FOREST, LandCoverType.NATURAL));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_FORS_TO_PAST_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CARBON_FOREST, LandCoverType.PASTURE));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_FORS_TO_FORS_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CARBON_FOREST, LandCoverType.TIMBER_FOREST));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_FORS_TO_CROP_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CARBON_FOREST, LandCoverType.CROPLAND));
- getCarbonFluxesConversion("cflux_forC_to_ntrl.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.TIMBER_FOREST, LandCoverType.NATURAL));
- getCarbonFluxesConversion("cflux_forC_to_past.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.TIMBER_FOREST, LandCoverType.PASTURE));
- getCarbonFluxesConversion("cflux_forC_to_forC.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.TIMBER_FOREST, LandCoverType.CARBON_FOREST));
- getCarbonFluxesConversion("cflux_forC_to_crop.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.TIMBER_FOREST, LandCoverType.CROPLAND));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_FORS_TO_NTRL_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.TIMBER_FOREST, LandCoverType.NATURAL));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_FORS_TO_PAST_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.TIMBER_FOREST, LandCoverType.PASTURE));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_FORS_TO_FORS_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.TIMBER_FOREST, LandCoverType.CARBON_FOREST));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_FORS_TO_CROP_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.TIMBER_FOREST, LandCoverType.CROPLAND));
- getCarbonFluxesConversion("cflux_crop_to_ntrl.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CROPLAND, LandCoverType.NATURAL));
- getCarbonFluxesConversion("cflux_crop_to_past.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CROPLAND, LandCoverType.PASTURE));
- getCarbonFluxesConversion("cflux_crop_to_forC.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CROPLAND, LandCoverType.CARBON_FOREST));
- getCarbonFluxesConversion("cflux_crop_to_forC.dat", cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CROPLAND, LandCoverType.TIMBER_FOREST));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_CROP_TO_NTRL_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CROPLAND, LandCoverType.NATURAL));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_CROP_TO_PAST_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CROPLAND, LandCoverType.PASTURE));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_CROP_TO_FORS_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CROPLAND, LandCoverType.CARBON_FOREST));
+ getCarbonFluxesConversion(ModelConfig.C_FLUX_CROP_TO_FORS_FILENAME, cFluxData, landUseRaster, timestep, new LccKey(LandCoverType.CROPLAND, LandCoverType.TIMBER_FOREST));
- getCarbonFluxesEcosystem("cflux_sts_ntrl.dat", cFluxData, landUseRaster, timestep, LandCoverType.NATURAL);
- getCarbonFluxesEcosystem("cflux_sts_past.dat", cFluxData, landUseRaster, timestep, LandCoverType.PASTURE);
- getCarbonFluxesEcosystem("cflux_sts_forC.dat", cFluxData, landUseRaster, timestep, LandCoverType.CARBON_FOREST);
- getCarbonFluxesEcosystem("cflux_sts_forC.dat", cFluxData, landUseRaster, timestep, LandCoverType.TIMBER_FOREST);
- getCarbonFluxesEcosystem("cflux_sts_crop.dat", cFluxData, landUseRaster, timestep, LandCoverType.CROPLAND);
+ getCarbonFluxesEcosystem(ModelConfig.C_FLUX_NTRL_FILENAME, cFluxData, landUseRaster, timestep, LandCoverType.NATURAL);
+ getCarbonFluxesEcosystem(ModelConfig.C_FLUX_PAST_FILENAME, cFluxData, landUseRaster, timestep, LandCoverType.PASTURE);
+ getCarbonFluxesEcosystem(ModelConfig.C_FLUX_FORS_FILENAME, cFluxData, landUseRaster, timestep, LandCoverType.CARBON_FOREST);
+ getCarbonFluxesEcosystem(ModelConfig.C_FLUX_FORS_FILENAME, cFluxData, landUseRaster, timestep, LandCoverType.TIMBER_FOREST);
+ getCarbonFluxesEcosystem(ModelConfig.C_FLUX_CROP_FILENAME, cFluxData, landUseRaster, timestep, LandCoverType.CROPLAND);
return cFluxData;
@@ -106,6 +106,6 @@ public class CarbonFluxReader {
}
private String getDataDir(String filename, Timestep timestep) {
- return timestep.getWoodAndCarbonYearSubDir(ModelConfig.WOOD_AND_CARBON_DIR) + File.separator + filename;
+ return timestep.getWoodAndCarbonYearSubDir(ModelConfig.FORESTRY_DIR) + File.separator + filename;
}
}
diff --git a/src/ac/ed/lurg/country/AbstractCountryAgent.java b/src/ac/ed/lurg/country/AbstractCountryAgent.java
index 390134dd2bfc6ba6a7fe9a01ba2efab365b90c7d..d2584ccd0bba9b7af074a3c005f627fa684b062c 100644
--- a/src/ac/ed/lurg/country/AbstractCountryAgent.java
+++ b/src/ac/ed/lurg/country/AbstractCountryAgent.java
@@ -78,7 +78,7 @@ public abstract class AbstractCountryAgent {
double priceChangeRate = (newPrice - oldPrice)/ oldPrice;
if (priceChangeRate > ModelConfig.EXPORT_TAX_THRESHOLD) {
exportTaxRate = ModelConfig.EXPORT_TAX_RATE;
- LogWriter.println(String.format("\ncalculateExportTax: Price Spike, %s, %d, %s, %.6f, %.6f, %.2f\n", country, currentTimestep.getTimestep(), crop, oldPrice, newPrice, priceChangeRate*100));
+ LogWriter.println(String.format("\ncalculateExportTax: Price Spike, %s, %d, %s, %.6f, %.6f, %.2f\n", country, currentTimestep.getTimestep(), crop, oldPrice, newPrice, priceChangeRate*100), 3);
break;
}
else
@@ -92,7 +92,7 @@ public abstract class AbstractCountryAgent {
abstract protected CountryPrice createCountryPrices(CropType crop, GlobalPrice worldPrice);
protected void calculateCountryPricesAndDemand(Map<CropType, GlobalPrice> worldPrices, GlobalPrice carbonPrice, GlobalPrice timberPrice, boolean outputGamsDemand) {
- LogWriter.println("\ncalculateCountryPricesAndDemand for " + country + " "+ currentTimestep.getTimestep());
+ LogWriter.println("\ncalculateCountryPricesAndDemand for " + country + " "+ currentTimestep.getTimestep(), 3);
currentWorldPrices = worldPrices;
globalWoodPrice = timberPrice;
globalCarbonPrice = carbonPrice;
@@ -122,7 +122,7 @@ public abstract class AbstractCountryAgent {
}
currentConsumerCommodityPrices.put(commodity, commPricePlum);
- LogWriter.println("Producer price for " + commodity.getGamsName() + " is " + commPricePlum);
+ LogWriter.println("Producer price for " + commodity.getGamsName() + " is " + commPricePlum, 3);
}
return currentConsumerCommodityPrices;
diff --git a/src/ac/ed/lurg/country/AgriculturalGDPManager.java b/src/ac/ed/lurg/country/AgriculturalGDPManager.java
index 108766be7ed1170b0725a3818dd2f12dc95bc077..d7865c5012ac15627a335fcaabac89a4da75a9ac 100644
--- a/src/ac/ed/lurg/country/AgriculturalGDPManager.java
+++ b/src/ac/ed/lurg/country/AgriculturalGDPManager.java
@@ -23,7 +23,7 @@ public class AgriculturalGDPManager {
public double getProportion(SingleCountry c) {
- LogWriter.println("country in get prop " + c);
+ LogWriter.println("country in get prop " + c, 3);
return fractionsMap.get(c);
}
diff --git a/src/ac/ed/lurg/country/CountryAgent.java b/src/ac/ed/lurg/country/CountryAgent.java
index bd0e8b69fd33b12c7cc26450255db69c89c9950d..8a36e998a23969b697c8bd992adac7d6783ad6e6 100644
--- a/src/ac/ed/lurg/country/CountryAgent.java
+++ b/src/ac/ed/lurg/country/CountryAgent.java
@@ -66,7 +66,7 @@ public class CountryAgent extends AbstractCountryAgent {
private RasterSet<IntegerRasterItem> calcYieldClusters(RasterSet<IrrigationItem> irrigData, YieldRaster countryYieldSurfaces, RasterSet<WoodYieldItem> woodYieldData) {
- LogWriter.println("calcYieldClusters: for " + ModelConfig.NUM_YIELD_CLUSTERS + " clusters");
+ LogWriter.println("calcYieldClusters: for " + ModelConfig.NUM_YIELD_CLUSTERS + " clusters", 3);
// create collection of ClusteringPoints from countryYieldSurfaces, these have the RasterKey and data for yield (or access to them)
HashSet<YieldClusterPoint> clusteringPoints = new HashSet<YieldClusterPoint>();
@@ -138,7 +138,7 @@ public class CountryAgent extends AbstractCountryAgent {
// optimize areas and intensity
GamsRasterInput input = getGamsRasterInput(irrigData, countryYieldSurfaces, woodYieldData, carbonFluxData, conversionCosts);
GamsRasterOptimiser opti = new GamsRasterOptimiser(input, yieldClusters);
- LogWriter.println("Running " + country.getName() + ", currentTimestep " + currentTimestep);
+ LogWriter.println("Running " + country.getName() + ", currentTimestep " + currentTimestep, 3);
GamsRasterOutput result = opti.run();
@@ -148,6 +148,8 @@ public class CountryAgent extends AbstractCountryAgent {
incrementLandCoverAge();
doForestRotation(woodYieldData);
+
+ LogWriter.print("\n", 2);
return result;
}
@@ -203,7 +205,7 @@ public class CountryAgent extends AbstractCountryAgent {
minLimit = minMaxLimits.get(MinMaxNetImportManager.LimitType.MIN_LIMIT_TYPE).get(crop);
maxLimit = minMaxLimits.get(MinMaxNetImportManager.LimitType.MAX_LIMIT_TYPE).get(crop);
}
- LogWriter.print(crop.toString());
+ LogWriter.print(crop.toString(), 3);
importConstraints.put(crop, new TradeConstraint(baseTrade - changeDown, baseTrade + changeUp, restiction, minLimit, maxLimit));
}
diff --git a/src/ac/ed/lurg/country/CountryAgentManager.java b/src/ac/ed/lurg/country/CountryAgentManager.java
index 1a4ffb3d56c4d60cc9c52a43e058746bf9be3467..f6dfce12327b1b4ea6115099416f0501a7d4d4b4 100644
--- a/src/ac/ed/lurg/country/CountryAgentManager.java
+++ b/src/ac/ed/lurg/country/CountryAgentManager.java
@@ -83,7 +83,7 @@ public class CountryAgentManager {
Map<CropType, Double> tradeBarriers = tradeBarrierManager.getTradeBarriers(cc);
if (ModelConfig.USE_CRAFTY_COUNTRIES && craftyManager.getCraftyCountries().contains(cc)) {
- LogWriter.println("Creating CRAFTY agent for: " + cc);
+ LogWriter.println("Creating CRAFTY agent for: " + cc, 3);
CraftyCountryAgent cca = new CraftyCountryAgent(demandManager, cc, tradeBarriers);
craftyCountryAgents.add(cca);
countryAgents.add(cca);
@@ -132,7 +132,7 @@ public class CountryAgentManager {
ExecutorService execService = Executors.newFixedThreadPool(ModelConfig.MULTITHREAD_NUM);
for (CountryAgent ca : gamsCountryAgents) {
- LogWriter.println("Country " + ca.getCountry());
+ LogWriter.println("Country " + ca.getCountry(), 3);
Collection<RasterKey> countryKeys = countryBoundaryRaster.getKeysFor(ca.getCountry());
YieldRaster countryYieldSurfaces = yieldSurfaces.createSubsetForKeys(countryKeys);
RasterSet<IrrigationItem> irrigData = currentIrrigationData.createSubsetForKeys(countryKeys);
@@ -196,13 +196,13 @@ public class CountryAgentManager {
try {
String fileStr = ModelConfig.IS_CALIBRATION_RUN ? ModelConfig.SERIALIZED_CROP_USAGE_FILE : ModelConfig.CHECKPOINT_CROP_USAGE_FILE;
- LogWriter.println("Starting serializing CropUsages to " + fileStr);
+ LogWriter.println("Starting serializing CropUsages to " + fileStr, 2);
FileOutputStream fileOut = new FileOutputStream(fileStr);
ObjectOutputStream out = new ObjectOutputStream(fileOut);
out.writeObject(cropUsageDataMap);
out.close();
fileOut.close();
- LogWriter.println("Serialized crop usage data is saved");
+ LogWriter.println("Serialized crop usage data is saved", 2);
} catch (IOException i) {
i.printStackTrace();
}
@@ -215,13 +215,13 @@ public class CountryAgentManager {
}
try {
- LogWriter.println("Starting serializing WoodUsage to " + ModelConfig.SERIALIZED_WOOD_USAGE_FILE);
+ LogWriter.println("Starting serializing WoodUsage to " + ModelConfig.SERIALIZED_WOOD_USAGE_FILE, 2);
FileOutputStream fileOut = new FileOutputStream(ModelConfig.SERIALIZED_WOOD_USAGE_FILE);
ObjectOutputStream out = new ObjectOutputStream(fileOut);
out.writeObject(woodUsageMap);
out.close();
fileOut.close();
- LogWriter.println("Serialized WoodUsage is saved");
+ LogWriter.println("Serialized WoodUsage is saved", 2);
} catch (IOException i) {
i.printStackTrace();
}
@@ -234,13 +234,13 @@ public class CountryAgentManager {
}
try {
- LogWriter.println("Starting serializing CarbonUsage to " + ModelConfig.SERIALIZED_CARBON_USAGE_FILE);
+ LogWriter.println("Starting serializing CarbonUsage to " + ModelConfig.SERIALIZED_CARBON_USAGE_FILE, 2);
FileOutputStream fileOut = new FileOutputStream(ModelConfig.SERIALIZED_CARBON_USAGE_FILE);
ObjectOutputStream out = new ObjectOutputStream(fileOut);
out.writeObject(carbonUsageMap);
out.close();
fileOut.close();
- LogWriter.println("Serialized carbonUsage is saved");
+ LogWriter.println("Serialized carbonUsage is saved", 2);
} catch (IOException i) {
i.printStackTrace();
}
diff --git a/src/ac/ed/lurg/country/CountryManager.java b/src/ac/ed/lurg/country/CountryManager.java
index ec90f2ef52ae8b7155d84434e55e1b5f649e4ae4..0707d113cabf6b5e0da5f0aed5f59c3f68d87ddb 100644
--- a/src/ac/ed/lurg/country/CountryManager.java
+++ b/src/ac/ed/lurg/country/CountryManager.java
@@ -58,7 +58,7 @@ public class CountryManager {
LogWriter.printlnError("Failed in reading commodity demand fits");
LogWriter.print(e);
}
- LogWriter.println("Processed " + filename + ", create " + nameMap.size() + " country codes");
+ LogWriter.println("Processed " + filename + ", create " + nameMap.size() + " country codes", 2);
}
diff --git a/src/ac/ed/lurg/country/CountryPrice.java b/src/ac/ed/lurg/country/CountryPrice.java
index aac3fbc0e36c5177cc7d3276976d44618873d1f4..2c98ad53b5d8099909bb2c77f7147a0c9b98e4c1 100644
--- a/src/ac/ed/lurg/country/CountryPrice.java
+++ b/src/ac/ed/lurg/country/CountryPrice.java
@@ -64,7 +64,7 @@ public class CountryPrice {
}
LogWriter.println(String.format("CountryPrice: Crop %s: import %.4f, export %.4f, prodcost %.4f, importWeighting %.4f, newCropPrice %.4f",
- crop, importPrice, getExportPrice(), prodCost, importWeighting, consumerPrice));
+ crop, importPrice, getExportPrice(), prodCost, importWeighting, consumerPrice), 3);
return consumerPrice;
}
diff --git a/src/ac/ed/lurg/country/GlobalPrice.java b/src/ac/ed/lurg/country/GlobalPrice.java
index 9a7aae9484f1ba8af86ab96a886e275e20fb93fa..8f9ee722ecb0e1bfc50bb9af90cbdc94b48efed7 100644
--- a/src/ac/ed/lurg/country/GlobalPrice.java
+++ b/src/ac/ed/lurg/country/GlobalPrice.java
@@ -26,7 +26,7 @@ public class GlobalPrice implements Serializable {
this.exportAmountBeforeLoss = exportAmountBeforeLoss;
this.transportLosses = transportLosses;
this.referencePrice = referencePrice;
- LogWriter.println("Created " + this);
+ LogWriter.println("Created " + this, 3);
}
public static GlobalPrice createInitial(double exportPrice, double intitalStock) {
@@ -82,8 +82,8 @@ public class GlobalPrice implements Serializable {
else
updatedStock = stockLevel + stockChange;
- LogWriter.println(String.format(" imports %.2f, exports %.2f", newImports, newExportAmountBeforeLoss - newTransportLosses));
- LogWriter.println(String.format(" updatedStock %.2f, previous %.2f (last timestep %.2f), stockChange %.2f, oldDiff %.2f", updatedStock, stockLevel, stockLevel-oldDiff, stockChange, oldDiff));
+ LogWriter.println(String.format(" imports %.2f, exports %.2f", newImports, newExportAmountBeforeLoss - newTransportLosses), 2);
+ LogWriter.println(String.format(" updatedStock %.2f, previous %.2f (last timestep %.2f), stockChange %.2f, oldDiff %.2f", updatedStock, stockLevel, stockLevel-oldDiff, stockChange, oldDiff), 2);
double adjustment;
@@ -93,7 +93,7 @@ public class GlobalPrice implements Serializable {
else if (ModelConfig.PRICE_UPDATE_BY_MARKET_IMBALANCE) {
double ratio = stockChange/(production-stockChange);
adjustment = Math.exp(-ratio * ModelConfig.MARKET_LAMBA);
- LogWriter.println(String.format(" initally imbalance ratio= %.4f", ratio));
+ LogWriter.println(String.format(" initally imbalance ratio= %.4f", ratio), 2);
}
else {
if (stockChange == 0 && production == 0)
@@ -103,7 +103,7 @@ public class GlobalPrice implements Serializable {
else // stock decreasing, so increase price. stockChange is negative so adjustment > 1
adjustment = 1 - ModelConfig.MARKET_LAMBA * stockChange/Math.max(0, stockLevel);
- LogWriter.print(String.format(" initally adjustment= %.4f", adjustment));
+ LogWriter.print(String.format(" initally adjustment= %.4f", adjustment), 2);
}
if (adjustment < ModelConfig.MAX_PRICE_DECREASE)
@@ -112,7 +112,7 @@ public class GlobalPrice implements Serializable {
if (adjustment > ModelConfig.MAX_PRICE_INCREASE)
adjustment = ModelConfig.MAX_PRICE_INCREASE; // default to max up change
- LogWriter.println(String.format(", after limit %.4f", adjustment));
+ LogWriter.println(String.format(", after limit %.4f", adjustment), 2);
double newPrice = exportPrice * adjustment;
double refPrice = ModelConfig.IS_CALIBRATION_RUN ? exportPrice : referencePrice; // during calibration reference price isn't fixed, but it is after that
diff --git a/src/ac/ed/lurg/country/TradeConstraint.java b/src/ac/ed/lurg/country/TradeConstraint.java
index 085065b6ce27e22607fcee4e2c9223df6a88d5a0..5fbbd75d5f7e0f6b2a608c80779a521c05abbf95 100644
--- a/src/ac/ed/lurg/country/TradeConstraint.java
+++ b/src/ac/ed/lurg/country/TradeConstraint.java
@@ -12,7 +12,7 @@ public class TradeConstraint {
}
public TradeConstraint(double min, double max, double exportRetriction, Double minLimit, Double maxLimit) {
- LogWriter.print(" TradeConstraint: min=" + min + ", max=" + max + ", exportRetriction=" + exportRetriction + ", minLimit=" + minLimit + ", maxLimit=" + maxLimit);
+ LogWriter.print(" TradeConstraint: min=" + min + ", max=" + max + ", exportRetriction=" + exportRetriction + ", minLimit=" + minLimit + ", maxLimit=" + maxLimit, 3);
if (minLimit != null && min < minLimit) {
min = minLimit.doubleValue();
@@ -29,7 +29,7 @@ public class TradeConstraint {
minValue = applyExportRestriction(min, exportRetriction);
maxValue = applyExportRestriction(max, exportRetriction);
- LogWriter.println(" - resulted in minValue=" + minValue + ", maxValue=" + maxValue);
+ LogWriter.println(" - resulted in minValue=" + minValue + ", maxValue=" + maxValue, 3);
}
private double applyExportRestriction(double amountBefore, double restrictionRate) {
diff --git a/src/ac/ed/lurg/country/crafty/CraftyProdManager.java b/src/ac/ed/lurg/country/crafty/CraftyProdManager.java
index 9356de0f1095603f55f55f28605348dbd2bd78a8..12265272db3d0c290dadab4c802b211ae8b6184b 100644
--- a/src/ac/ed/lurg/country/crafty/CraftyProdManager.java
+++ b/src/ac/ed/lurg/country/crafty/CraftyProdManager.java
@@ -44,7 +44,7 @@ public class CraftyProdManager {
LogWriter.printlnError("Not able to find marker file. May have timed out.");
throw new RuntimeException("Not able to find marker file. May have timed out.");
}
- LogWriter.println("Found marker file in " + (System.currentTimeMillis() - startTime) + " ms");
+ LogWriter.println("Found marker file in " + (System.currentTimeMillis() - startTime) + " ms", 2);
StringTabularReader tabularReader = new StringTabularReader(",", new String[]{"Country","Crop","Production","MonogastricFeed","RuminantFeed","NetImportsExpected"});
tabularReader.read(rootDir + File.separator + "production.csv");
@@ -79,7 +79,7 @@ public class CraftyProdManager {
cca.updateProduction(cropUsageMap, worldPrices, carbonPrice, timberPrice);
}
catch (Exception e) {
- LogWriter.println("Problem getting Crafty data for: " + cca.getCountry());
+ LogWriter.printlnWarning("Problem getting Crafty data for: " + cca.getCountry());
}
}
}
diff --git a/src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java b/src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java
index 80d55c7d5f247d7c8a0e1e491d2bb9ce8843a025..8990d4bc4b7cb11c687d1a947a871bf09d47b4eb 100755
--- a/src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java
+++ b/src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java
@@ -73,13 +73,12 @@ public class GamsDemandOptimiser {
opt.defines("gdx_parameters", new File(ModelConfig.DEMAND_PARAM_FILE).getAbsolutePath());
long startTime = System.currentTimeMillis();
- LogWriter.println("Memory usage: GAMS Demand " + (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024.0*1024.0*1024.0));
gamsJob.run(opt, dbs.toArray(new GAMSDatabase[dbs.size()]));
- LogWriter.println("Took " + (System.currentTimeMillis() - startTime) + " ms to run");
-
GamsDemandOutput gamsOutput = handleResults(gamsJob.OutDB());
+ LogWriter.println("Took " + (System.currentTimeMillis() - startTime) + " ms to run", 3);
+
if (ModelConfig.CLEANUP_GAMS_DIR) {
gamsJob.OutDB().dispose();
deleteDirectory(workingDirectory.toFile());
@@ -99,7 +98,7 @@ public class GamsDemandOptimiser {
CommodityType commodity = CommodityType.getForGamsName(key);
double adjusted = tauManager.getFinalTau(inputData.getYear(), initialTau, commodity);
- LogWriter.println(String.format("%14s: initialTau=%.6f, adjusted=%.6f", key, initialTau, adjusted));
+ LogWriter.println(String.format("%14s: initialTau=%.6f, adjusted=%.6f", key, initialTau, adjusted), 3);
rec.setValue(adjusted);
}
}
@@ -107,19 +106,19 @@ public class GamsDemandOptimiser {
private void setupPriceGdpDB(GAMSDatabase inDB) {
GAMSParameter gdpPcP = inDB.addParameter("gdp_pc", 0);
double gdpPc = inputData.getGdpPc();
- LogWriter.println(String.format("gdp_pc = %.5f", gdpPc));
+ LogWriter.println(String.format("gdp_pc = %.5f", gdpPc), 3);
setGamsParamValue(gdpPcP.addRecord(), gdpPc, 5);
GamsDemandOutput previousGamsDemands = inputData.getPreviousDemands();
GAMSParameter prevUP = inDB.addParameter("previousU", 0);
double previousUtility = previousGamsDemands == null ? 0 : previousGamsDemands.getUtility();//-16.3829624069452 + 4.3659621833299 * Math.log10(gdpPc);
- LogWriter.println(String.format("previousU = %.5f, estimated = %.5f", previousUtility, -16.3829624069452 + 4.3659621833299 * Math.log10(gdpPc)));
+ LogWriter.println(String.format("previousU = %.5f, estimated = %.5f", previousUtility, -16.3829624069452 + 4.3659621833299 * Math.log10(gdpPc)), 3);
setGamsParamValue(prevUP.addRecord(), previousUtility, 5);
GAMSParameter maxIncomePropFoodSpendP = inDB.addParameter("maxIncomePropFoodSpend", 0);
setGamsParamValue(maxIncomePropFoodSpendP.addRecord(), ModelConfig.MAX_INCOME_PROPORTION_FOOD_SPEND, 4);
- LogWriter.println("\nPrice");
+ LogWriter.println("\nPrice", 3);
GAMSParameter priceP = inDB.addParameter("price", 1);
GAMSParameter prevSubsP = inDB.addParameter("previousSubs", 1);
GAMSParameter prevDiscP = inDB.addParameter("previousDisc", 1);
@@ -145,7 +144,7 @@ public class GamsDemandOptimiser {
prevDisc = demand.getDiscretionary();
}
- LogWriter.println(String.format("%14s: price=%.4f, previousSubs=%.4f, previousDisc=%.4f", comm.getGamsName(), price, prevSubs, prevDisc));
+ LogWriter.println(String.format("%14s: price=%.4f, previousSubs=%.4f, previousDisc=%.4f", comm.getGamsName(), price, prevSubs, prevDisc), 3);
setGamsParamValue(priceP.addRecord(v), price, 4);
setGamsParamValue(prevSubsP.addRecord(v), prevSubs, 4);
setGamsParamValue(prevDiscP.addRecord(v), prevDisc, 4);
@@ -162,11 +161,11 @@ public class GamsDemandOptimiser {
ModelStat modelStatus = GAMSGlobals.ModelStat.lookup(modelStatusInt);
LogWriter.println(String.format("\nDemand %s: Modelstatus (%d) %s, Solvestatus %s", inputData.getCountry(),
- modelStatusInt, modelStatus.toString(), GAMSGlobals.SolveStat.lookup((int) outDB.getParameter("ss").findRecord().getValue()) ));
+ modelStatusInt, modelStatus.toString(), GAMSGlobals.SolveStat.lookup((int) outDB.getParameter("ss").findRecord().getValue()), 1));
GAMSVariable varU = outDB.getVariable("u");
double utility = varU.getFirstRecord().getLevel();
- LogWriter.println(String.format("u = %.4f", utility));
+ LogWriter.println(String.format("u = %.4f", utility), 3);
double leastSquareError = Math.abs(outDB.getVariable("error").getFirstRecord().getLevel());
@@ -194,25 +193,25 @@ public class GamsDemandOptimiser {
CommodityType commodity = CommodityType.getForGamsName(commodityName, true);
if (commodity == null)
- LogWriter.println(String.format("Can't find commodity from Gams demand, so ignoring: " + commodityName));
+ LogWriter.printlnWarning(String.format("Can't find commodity from Gams demand, so ignoring: " + commodityName));
else {
double subsGams = rec.getLevel();
double discGams = modelStatusInt==0 ? 0 : varDisc.findRecord(commodityName).getLevel(); //modelStatus==0 is optimiser not run, i.e. too low GDP
GamsCommodityDemand demand = new GamsCommodityDemand(commodity, subsGams, discGams,inputData.getKcalPerT(commodity));
- LogWriter.println(demand.toString());
+ LogWriter.println(demand.toString(), 3);
demandMap.add(demand);
unhandledComms.remove(commodity);
}
}
for (CommodityType commodity : unhandledComms) {
- LogWriter.println(commodity + " not found in Gams output so adding with zero demand");
+ LogWriter.printlnWarning(commodity + " not found in Gams output so adding with zero demand");
demandMap.add(new GamsCommodityDemand(commodity, 0, 0, 0));
}
GAMSParameter parConsumpFact = outDB.getParameter("desiredConsumpFactor");
double desiredConsumpFactor = parConsumpFact.getFirstRecord().getValue();
- LogWriter.println(String.format("desiredConsumpFactor=%.4f", desiredConsumpFactor));
+ LogWriter.println(String.format("desiredConsumpFactor=%.4f", desiredConsumpFactor), 3);
return new GamsDemandOutput(modelStatus.toString(), demandMap, utility, desiredConsumpFactor);
}
diff --git a/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java b/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
index 6c0f9725a804a94f9072c499156e3d94e653ef32..30cd5e2fe1cc172b1edc3f9e7200bfd8926b889a 100644
--- a/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
+++ b/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
@@ -11,6 +11,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.Vector;
import com.gams.api.GAMSDatabase;
@@ -56,9 +57,11 @@ public class GamsLocationOptimiser {
private boolean saveGamsGdxFiles;
private GamsLocationInput inputData;
+ private Set<Integer> clusters;
- public GamsLocationOptimiser(GamsLocationInput inputData) {
+ public GamsLocationOptimiser(GamsLocationInput inputData, Set<Integer> clusters) {
this.inputData = inputData;
+ this.clusters = clusters;
saveGamsGdxFiles = (ModelConfig.GAMS_COUNTRY_TO_SAVE != null && inputData.getCountryInput().getCountry().getName().equals(ModelConfig.GAMS_COUNTRY_TO_SAVE));
}
@@ -70,7 +73,6 @@ public class GamsLocationOptimiser {
try {
workingDirectory = Files.createTempDirectory(Paths.get(ModelConfig.TEMP_DIR), "loc");
} catch (IOException e) {
- // TODO Auto-generated catch block
LogWriter.printlnError(e.toString());
}
@@ -93,10 +95,10 @@ public class GamsLocationOptimiser {
long startTime = System.currentTimeMillis();
gamsJob.run(opt, inDB);
- LogWriter.println("Took " + (System.currentTimeMillis() - startTime) + " ms to run");
-
GamsLocationOutput gamsOutput = handleResults(gamsJob.OutDB());
+ LogWriter.println("Took " + (System.currentTimeMillis() - startTime) + " ms to run", 3);
+
if (saveGamsGdxFiles)
saveGDXFile("landuse", workingDirectory.toFile());
@@ -341,7 +343,7 @@ public class GamsLocationOptimiser {
double fertCost = ModelConfig.updateParameterForShocks(inputData.getTimestep().getYear(), "FERTILISER_COST_PER_T");
double otherIntCost = ModelConfig.updateParameterForShocks(inputData.getTimestep().getYear(), "OTHER_INTENSITY_COST");
- LogWriter.print("\n");
+ LogWriter.print("\n", 3);
addScalar(inDB, "meatEfficency", meatEff, 3);
addScalar(inDB, "fertiliserUnitCost", fertCost, 3);
addScalar(inDB, "otherICost",otherIntCost, 3);
@@ -450,26 +452,30 @@ public class GamsLocationOptimiser {
}
// Land cover conversion cost
- GAMSParameter conversionCostP = inDB.addParameter("conversionCost", 2);
+ GAMSParameter conversionCostP = inDB.addParameter("conversionCost", 3);
Map<LccKey, Double> conversionCosts = inputData.getConversionCosts();
- for (Map.Entry<LccKey, Double> entry : conversionCosts.entrySet()) {
- LccKey key = entry.getKey();
- String fromName = key.getFromLc().getName();
- String toName = key.getToLc().getName();
- double cost = entry.getValue();
- Vector<String> v = new Vector<String>();
- v.add(fromName);
- v.add(toName);
- setGamsParamValue(conversionCostP.addRecord(v), cost, -1);
+ for (Integer location : clusters) {
+ for (Map.Entry<LccKey, Double> entry : conversionCosts.entrySet()) {
+ LccKey key = entry.getKey();
+ String fromName = key.getFromLc().getName();
+ String toName = key.getToLc().getName();
+ double baseCost = entry.getValue();
+ Double vegClearCost = woodYieldData.get(location).getYieldLuc(key.getFromLc(), key.getToLc()) * ModelConfig.VEGETATION_CLEARING_COST;
+ double totalCost = (vegClearCost.isNaN()) ? baseCost : baseCost + vegClearCost;
+ Vector<String> v = new Vector<String>();
+ v.add(fromName);
+ v.add(toName);
+ v.add(location.toString());
+ setGamsParamValue(conversionCostP.addRecord(v), totalCost, -1);
+ }
}
-
}
private void addScalar(GAMSDatabase gamsDb, String recordName, double val, int places) {
GAMSParameter param = gamsDb.addParameter(recordName, 0);
double dOut = setGamsParamValue(param.addRecord(), val, places);
- if (DEBUG) LogWriter.println(recordName + ": " + dOut);
+ if (DEBUG) LogWriter.println(recordName + ": " + dOut, 3);
}
private double setGamsParamValue(GAMSParameterRecord param, double val, int places) {
@@ -578,11 +584,11 @@ public class GamsLocationOptimiser {
prodCost = getParmValue(parmProdCost, meatTypes.getGamsName());
cropUsageData.put(meatTypes, new CropUsageData(0.0, 0.0, netImport, netImportCost, prod, prodCost, Double.NaN, 0));
- if (DEBUG) LogWriter.println(String.format("\n%s:\t\t\t\t\tnetImports= %.3f,\tnetImportCost= %.3f,\tprod= %.3f,\tprodCost= %.3f", meatTypes.getGamsName(), netImport, netImportCost, prod, prodCost));
+ if (DEBUG) LogWriter.println(String.format("\n%s:\t\t\t\t\tnetImports= %.3f,\tnetImportCost= %.3f,\tprod= %.3f,\tprodCost= %.3f", meatTypes.getGamsName(), netImport, netImportCost, prod, prodCost), 3);
}
LogWriter.println(String.format("\n%s %s: Total area= %.1f (crop=%.1f, pasture %.1f)",
inputData.getCountryInput().getCountry(), inputData.getTimestep().getYear(),
- totalCropArea+totalPastureArea, totalCropArea, totalPastureArea));
+ totalCropArea+totalPastureArea, totalCropArea, totalPastureArea), 3);
// Land cover change
GAMSVariable varLandCoverChange = outDB.getVariable("landCoverChange");
@@ -608,7 +614,8 @@ public class GamsLocationOptimiser {
// Timber harvest
- double woodSupplyLuc = outDB.getVariable("woodSupplyLuc").getFirstRecord().getLevel();
+ // Ignore harvest from LUC during initial calib to avoid flooding the market.
+ double woodSupplyLuc = (inputData.getTimestep().getTimestep() <= ModelConfig.END_FIRST_STAGE_CALIBRATION) ? 0.0 : outDB.getVariable("woodSupplyLuc").getFirstRecord().getLevel();
double woodSupplyRota = outDB.getVariable("woodSupplyRota").getFirstRecord().getLevel();
double totalWoodHarvest = woodSupplyLuc + woodSupplyRota;
double netWoodImport = getParmValue(parmNetImports, "wood");
@@ -655,7 +662,7 @@ public class GamsLocationOptimiser {
private void addCommodityMapParm(GAMSParameter parm, Map<CommodityType, Double> itemMap, int places) {
for (Map.Entry<CommodityType, Double> entry : itemMap.entrySet()) {
double d = entry.getValue();
- if (DEBUG) LogWriter.println(String.format(" %15s,\t %.1f", entry.getKey().getGamsName(), d));
+ if (DEBUG) LogWriter.println(String.format(" %15s,\t %.1f", entry.getKey().getGamsName(), d), 3);
if (!Double.isNaN(d))
setGamsParamValue(parm.addRecord(entry.getKey().getGamsName()), d, places);
}
diff --git a/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java b/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java
index 06735b8bc6d7e4268bb40945c89ce8e46c236def..78d0f007dbeda23577500121e236539bd1d5ff03 100644
--- a/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java
+++ b/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java
@@ -6,7 +6,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-
import ac.ed.lurg.ModelConfig;
import ac.ed.lurg.carbon.CarbonFluxItem;
import ac.ed.lurg.country.LandCoverChangeItem;
@@ -43,14 +42,16 @@ public class GamsRasterOptimiser {
// workout similar areas
GamsLocationInput gamsInput = convertFromRaster(rasterInputData);
- long start = System.currentTimeMillis();
+ Set<Integer> clusters = new HashSet<Integer>();
+ for (IntegerRasterItem i : mapping.values()) {
+ if (i != null) {
+ clusters.add(i.getInt());
+ }
+ }
- GamsLocationOptimiser opti = new GamsLocationOptimiser(gamsInput);
+ GamsLocationOptimiser opti = new GamsLocationOptimiser(gamsInput, clusters);
GamsLocationOutput gamsOutput = opti.run();
- long last = System.currentTimeMillis();
- LogWriter.println("Took " + (last-start));
-
// map results back to raster
return convertToRaster(gamsInput, gamsOutput);
}
@@ -87,7 +88,7 @@ public class GamsRasterOptimiser {
}
- LogWriter.println("Total Area " + comment + ": " + l.getName() + ": total = " + total + ", unprotected = " + unprotected);
+ LogWriter.println("Total Area " + comment + ": " + l.getName() + ": total = " + total + ", unprotected = " + unprotected, 3);
}
double suitableArea=0, protectedArea=0;
@@ -97,8 +98,8 @@ public class GamsRasterOptimiser {
suitableArea += a.getSuitableArea();
}
}
- LogWriter.println("Total protectedArea " + comment + ": " + protectedArea);
- LogWriter.println("Total suitableArea " + comment + ": " + suitableArea);
+ LogWriter.println("Total protectedArea " + comment + ": " + protectedArea, 3);
+ LogWriter.println("Total suitableArea " + comment + ": " + suitableArea, 3);
}
private RasterSet<LandUseItem> allocAreas(Map<Integer, ? extends LandUseItem> prevAreasAgg, GamsLocationOutput gamsOutput, int year) {
@@ -166,7 +167,7 @@ public class GamsRasterOptimiser {
}
private double allocAllLandCrops(RasterSet<LandUseItem> newLandUseRaster, Set<RasterKey> keys, LandCoverType toType, LandCoverType fromType, double change) {
- if (DEBUG) LogWriter.println("allocAllLandCrops: from " + fromType + " to " + toType + " change " + change);
+ if (DEBUG) LogWriter.println("allocAllLandCrops: from " + fromType + " to " + toType + " change " + change, 3);
if (change < 0.00001)
return 0;
@@ -195,7 +196,7 @@ public class GamsRasterOptimiser {
}
}
- if (DEBUG) LogWriter.println("allocAllLandCrops: from " + fromType + " to " + toType + " change " + change + " totalShortfall " + totalShortfall);
+ if (DEBUG) LogWriter.println("allocAllLandCrops: from " + fromType + " to " + toType + " change " + change + " totalShortfall " + totalShortfall, 3);
return totalShortfall;
}
@@ -292,7 +293,6 @@ public class GamsRasterOptimiser {
// Aggregate carbon fluxes and wood yields
if (carbonFluxItem != null) {
-
for (LandCoverType fromLc : LandCoverType.getConvertibleTypes()) {
for (LandCoverType toLc : LandCoverType.getConvertibleTypes()) {
double areaThisTime = landUseItem.getLandCoverArea(fromLc);
@@ -308,10 +308,8 @@ public class GamsRasterOptimiser {
double cCreditAgg = aggregateMean(cCreditSoFar, areaSoFar, cCreditThisTime, areaThisTime);
aggCFlux.setCarbonCreditRate(fromLc, toLc, cCreditAgg);
}
- }
-
+ }
}
-
if (woodYieldItem != null) {
for (Map.Entry<LccKey, Double> wyEntry : woodYieldItem.getYieldMap().entrySet()) {
@@ -396,8 +394,8 @@ public class GamsRasterOptimiser {
}
- LogWriter.println("Mapping: " + rasterInputData.getCountryInput().getCountry() + ", countFound=" + mappingsFound + ", countMissing=" + mappingsMissing);
- LogWriter.println("YieldResponsesItem: " + rasterInputData.getCountryInput().getCountry() + ", countFound=" + yRespFound + ", countMissing=" + yRespMissing);
+ LogWriter.println("Mapping: " + rasterInputData.getCountryInput().getCountry() + ", countFound=" + mappingsFound + ", countMissing=" + mappingsMissing, 3);
+ LogWriter.println("YieldResponsesItem: " + rasterInputData.getCountryInput().getCountry() + ", countFound=" + yRespFound + ", countMissing=" + yRespMissing, 3);
checkedTotalAreas(landUseRaster, "before");
checkedTotalAreas(aggregatedAreas, "after");
@@ -427,7 +425,7 @@ public class GamsRasterOptimiser {
}
private void logWarningWithCoord(String message, RasterKey key, YieldRaster yieldRaster) {
- LogWriter.printlnWarning(message + key + ", x:" + yieldRaster.getXCoordin(key) + ", y:" + yieldRaster.getYCoordin(key));
+ LogWriter.println("Warning: " + message + key + ", x:" + yieldRaster.getXCoordin(key) + ", y:" + yieldRaster.getYCoordin(key), 3);
}
private double aggregateMean(double aggV, double aggArea, double newV, double newArea) {
diff --git a/src/ac/ed/lurg/demand/AbstractDemandManager.java b/src/ac/ed/lurg/demand/AbstractDemandManager.java
index ec295e9842976c885aaca0016347a115e2dc6256..b60384ec79b89132c6e60182c84e11c47e7871ca 100644
--- a/src/ac/ed/lurg/demand/AbstractDemandManager.java
+++ b/src/ac/ed/lurg/demand/AbstractDemandManager.java
@@ -95,7 +95,7 @@ public abstract class AbstractDemandManager {
double newDemand = bioenergyDemandManager.getSecondGenBioenergyDemand(c, year);
bioenergyDemand += newDemand; // aggregate if composite country
}
- LogWriter.println(cc.getName() + " Gen2 bioenergy demand = " + bioenergyDemand);
+ LogWriter.println(cc.getName() + " Gen2 bioenergy demand = " + bioenergyDemand, 3);
return bioenergyDemand;
}
diff --git a/src/ac/ed/lurg/demand/AbstractSSPDemandManager.java b/src/ac/ed/lurg/demand/AbstractSSPDemandManager.java
index 557317639cb0acba52697b6f686d3c7cce54e4c8..beccd91852b98c99c0e5f218a0e24caf194081f9 100644
--- a/src/ac/ed/lurg/demand/AbstractSSPDemandManager.java
+++ b/src/ac/ed/lurg/demand/AbstractSSPDemandManager.java
@@ -62,7 +62,7 @@ public abstract class AbstractSSPDemandManager extends AbstractDemandManager {
SspData usaSd = sspManager.get(ssp_scenario, year, usa);
- LogWriter.println("Got ssp data for " + c.getCountryName() + " of " + sd);
+ LogWriter.println("Got ssp data for " + c.getCountryName() + " of " + sd, 3);
foodDemandMap = getFoodDemandMap(c, year, gdpPcYear * ModelConfig.SSP_GDP_PC_FACTOR, sd.getPopulation() * ModelConfig.SSP_POPULATION_FACTOR, prices, usaSd.getGdpPc(), outputGamsDemand);
return foodDemandMap;
diff --git a/src/ac/ed/lurg/demand/CalorieManager.java b/src/ac/ed/lurg/demand/CalorieManager.java
index 65462e59bbda94136f0bf32709c5fcdc506cbdbf..da54e6bf9ac04f425c17018ba7534be24e3afc24 100644
--- a/src/ac/ed/lurg/demand/CalorieManager.java
+++ b/src/ac/ed/lurg/demand/CalorieManager.java
@@ -64,7 +64,7 @@ public class CalorieManager {
LogWriter.printlnError("Failed in reading country specific calorie per t values");
LogWriter.print(e);
}
- LogWriter.println("Processed " + filename + ", create " + calorieMap.size() + " calorie per t values");
+ LogWriter.println("Processed " + filename + ", create " + calorieMap.size() + " calorie per t values", 2);
}
public Map<CommodityType, Double> get(SingleCountry country) {
diff --git a/src/ac/ed/lurg/demand/CarbonDemandManager.java b/src/ac/ed/lurg/demand/CarbonDemandManager.java
index dc9bf1a0dd3a2f08063f5d528c5c8d9bb28c909d..6d8f44eff267de6fb99daef32e02862eb54c8079 100644
--- a/src/ac/ed/lurg/demand/CarbonDemandManager.java
+++ b/src/ac/ed/lurg/demand/CarbonDemandManager.java
@@ -49,7 +49,7 @@ public class CarbonDemandManager {
LogWriter.print(e);
}
globalCarbonDemand = data;
- LogWriter.println("Processed " + filename);
+ LogWriter.println("Processed " + filename, 2);
}
public double getGlobalCarbonDemand(int year) {
diff --git a/src/ac/ed/lurg/demand/DemandCurveManager.java b/src/ac/ed/lurg/demand/DemandCurveManager.java
index 36176971b8ee46d37958662a1e4496fc3e090490..37ba38ead317dc781ac1eccedd7823298070aa33 100644
--- a/src/ac/ed/lurg/demand/DemandCurveManager.java
+++ b/src/ac/ed/lurg/demand/DemandCurveManager.java
@@ -54,7 +54,7 @@ public class DemandCurveManager {
LogWriter.printlnError("Failed in reading commodity demand fits");
LogWriter.print(e);
}
- LogWriter.println("Processed " + filename + ", create " + curves.size() + " demand curves");
+ LogWriter.println("Processed " + filename + ", create " + curves.size() + " demand curves", 2);
}
public DemandCurve get(CommodityType commodity, ModelFitType fitType) {
diff --git a/src/ac/ed/lurg/demand/DemandManagerFromFile.java b/src/ac/ed/lurg/demand/DemandManagerFromFile.java
index 5950b4816178c9b36f59567f0c8d267534209728..a01eb0907d09c71362e690125b1d19fa1829a910 100644
--- a/src/ac/ed/lurg/demand/DemandManagerFromFile.java
+++ b/src/ac/ed/lurg/demand/DemandManagerFromFile.java
@@ -45,7 +45,7 @@ public class DemandManagerFromFile extends AbstractDemandManager {
foodDemandMap.put(commodity, d);
}
catch (Exception e) {
- LogWriter.println("Problem finding food demand: " + commodity.getFaoName() + ", " + year + ", " + c.getCountryName());
+ LogWriter.printlnWarning("Problem finding food demand: " + commodity.getFaoName() + ", " + year + ", " + c.getCountryName());
}
}
@@ -80,7 +80,7 @@ public class DemandManagerFromFile extends AbstractDemandManager {
woodDemandMap.put(woodType, d);
}
catch (Exception e) {
- LogWriter.println("Problem finding wood demand: " + woodType.getName() + ", " + year + ", " + country.getCountryName());
+ LogWriter.printlnWarning("Problem finding wood demand: " + woodType.getName() + ", " + year + ", " + country.getCountryName());
woodDemandMap.put(woodType, 0.0);
}
}
diff --git a/src/ac/ed/lurg/demand/ElasticDemandManager.java b/src/ac/ed/lurg/demand/ElasticDemandManager.java
index eb88edfe80a6e4673c7e28ca3bf118a043521078..0e7537966ad5255f186aa40207036980ce6fcfe1 100755
--- a/src/ac/ed/lurg/demand/ElasticDemandManager.java
+++ b/src/ac/ed/lurg/demand/ElasticDemandManager.java
@@ -52,7 +52,7 @@ public class ElasticDemandManager extends AbstractSSPDemandManager {
double consumerPrice = priceMarkups.markedupPrice(c, commodity, producerPrice);
consumerPrices.put(commodity, consumerPrice);
- LogWriter.println("Consumer price for " + commodity.getGamsName() + " is " + consumerPrice);
+ LogWriter.println("Consumer price for " + commodity.getGamsName() + " is " + consumerPrice, 3);
}
@@ -97,11 +97,11 @@ public class ElasticDemandManager extends AbstractSSPDemandManager {
foodSpend += consumerPrice*rebasedDemand/population/365/2000*caloriesPerT;
}
- LogWriter.println("foodSpend " + foodSpend + " budget " + gdpPc*ModelConfig.MAX_INCOME_PROPORTION_FOOD_SPEND);
+ LogWriter.println("foodSpend " + foodSpend + " budget " + gdpPc*ModelConfig.MAX_INCOME_PROPORTION_FOOD_SPEND, 3);
if(foodSpend > gdpPc*ModelConfig.MAX_INCOME_PROPORTION_FOOD_SPEND) {
double overspend= 1/(foodSpend/(gdpPc*ModelConfig.MAX_INCOME_PROPORTION_FOOD_SPEND));
- LogWriter.println("overspend " + overspend);
+ LogWriter.println("overspend " + overspend, 3);
for (Map.Entry<CommodityType, Double> entry : foodPc.entrySet()) {
CommodityType commodity = entry.getKey();
double rebasedDemand = foodDemands.get(commodity);
diff --git a/src/ac/ed/lurg/demand/PriceMarkUps.java b/src/ac/ed/lurg/demand/PriceMarkUps.java
index 17b2a4b06f52049426a4c1d294b74d1fb6b0870a..e8ab6de9e6f9917a923935ac2cf84f3973042696 100644
--- a/src/ac/ed/lurg/demand/PriceMarkUps.java
+++ b/src/ac/ed/lurg/demand/PriceMarkUps.java
@@ -27,7 +27,7 @@ public class PriceMarkUps {
if (priceMarkupFactor == null) {
double consumerPrice = getInitialConsumerPrice(c, commodity);
priceMarkupFactor = consumerPrice / producerPrice;
- LogWriter.println("priceMarkupFactor for " + c + ", " + commodity.getGamsName() + " is " + priceMarkupFactor);
+ LogWriter.println("priceMarkupFactor for " + c + ", " + commodity.getGamsName() + " is " + priceMarkupFactor, 3);
priceMarkupFactors.put(cc, priceMarkupFactor);
}
diff --git a/src/ac/ed/lurg/forestry/WoodYieldItem.java b/src/ac/ed/lurg/forestry/WoodYieldItem.java
index 97b627e854f22342a46f366d7760ea131149b288..7b8becb406d4050d202aede51f1e4197dd9b48b5 100644
--- a/src/ac/ed/lurg/forestry/WoodYieldItem.java
+++ b/src/ac/ed/lurg/forestry/WoodYieldItem.java
@@ -43,6 +43,7 @@ public class WoodYieldItem implements RasterItem {
this.yield.put(key, meanYield);
}
+ // For clustering
if (key.getFromLc().equals(LandCoverType.NATURAL) && key.getToLc().equals(LandCoverType.PASTURE))
maxYield = yields[ModelConfig.CARBON_WOOD_MAX_TIME - 1];
}
@@ -50,6 +51,7 @@ public class WoodYieldItem implements RasterItem {
public void calcRotationData(Map<LccKey, Double[]> woodYields, Map<LandCoverType, LandCoverTile> landUseTiles, Timestep timestep, double woodPrice) {
+ // This is in case ModelConfig.ENABLE_VEGETATION_CLEARANCE_COST is true. We want conversion yields but don't care about rotation.
if (!ModelConfig.IS_FORESTRY_ON) {
optimalRotation = 0;
yieldAtRotation = 0;
diff --git a/src/ac/ed/lurg/forestry/WoodYieldReader.java b/src/ac/ed/lurg/forestry/WoodYieldReader.java
index 247135a393ac624bc92b9dc9d78eff94f60c8653..9dc454f54fd9869ebc2f124abb8eae8b95817870 100644
--- a/src/ac/ed/lurg/forestry/WoodYieldReader.java
+++ b/src/ac/ed/lurg/forestry/WoodYieldReader.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import ac.ed.lurg.ModelConfig;
@@ -36,21 +37,22 @@ public class WoodYieldReader {
WoodYieldRasterSet woodYieldData = new WoodYieldRasterSet(rasterProj);
// Wood yield from rotation
- getWoodYields(woodYieldData, landUseRaster, timestep, woodPrice, ModelConfig.WOOD_YIELD_ROTA_FILENAME,
- getLccMappings(Arrays.asList(LandCoverType.TIMBER_FOREST), Arrays.asList(LandCoverType.TIMBER_FOREST)), true);
+ List<LccKey> rotaMapping = new ArrayList<LccKey>();
+ rotaMapping.add(new LccKey(LandCoverType.TIMBER_FOREST, LandCoverType.TIMBER_FOREST)); // Not using getLccMappings as that excludes X to X conversions
+ getWoodYields(woodYieldData, landUseRaster, timestep, woodPrice, ModelConfig.WOOD_YIELD_ROTA_FILENAME, rotaMapping , true);
// Wood yield from LCC
getWoodYields(woodYieldData, landUseRaster, timestep, woodPrice, ModelConfig.WOOD_YIELD_FORS_TO_PAST_FILENAME,
- getLccMappings(Arrays.asList(LandCoverType.CARBON_FOREST), Arrays.asList(LandCoverType.PASTURE)), false);
+ getLccMappings(LandCoverType.getManagedForestTypes(), Arrays.asList(LandCoverType.PASTURE)), false);
getWoodYields(woodYieldData, landUseRaster, timestep, woodPrice, ModelConfig.WOOD_YIELD_FORS_TO_CROP_FILENAME,
- getLccMappings(Arrays.asList(LandCoverType.CARBON_FOREST), Arrays.asList(LandCoverType.CROPLAND)), false);
+ getLccMappings(LandCoverType.getManagedForestTypes(), Arrays.asList(LandCoverType.CROPLAND)), false);
getWoodYields(woodYieldData, landUseRaster, timestep, woodPrice, ModelConfig.WOOD_YIELD_FORS_TO_NTRL_FILENAME,
- getLccMappings(Arrays.asList(LandCoverType.CARBON_FOREST), Arrays.asList(LandCoverType.NATURAL)), false);
+ getLccMappings(LandCoverType.getManagedForestTypes(), Arrays.asList(LandCoverType.NATURAL)), false);
getWoodYields(woodYieldData, landUseRaster, timestep, woodPrice, ModelConfig.WOOD_YIELD_FORS_TO_FORS_FILENAME,
- getLccMappings(Arrays.asList(LandCoverType.CARBON_FOREST), Arrays.asList(LandCoverType.TIMBER_FOREST)), false);
+ getLccMappings(LandCoverType.getManagedForestTypes(), LandCoverType.getManagedForestTypes()), false);
getWoodYields(woodYieldData, landUseRaster, timestep, woodPrice, ModelConfig.WOOD_YIELD_NTRL_TO_PAST_FILENAME,
getLccMappings(Arrays.asList(LandCoverType.NATURAL), Arrays.asList(LandCoverType.PASTURE)), false);
@@ -65,7 +67,7 @@ public class WoodYieldReader {
}
public void getWoodYields(WoodYieldRasterSet woodYieldData, RasterSet<LandUseItem> landUseRaster, Timestep timestep, double woodPrice,
- String filePath, ArrayList<LccKey> lccMappings, boolean calcRotation) {
+ String filePath, List<LccKey> lccMappings, boolean calcRotation) {
AbstractBinaryRasterReader<WoodYieldItem> yieldReader = new AbstractBinaryRasterReader<WoodYieldItem>(header, MIN_COLS - 2, woodYieldData) {
protected void setData(RasterKey key, WoodYieldItem item, Map<String, Double> rowValues) {
@@ -95,15 +97,15 @@ public class WoodYieldReader {
ArrayList<LccKey> lccMappings = new ArrayList<LccKey>();
for (LandCoverType fromLc : fromTypes) {
for (LandCoverType toLc : toTypes) {
- //if (!fromLc.equals(toLc)) // exclude no change as yield should be 0
- lccMappings.add(new LccKey(fromLc, toLc));
+ if (!fromLc.equals(toLc)) // exclude no change as yield should be 0
+ lccMappings.add(new LccKey(fromLc, toLc));
}
}
return lccMappings;
}
private String getDataDir(String filename, Timestep timestep) {
- return timestep.getWoodAndCarbonYearSubDir(ModelConfig.WOOD_AND_CARBON_DIR) + File.separator + filename;
+ return timestep.getWoodAndCarbonYearSubDir(ModelConfig.FORESTRY_DIR) + File.separator + filename;
}
private Double[] getYieldsFromRowValues(Map<String, Double> rowValues) {
diff --git a/src/ac/ed/lurg/landuse/ConversionCostReader.java b/src/ac/ed/lurg/landuse/ConversionCostReader.java
index 5cd2be02ca19b462b4921fad2bda8f809ea7d943..cde141cb02eebef4a0f33b751732772bafd3433e 100644
--- a/src/ac/ed/lurg/landuse/ConversionCostReader.java
+++ b/src/ac/ed/lurg/landuse/ConversionCostReader.java
@@ -59,7 +59,7 @@ public class ConversionCostReader {
LogWriter.printlnError("Failed in reading conversion costs file");
LogWriter.print(e);
}
- LogWriter.println("Processed " + filename);
+ LogWriter.println("Processed " + filename, 2);
}
public void calcFromConfig() {
diff --git a/src/ac/ed/lurg/landuse/CropUsageReader.java b/src/ac/ed/lurg/landuse/CropUsageReader.java
index 8c243f812b4a83da9ef3f19a62790e873b225a5c..dd2f2c024cecb1e63b3de37369158bae5ad7a56c 100644
--- a/src/ac/ed/lurg/landuse/CropUsageReader.java
+++ b/src/ac/ed/lurg/landuse/CropUsageReader.java
@@ -79,7 +79,7 @@ public class CropUsageReader {
LogWriter.printlnError("Failed in reading commodity usage data");
LogWriter.print(e);
}
- LogWriter.println("Processed " + filename + ", create " + commodityMap.size() + " country commodity maps values");
+ LogWriter.println("Processed " + filename + ", create " + commodityMap.size() + " country commodity maps values", 2);
return commodityMap;
}
diff --git a/src/ac/ed/lurg/shock/ExportRestrictionManager.java b/src/ac/ed/lurg/shock/ExportRestrictionManager.java
index de7d3d56f5a22152eaf30096e9a36a2c61c71714..f1c2a0688c2200e04830f04999d19e22f3f940a5 100644
--- a/src/ac/ed/lurg/shock/ExportRestrictionManager.java
+++ b/src/ac/ed/lurg/shock/ExportRestrictionManager.java
@@ -23,7 +23,7 @@ public class ExportRestrictionManager {
if (new File(shockFile).isFile())
exportShockReader.read(shockFile);
else
- LogWriter.println("Can't find a export shock file (" +shockFile + "), so will not apply export restriction");
+ LogWriter.printlnWarning("Can't find a export shock file (" +shockFile + "), so will not apply export restriction");
}
@SuppressWarnings("serial")
diff --git a/src/ac/ed/lurg/shock/YieldShockManager.java b/src/ac/ed/lurg/shock/YieldShockManager.java
index c18c85869b79d7691f3e78afdad2ece500dff7df..809daede29c644beb9ceba68bcd3c85228e8043b 100644
--- a/src/ac/ed/lurg/shock/YieldShockManager.java
+++ b/src/ac/ed/lurg/shock/YieldShockManager.java
@@ -83,7 +83,7 @@ public class YieldShockManager {
}
private void adjustForShocks(RasterSet<YieldShockItem> yieldShockMap, YieldRaster yieldRaster, CropType crop, double yieldAdjustment) {
- LogWriter.println("Applying yield shock to " + crop + ", rate " + yieldAdjustment);
+ LogWriter.println("Applying yield shock to " + crop + ", rate " + yieldAdjustment, 2);
for (Map.Entry<RasterKey, YieldShockItem> entry : yieldShockMap.entrySet()) {
YieldShockItem value = entry.getValue();
if (value.isShocked()) {
diff --git a/src/ac/ed/lurg/utils/LogWriter.java b/src/ac/ed/lurg/utils/LogWriter.java
index 59edf619dd5b83bfc847e798c9ef9da5b4e9431c..5c5342d525b3b9d24e8635ba234e994fc1fe2bd7 100644
--- a/src/ac/ed/lurg/utils/LogWriter.java
+++ b/src/ac/ed/lurg/utils/LogWriter.java
@@ -14,10 +14,20 @@ public class LogWriter {
private static LogWriter logWriter;
private PrintWriter logFile;
+ public static synchronized void println(String s, int debugLevel) {
+ if (debugLevel <= ModelConfig.DEBUG_LOG_LEVEL)
+ getLogWriter().print(s, System.out, true);
+ }
+
public static synchronized void println(String s) {
getLogWriter().print(s, System.out, true);
}
+ public static synchronized void print(String s, int debugLevel) {
+ if (debugLevel <= ModelConfig.DEBUG_LOG_LEVEL)
+ getLogWriter().print(s, System.out, false);
+ }
+
public static synchronized void print(String s) {
getLogWriter().print(s, System.out, false);
}
diff --git a/src/ac/ed/lurg/utils/cluster/KMeans.java b/src/ac/ed/lurg/utils/cluster/KMeans.java
index 39622423ed61e0c7c4a8a93d1675cf1eff4927b8..3eb1f40380c7759945f8fcabd00aa554bf785393 100644
--- a/src/ac/ed/lurg/utils/cluster/KMeans.java
+++ b/src/ac/ed/lurg/utils/cluster/KMeans.java
@@ -107,8 +107,8 @@ public class KMeans<K, P extends ClusteringPoint<K>> {
// printClusters();
if(distance <= tolerance || iteration > maxIterations) {
- LogWriter.println("Finishing calculateClusters: Iteration " + iteration + ", centroid distances: " + distance);
- LogWriter.println(" Took " + (System.currentTimeMillis() - startTime) + " ms to run");
+ LogWriter.println("Finishing calculateClusters: Iteration " + iteration + ", centroid distances: " + distance, 3);
+ LogWriter.println(" Took " + (System.currentTimeMillis() - startTime) + " ms to run", 3);
return distance;
}
}
diff --git a/src/ac/ed/lurg/yield/YieldClusterPoint.java b/src/ac/ed/lurg/yield/YieldClusterPoint.java
index 34814f4463f6402eaadbda6088914ba2efc4a318..7ffb46d1eac8d129c5b98993d16b3a267445e1cc 100644
--- a/src/ac/ed/lurg/yield/YieldClusterPoint.java
+++ b/src/ac/ed/lurg/yield/YieldClusterPoint.java
@@ -3,11 +3,9 @@ package ac.ed.lurg.yield;
import java.util.Arrays;
import java.util.Collection;
-import ac.ed.lurg.carbon.CarbonFluxItem;
import ac.ed.lurg.forestry.WoodYieldItem;
import ac.ed.lurg.landuse.IrrigationItem;
import ac.ed.lurg.types.CropType;
-import ac.ed.lurg.types.LandCoverType;
import ac.ed.lurg.types.YieldType;
import ac.ed.lurg.utils.cluster.ClusteringPoint;
import ac.sac.raster.RasterKey;
diff --git a/src/ac/ed/lurg/yield/YieldResponse.java b/src/ac/ed/lurg/yield/YieldResponse.java
index aefcc740829559ce3c95a6dd44321a49041f7e73..f6d661685db4f5eeaa10a5db4d85134c7bc644ad 100644
--- a/src/ac/ed/lurg/yield/YieldResponse.java
+++ b/src/ac/ed/lurg/yield/YieldResponse.java
@@ -74,7 +74,7 @@ public class YieldResponse {
//LogWriter.println(String.format("fertParm from solver: asymptoteYieldIncNoI: %.2f, asymptoteYieldIncI: %.2f, fertParm %.4f", asymptoteYieldIncNoI, asymptoteYieldIncI, fertParm));
if (Double.isNaN(asymptoteYieldIncI) || Double.isNaN(fertParm)) {
- LogWriter.println("Not finding a suitable extrapolating solution. Defaulting to old style");
+ LogWriter.println("Not finding a suitable extrapolating solution. Defaulting to old style", 2);
}
else {
yieldsExtrapolated = new HashMap<YieldType, Double>();
diff --git a/src/ac/sac/raster/AbstractTabularRasterReader.java b/src/ac/sac/raster/AbstractTabularRasterReader.java
index abd73f1a149619762314b185d831f27680de8c90..f29bd01a082b2bd8ab158225c2ea557e0ec1e9ca 100644
--- a/src/ac/sac/raster/AbstractTabularRasterReader.java
+++ b/src/ac/sac/raster/AbstractTabularRasterReader.java
@@ -81,7 +81,7 @@ public abstract class AbstractTabularRasterReader<D extends RasterItem> {
rowValues.put(dataColNames[i], d);
}
catch (Exception e) {
- LogWriter.println("Problem getting col: " + i + " for x: " + x + ", y: " + y + " - " + e.getMessage());
+ LogWriter.printlnError("Problem getting col: " + i + " for x: " + x + ", y: " + y + " - " + e.getMessage());
}
}
diff --git a/src/ac/sac/raster/RasterSet.java b/src/ac/sac/raster/RasterSet.java
index e5f559bf06c534ca4d1ff673cce97b081f1518da..6e68d582453e725d111b220e9d701bf780486b59 100755
--- a/src/ac/sac/raster/RasterSet.java
+++ b/src/ac/sac/raster/RasterSet.java
@@ -65,7 +65,7 @@ public class RasterSet<D extends RasterItem> extends HashMap<RasterKey, D> {
// header.getNrows() - 1, lower left basis. Minus 1 as nrows is number, but indexed from zero
int row = header.getNrows() - 1 - (int)((source_y - header.getYllCorner())/header.getYCellSize() + 0.01);
if (row < 0 || col < 0) {
- LogWriter.println("Got negative row or col values: " + row + ", "+ col);
+ LogWriter.printlnWarning("Got negative row or col values: " + row + ", "+ col);
}
return new RasterKey(col, row);
}