diff --git a/GAMS/IntExtOpt.gms b/GAMS/IntExtOpt.gms
index c4dce80df9b22de9b29c95d436c0252fb46c41bb..593bdfbe38e57a69aec039ea4f897318b883332b 100644
--- a/GAMS/IntExtOpt.gms
+++ b/GAMS/IntExtOpt.gms
@@ -5,8 +5,8 @@
SET not_feed_crops(crop) / fruits, starchyRoots, treenuts, vegetables, pulses, pasture_or_meat /;
SET location;
- PARAMETER suitableLandArea(location) areas of land in ha;
- PARAMETER previousArea(crop, location) areas for previous timestep in ha;
+ PARAMETER suitableLandArea(location) areas of land in Mha;
+ PARAMETER previousArea(crop, location) areas for previous timestep in Mha;
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;
@@ -46,14 +46,14 @@ $gdxin
pasture_or_meat 1.0 / ;
VARIABLES
- area(crop, location) total area for each crop - ha
+ area(crop, location) total area for each crop - 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) other intensity for each crop - unit less
- feedAmount(crop) amount of feed for each crop - t
- netImportAmount(crop) export of crop - t
+ feedAmount(crop) amount of feed for each crop - Mt
+ netImportAmount(crop) export of crop - Mt
yield(crop, location) yield per area for each crop - t per ha
- unitEnergy(crop, location) energy per area for each crop - energy
+ unitEnergy(crop, location) energy per area for each crop - energy
energy total input energy - energy;
POSITIVE VARIABLE area, fertI, irrigI, otherIntensity, feedAmount;
@@ -107,13 +107,13 @@ $gdxin
TOTAL_LAND_CHANGE_CONSTRAINT(location) .. suitableLandArea(location) =G= sum(crop, area(crop, location));
- CROPLAND_CHANGE_CONSTRAINT(location) .. 1 - sum(crop_less_pasture, area(crop_less_pasture, location))/sum(crop_less_pasture, previousArea(crop_less_pasture, location)) =L= maxLandUseChange;
+ CROPLAND_CHANGE_CONSTRAINT(location) .. 1 - sum(crop_less_pasture, area(crop_less_pasture, location)) =L= maxLandUseChange * sum(crop_less_pasture, previousArea(crop_less_pasture, location));
- PASTURE_CHANGE_CONSTRAINT(location) .. 1 - area('pasture_or_meat', location)/previousArea('pasture_or_meat', location) =L= maxLandUseChange;
+ PASTURE_CHANGE_CONSTRAINT(location) .. 1 - area('pasture_or_meat', location) =L= maxLandUseChange * previousArea('pasture_or_meat', location);
- AGRI_LAND_INCREASE_CONSTRAINT(location) .. sum(crop, area(crop, location)) / sum(crop, previousArea(crop, location)) =L= 1 + maxLandUseChange;
+ AGRI_LAND_INCREASE_CONSTRAINT(location) .. sum(crop, area(crop, location)) =L= (1 + maxLandUseChange) * sum(crop, previousArea(crop, location));
- AGRI_LAND_DECREASE_CONSTRAINT(location) .. sum(crop, area(crop, location)) / sum(crop, previousArea(crop, location)) =G= 1 - maxLandUseChange;
+ AGRI_LAND_DECREASE_CONSTRAINT(location) .. sum(crop, area(crop, location)) =G= (1 - maxLandUseChange) * sum(crop, previousArea(crop, location));
NON_FEED_CROP_CONSTRAINT(not_feed_crops) .. feedAmount(not_feed_crops) =E= 0;
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index 31855f97a03aff0fc08aead3ee084018e13473c7..005a539f867109a0db0fd55432c98c9e8a9680fc 100644
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -96,7 +96,7 @@ public class ModelConfig {
public static final String COMMODITY_DATA_FILE = DATA_DIR + File.separator + "con_prod_c.csv";
// Spatial (gridded) data
- public static final String SPATIAL_DATA_DIR = DATA_DIR + File.separator + "tinyTest";
+ public static final String SPATIAL_DATA_DIR = DATA_DIR; // + File.separator + "tinyTest";
public static final String LPJG_YIELD_FILE = SPATIAL_DATA_DIR + File.separator + "yield_gfdl.out";
public static final String INITAL_LAND_COVER_DIR = SPATIAL_DATA_DIR + File.separator + "initLandUse";
public static final String COUNTRY_BOUNDARY_FILE = SPATIAL_DATA_DIR + File.separator + "country_boundaries.asc";
diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java
index 71b969558eae8e06cecefdae075fd574995d7b85..4e1a4b0edb56d2239f095fadc354324c5b7e2ab8 100644
--- a/src/ac/ed/lurg/ModelMain.java
+++ b/src/ac/ed/lurg/ModelMain.java
@@ -2,6 +2,7 @@ package ac.ed.lurg;
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -72,7 +73,9 @@ public class ModelMain {
// CropToDoubleMap totalImportCommodities = new CropToDoubleMap();
// CropToDoubleMap totalExportCommodities = new CropToDoubleMap();
+
for (CountryAgent ca : countryAgents) {
+
LogWriter.println("Country " + ca.getCountry());
Collection<RasterKey> countryKeys = countryToKeysMap.get(ca.getCountry());
YieldRaster countryYieldSurfaces = yieldSurfaces.getSubsetRasterForKeys(countryKeys);
@@ -80,6 +83,11 @@ public class ModelMain {
// do the optimization
GamsRasterOutput result = ca.determineProduction(timestep, countryYieldSurfaces, prevWorldInputEnergy);
+ if (result == null) {
+ LogWriter.printlnError("No results for " + ca.getCountry());
+ continue;
+ }
+
RasterSet<AreasItem> cropAreaR = result.getCropAreaRaster();
RasterSet<IntensitiesItem> intensityR = result.getIntensityRaster();
@@ -92,8 +100,10 @@ public class ModelMain {
Double area = areas.getCropArea(crop);
Intensity intensity = intensities.getIntensity(crop);
- totalArea.incrementValue(crop, area);
- totalWorldInputEnergy.incrementValue(crop, area * intensity.getUnitEnergy());
+ if (intensity != null) {
+ totalArea.incrementValue(crop, area);
+ totalWorldInputEnergy.incrementValue(crop, area * intensity.getUnitEnergy());
+ }
}
}
@@ -148,15 +158,39 @@ public class ModelMain {
RasterSet<IrrigationCostItem> allIrrigationCosts = getIrrigationCosts();
Map<Country, Map<CropType, CommodityData>> commodityDataMap = CommodityData.readCommodityData();
+ HashSet<String> countryExclusionList = new HashSet<String>(Arrays.asList("French Polynesia", "Cabo Verde", "Samoa", "Saint Vincent and the Grenadines"));
+
for (Map.Entry<Country, List<RasterKey>> entry : countryToKeysMap.entrySet()) {
Country country = entry.getKey();
List<RasterKey> keys = entry.getValue();
+
+
+ // DEBUG code
+ if (!country.getCountryName().equals("Netherlands")) {
+ continue;
+ }
+
+
+
+ if (countryExclusionList.contains(country.getCountryName())) {
+ LogWriter.printlnError("Skipping " + country);
+ continue;
+ }
+
RasterSet<LandCoverItem> initCountryLC = initLC.popSubsetForKeys(new RasterSet<LandCoverItem>(), keys);
RasterSet<IrrigationCostItem> irrigationCosts = allIrrigationCosts.popSubsetForKeys(new RasterSet<IrrigationCostItem>(), keys);
Map<CropType, CommodityData> countryCommodityData = commodityDataMap.get(country);
-
- CountryAgent ca = new CountryAgent(demandManager, country, initCountryLC, irrigationCosts, countryCommodityData);
- countryAgents.add(ca);
+
+ if (countryCommodityData == null) {
+ LogWriter.printlnError("No commodities data for " +country + ", so skipping");
+ }
+ else if (initCountryLC.size() == 0) {
+ LogWriter.printlnError("No initial land cover for " +country + ", so skipping");
+ }
+ else {
+ CountryAgent ca = new CountryAgent(demandManager, country, initCountryLC, irrigationCosts, countryCommodityData);
+ countryAgents.add(ca);
+ }
}
return countryAgents;
@@ -178,7 +212,7 @@ public class ModelMain {
LandCoverReader lcReader = new LandCoverReader(initLC, landType);
initLC = lcReader.getRasterDataFromFile(rootDir + landType.getFileName());
}
-
+
return initLC;
}
diff --git a/src/ac/ed/lurg/country/CountryAgent.java b/src/ac/ed/lurg/country/CountryAgent.java
index 8c63de10a1d2036f631d4bfc4058b429176aeaaf..b70ce34ddd0bbe45a32456c5c50f504aa39dad5c 100644
--- a/src/ac/ed/lurg/country/CountryAgent.java
+++ b/src/ac/ed/lurg/country/CountryAgent.java
@@ -54,15 +54,9 @@ public class CountryAgent {
RasterKey key = entry.getKey();
LandCoverItem landCover = entry.getValue();
- double cellArea = key.getHalfDegreeArea();
-
if (landCover != null) {
- areasItem.setCropArea(CropType.CEREALS, landCover.getLandCover(LandDataType.CROPLAND) * cellArea); // we allow free substitution between crop types so this is ok-ish
- areasItem.setCropArea(CropType.MEAT_OR_PASTURE, landCover.getLandCover(LandDataType.PASTURE) * cellArea);
-
- areasItem.setLandCoverArea(LandDataType.LAND, landCover.getLandCover(LandDataType.LAND) * cellArea);
- areasItem.setLandCoverArea(LandDataType.FOREST, landCover.getLandCover(LandDataType.FOREST) * cellArea);
- areasItem.setLandCoverArea(LandDataType.OTHER_NATURAL, landCover.getLandCover(LandDataType.OTHER_NATURAL) * cellArea);
+ areasItem.setCropArea(CropType.CEREALS, landCover.getLandCover(LandDataType.CROPLAND)); // we allow free substitution between crop types so this is ok-ish
+ areasItem.setCropArea(CropType.MEAT_OR_PASTURE, landCover.getLandCover(LandDataType.PASTURE));
}
cropAreaRaster.put(key, areasItem);
@@ -82,14 +76,24 @@ public class CountryAgent {
int year = ModelConfig.BASE_YEAR + currentTimestep;
currentProjectedDemand = demandManager.getDemand(country, year);
- // optimize areas and intensity
- GamsRasterInput input = getGamsRasterInput(worldInputEnergy);
- GamsRasterOptimiser opti = new GamsRasterOptimiser(input);
- LogWriter.println("Running " + country.getCountryName() + ", currentTimestep " + currentTimestep);
+ if (currentProjectedDemand.size() == 0) {
+ LogWriter.printlnError("No demand for country " + country + " so skipping it");
+ }
+ else if (countryYieldSurfaces.size() == 0 ) {
+ LogWriter.printlnError("No yield values for " + country + " so skipping it");
+ }
+ else {
+ // optimize areas and intensity
+ GamsRasterInput input = getGamsRasterInput(worldInputEnergy);
+ GamsRasterOptimiser opti = new GamsRasterOptimiser(input);
+ LogWriter.println("Running " + country.getCountryName() + ", currentTimestep " + currentTimestep);
+
+ GamsRasterOutput result = opti.run();
+ resultsTimeseries.put(timestep, result);
+ return result;
+ }
- GamsRasterOutput result = opti.run();
- resultsTimeseries.put(timestep, result);
- return result;
+ return null;
}
private Map<CropType, Double> getProjectedDemand() {
diff --git a/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java b/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
index af3bb69ec2873a0bb46d0eb00f15d48dfd13f3f0..47bffe07af67fd0526affc91cbf5efbbce31b4bb 100644
--- a/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
+++ b/src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
@@ -29,6 +29,8 @@ import com.gams.api.GAMSWorkspaceInfo;
public class GamsLocationOptimiser {
+ private static final boolean DEBUG = true;
+
private GamsLocationInput inputData;
public GamsLocationOptimiser(GamsLocationInput inputData) {
@@ -62,14 +64,14 @@ public class GamsLocationOptimiser {
}
private void setupInDB(GAMSDatabase inDB) {
- LogWriter.println("\nLocation set");
+ if (DEBUG) LogWriter.println("\nLocation set");
GAMSSet locationSet = inDB.addSet("location", 1);
for (Integer locId : inputData.getPreviousAreas().keySet()) {
- LogWriter.println(" " + locId);
+ if (DEBUG) LogWriter.println(" " + locId);
locationSet.addRecord(locId.toString());
}
- LogWriter.println("\nPrevious crop and land areas");
+ if (DEBUG) LogWriter.println("\nPrevious crop and land areas");
GAMSParameter prevCropP = inDB.addParameter("previousArea", 2);
GAMSParameter landP = inDB.addParameter("suitableLandArea", 1);
@@ -80,7 +82,7 @@ public class GamsLocationOptimiser {
for (CropType cropType : CropType.values()) {
double d = areasItem.getCropArea(cropType);
- LogWriter.println(String.format(" %d %15s,\t %.1f", locationId, cropType.getGamsName(), d));
+ if (DEBUG) LogWriter.println(String.format(" %d %15s,\t %.1f", locationId, cropType.getGamsName(), d));
Vector<String> v = new Vector<String>();
v.add(cropType.getGamsName());
v.add(locString);
@@ -88,24 +90,24 @@ public class GamsLocationOptimiser {
}
double suitableLand = areasItem.getSuitableLand();
- LogWriter.println(String.format(" %d %15s,\t %.1f", locationId, "suitableLand", suitableLand));
+ if (DEBUG) LogWriter.println(String.format(" %d %15s,\t %.1f", locationId, "suitableLand", suitableLand));
landP.addRecord(locString).setValue(suitableLand);
}
- LogWriter.println("\nIrrigation cost");
+ if (DEBUG) LogWriter.println("\nIrrigation cost");
GAMSParameter irrigCostP = inDB.addParameter("irrigCost", 1);
for (Entry<Integer, ? extends IrrigationCostItem> entry : inputData.getIrrigationCosts().entrySet()) {
Integer locationId = entry.getKey();
IrrigationCostItem irrigCostItem = entry.getValue();
double irrigCost = irrigCostItem.getIrrigCost();
- LogWriter.println(String.format(" %d %15s,\t %.1f", locationId, "irrigCost", irrigCost));
+ if (DEBUG) LogWriter.println(String.format(" %d %15s,\t %.1f", locationId, "irrigCost", irrigCost));
irrigCostP.addRecord(Integer.toString(locationId)).setValue(irrigCost);
}
- LogWriter.println("\nDemand");
+ if (DEBUG) LogWriter.println("\nDemand");
addItemMapParm(inDB.addParameter("demand", 1), inputData.getCountryInput().getProjectedDemand());
- LogWriter.println("\nYieldNone");
+ if (DEBUG) LogWriter.println("\nYieldNone");
GAMSParameter yNoneP = inDB.addParameter("yieldNone", 2);
GAMSParameter y_fert = inDB.addParameter("yieldFertOnly", 2);
GAMSParameter y_irrig = inDB.addParameter("yieldIrrigOnly", 2);
@@ -119,7 +121,7 @@ public class GamsLocationOptimiser {
YieldResponsesItem yresp = entry.getValue();
for (CropType crop : CropType.values()) {
- LogWriter.println(String.format(" %15s,\t %.1f", crop.getGamsName(), yresp.getYieldNone(crop)));
+ if (DEBUG) LogWriter.println(String.format(" %15s,\t %.1f", crop.getGamsName(), yresp.getYieldNone(crop)));
Vector<String> v = new Vector<String>();
v.add(crop.getGamsName());
@@ -134,13 +136,13 @@ public class GamsLocationOptimiser {
}
}
- LogWriter.println("\nWorld input energy");
+ if (DEBUG) LogWriter.println("\nWorld input energy");
addItemMapParm(inDB.addParameter("worldInputEnergy", 1), inputData.getCountryInput().getWorldInputEnergy());
- LogWriter.println("\nMax Net Import");
+ if (DEBUG) LogWriter.println("\nMax Net Import");
addItemMapParm(inDB.addParameter("maxNetImport", 1), inputData.getCountryInput().getMaxNetImport());
- LogWriter.println("\nMin Net Import");
+ if (DEBUG) LogWriter.println("\nMin Net Import");
addItemMapParm(inDB.addParameter("minNetImport", 1), inputData.getCountryInput().getMinNetImport());
addScalar(inDB.addParameter("meatEfficency", 0), inputData.getCountryInput().getMeatEfficiency());
@@ -190,11 +192,11 @@ public class GamsLocationOptimiser {
netImport = varNetImports.findRecord(itemName).getLevel();
commoditiesData.put(cropType, new CommodityData(feedAmount, netImport));
- LogWriter.println(String.format("\n%s:\tfeedAmount= %.1f,\tnetImports= %.3f", itemName, feedAmount, netImport));
+ if (DEBUG) LogWriter.println(String.format("\n%s:\tfeedAmount= %.1f,\tnetImports= %.3f", itemName, feedAmount, netImport));
}
if (area > 0) {
- LogWriter.println(String.format("\t location %s, %s:\tarea= %.1f,\tfert= %.3f,\tirrg= %.3f,\tintensity= %.3f",
+ if (DEBUG) LogWriter.println(String.format("\t location %s, %s:\tarea= %.1f,\tfert= %.3f,\tirrg= %.3f,\tintensity= %.3f",
locationName, itemName, area, fertIntensity, irrigIntensity, otherIntensity));
IntensitiesItem intensityItem = intensities.get(locId);
@@ -214,7 +216,7 @@ public class GamsLocationOptimiser {
}
prevCropType = cropType;
}
- LogWriter.println(String.format("\nTotal area= %.1f", totalArea));
+ if (DEBUG) LogWriter.println(String.format("\nTotal area= %.1f", totalArea));
GamsLocationOutput results = new GamsLocationOutput(modelStatus, intensities, cropAreas, commoditiesData);
return results ;
@@ -226,8 +228,10 @@ public class GamsLocationOptimiser {
private void addItemMapParm(GAMSParameter parm, Map<CropType, Double> itemMap) {
for (Map.Entry<CropType, Double> entry : itemMap.entrySet()) {
- LogWriter.println(String.format(" %15s,\t %.1f", entry.getKey().getGamsName(), entry.getValue()));
- parm.addRecord(entry.getKey().getGamsName()).setValue(entry.getValue());
+ double d = entry.getValue();
+ if (DEBUG) LogWriter.println(String.format(" %15s,\t %.1f", entry.getKey().getGamsName(), d));
+ if (!Double.isNaN(d))
+ parm.addRecord(entry.getKey().getGamsName()).setValue(d);
}
}
diff --git a/src/ac/ed/lurg/country/gams/GamsLocationTest.java b/src/ac/ed/lurg/country/gams/GamsLocationTest.java
index 58ee76b7b4528dce79b8710e62d05a0d66d70840..d0430e73a0a01ed5a773746cab6fac64d5c272f5 100644
--- a/src/ac/ed/lurg/country/gams/GamsLocationTest.java
+++ b/src/ac/ed/lurg/country/gams/GamsLocationTest.java
@@ -103,7 +103,6 @@ public class GamsLocationTest {
dummyMap.setCropArea(CropType.MEAT_OR_PASTURE, 5.0 + pasture);
dummyMap.setCropArea(CropType.TREENUTS, 5.0);
- dummyMap.setLandCoverArea(LandDataType.LAND, 400);
dummyMap.setLandCoverArea(LandDataType.FOREST, 200 - pasture - cereal);
dummyMap.setLandCoverArea(LandDataType.OTHER_NATURAL, 30);
return dummyMap;
diff --git a/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java b/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java
index 4e1b588bb842ec5ef2411d0be561e9192fde8c5b..5ad644940c3fdf44a13f305c9c7430125591c4cd 100644
--- a/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java
+++ b/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java
@@ -1,6 +1,7 @@
package ac.ed.lurg.country.gams;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -24,7 +25,7 @@ import ac.sac.raster.RasterKey;
import ac.sac.raster.RasterSet;
public class GamsRasterOptimiser {
- public static final boolean DEBUG = true;
+ public static final boolean DEBUG = false;
private GamsRasterInput rasterInputData;
private LazyHashMap<Integer, Set<RasterKey>> mapping;
@@ -63,7 +64,7 @@ public class GamsRasterOptimiser {
Set<RasterKey> keys = mapping.get(locId);
CropToDouble cropChangeTotals = newAreaAggItem.getCropChanges(prevAreaAggItem);
- LogWriter.println("Processing location id " + locId);
+ if (DEBUG) LogWriter.println("Processing location id " + locId);
double shortfall = allocAllAreasForAgg(newAreaRaster, prevAreaRaster, keys, cropChangeTotals);
if (shortfall > 0)
@@ -80,7 +81,7 @@ public class GamsRasterOptimiser {
CropToDouble avgCropChange = cropChange.scale(1.0/keys.size());
for (RasterKey key : keys) {
- LogWriter.println(" Processing raster key " + key);
+ if (DEBUG) LogWriter.println(" Processing raster key " + key);
AreasItem prevAreasRasterItem = prevAreaRaster.get(key);
AreasItem newAreasRasterItem = new AreasItem();
@@ -94,7 +95,7 @@ public class GamsRasterOptimiser {
}
if (totalShortfall > 0 & keysWithSpace.size() > 0) { // more to allocate and some free areas to allocate into
- LogWriter.println("A total area of " + totalShortfall + " is unallocated, so trying again with areas with space");
+ if (DEBUG) LogWriter.println("A total area of " + totalShortfall + " is unallocated, so trying again with areas with space");
double factor = totalShortfall / cropChange.getTotal();
allocAllAreasForAgg(newAreaRaster, newAreaRaster, keysWithSpace, cropChange.scale(factor));
@@ -132,7 +133,6 @@ public class GamsRasterOptimiser {
// enough space to keep 50/50 allocation
}
- newAreasRasterItem.setLandCoverArea(LandDataType.LAND, prevAreasRasterItem.getLandCoverArea(LandDataType.LAND));
newAreasRasterItem.setLandCoverArea(LandDataType.FOREST, prevForest - forestRemoved);
newAreasRasterItem.setLandCoverArea(LandDataType.OTHER_NATURAL, prevNatural - naturalRemoved);
@@ -175,7 +175,7 @@ public class GamsRasterOptimiser {
List<Double> pastureDivisions = getDivisions(yieldRaster, CropType.MEAT_OR_PASTURE, 2);
int numCerealCats = (1+cerealDivisions.size());
- LogWriter.println("Making " + numCerealCats * (1+pastureDivisions.size()) + " categories");
+ if (DEBUG) LogWriter.println("Making " + numCerealCats * (1+pastureDivisions.size()) + " categories");
LazyHashMap<Integer, AveragingYieldResponsesItem> aggregatedYields = new LazyHashMap<Integer, AveragingYieldResponsesItem>() {
protected AveragingYieldResponsesItem createValue() { return new AveragingYieldResponsesItem(); }
@@ -193,31 +193,56 @@ public class GamsRasterOptimiser {
for (Entry<RasterKey, YieldResponsesItem> entry : yieldRaster.entrySet()) {
YieldResponsesItem yresp = entry.getValue();
RasterKey key = entry.getKey();
- AreasItem cropAreas = cropAreaRaster.get(key);
- IrrigationCostItem irrigCost = irrigCostRaster.get(key);
+
+ if (yresp == null) {
+ LogWriter.printlnError("No YieldResponsesItem for " + key);
+ }
+ else {
+ //LogWriter.println("YieldResponsesItem found for " + key);
+
+ AreasItem cropAreas = cropAreaRaster.get(key);
+ if (cropAreas == null) {
+ LogWriter.printlnError("GamsRasterOptimiser: Can't find cropAreas for " + key);
+ continue;
+ }
+
+ IrrigationCostItem irrigCost = irrigCostRaster.get(key);
+
+ int cerealCat = findCategory(cerealDivisions, yresp.getYieldMax(CropType.CEREALS));
+ int pastureCat = findCategory(pastureDivisions, yresp.getYieldMax(CropType.MEAT_OR_PASTURE));
+ Integer id = cerealCat + pastureCat * numCerealCats;
+
+ AveragingYieldResponsesItem avgYResp = aggregatedYields.lazyGet(id);
+ AreasItem aggAreas = aggregatedAreas.lazyGet(id);
+ IrrigationCostItem avgIrigCost = aggregatedIrrigCosts.lazyGet(id);
+ mapping.lazyGet(id).add(entry.getKey());
+
+ // Irrigation cost
+ double suitableAreaThisTime = cropAreas.getSuitableLand();
+ if (irrigCost!= null && suitableAreaThisTime > 0) {
+ double areaSoFar = aggAreas.getSuitableLand();
+ avgIrigCost.setIrrigCost((avgIrigCost.getIrrigCost()*areaSoFar + suitableAreaThisTime*irrigCost.getIrrigCost()) / (areaSoFar + suitableAreaThisTime));
+ LogWriter.println(id + ", " + key + ", " + avgIrigCost.getIrrigCost() + ", from " + areaSoFar + ", " + suitableAreaThisTime + ", " + irrigCost.getIrrigCost());
+ }
+
+ // Crop yields
+ for (CropType crop : CropType.values()) {
+ for (YieldType yieldType : YieldType.values()) {
+ avgYResp.setYield(yieldType, crop, yresp.getYield(yieldType, crop));
+ }
- int cerealCat = findCategory(cerealDivisions, yresp.getYieldMax(CropType.CEREALS));
- int pastureCat = findCategory(pastureDivisions, yresp.getYieldMax(CropType.MEAT_OR_PASTURE));
- Integer id = cerealCat + pastureCat * numCerealCats;
-
- AveragingYieldResponsesItem avgYResp = aggregatedYields.lazyGet(id);
- AreasItem aggAreas = aggregatedAreas.lazyGet(id);
- IrrigationCostItem avgIrigCost = aggregatedIrrigCosts.lazyGet(id);
- mapping.lazyGet(id).add(entry.getKey());
-
- for (CropType crop : CropType.values()) {
- for (YieldType yieldType : YieldType.values()) {
- avgYResp.setYield(yieldType, crop, yresp.getYield(yieldType, crop));
+ double areaSoFar = aggAreas.getCropArea(crop);
+ double areaThisTime = cropAreas.getCropArea(crop);
+ aggAreas.setCropArea(crop, areaSoFar + areaThisTime);
+ }
+
+ // Land cover, we only need forest and other natural
+ for (LandDataType landType : Arrays.asList(LandDataType.FOREST, LandDataType.OTHER_NATURAL)) {
+ double areaThisTime = cropAreas.getLandCoverArea(landType);
+ double areaSoFar = aggAreas.getLandCoverArea(landType);
+ aggAreas.setLandCoverArea(landType, areaSoFar + areaThisTime);
}
- double areaSoFar = aggAreas.getCropArea(crop);
- double areaThisTime = cropAreas.getCropArea(crop);
- aggAreas.setCropArea(crop, areaSoFar + areaThisTime);
}
-
- double areaSoFar = aggAreas.getLandCoverArea(LandDataType.LAND);
- double areaThisTime = cropAreas.getLandCoverArea(LandDataType.LAND);
- avgIrigCost.setIrrigCost((avgIrigCost.getIrrigCost()*areaSoFar + areaThisTime*irrigCost.getIrrigCost()) / (areaSoFar + areaThisTime));;
- aggAreas.setLandCoverArea(LandDataType.LAND, areaSoFar + areaThisTime);
}
if (DEBUG) {
@@ -248,11 +273,14 @@ public class GamsRasterOptimiser {
List<Double> yieldValues = new ArrayList<Double>();
for (YieldResponsesItem yresp : yieldRaster.values()) {
- if (yresp != null) {
+ if (yresp == null) {
+ LogWriter.println("GamsRasterOptimiser: Can't get value for crop " + crop);
+ }
+ else {
double d = yresp.getYieldMax(crop);
if (Double.isNaN(d))
- LogWriter.println("Can't get value for crop " + crop);
+ LogWriter.println("GamsRasterOptimiser: Got NaN value for crop " + crop);
else
yieldValues.add(d);
}
diff --git a/src/ac/ed/lurg/demand/BaseConsumpManager.java b/src/ac/ed/lurg/demand/BaseConsumpManager.java
index 9b6ad97bda53385dd800eb734e94915d46af3f47..e0dc1d8f698a58ffe4501b4488d994ecc4227563 100644
--- a/src/ac/ed/lurg/demand/BaseConsumpManager.java
+++ b/src/ac/ed/lurg/demand/BaseConsumpManager.java
@@ -54,6 +54,11 @@ public class BaseConsumpManager {
}
public double get(Country country, CropType crop) {
- return baseConsumpMap.get(new CountryCropKey(country, crop));
+ Double d = baseConsumpMap.get(new CountryCropKey(country, crop));
+ if (d == null) {
+ LogWriter.printlnError("BaseConsumpManager: can't get value for " + crop + ", " + country);
+ return Double.NaN;
+ }
+ return d.doubleValue();
}
}
diff --git a/src/ac/ed/lurg/landuse/LandCoverItem.java b/src/ac/ed/lurg/landuse/LandCoverItem.java
index e01d39a654e7833b80084879b3653f71225bcb7c..32eeb82c8697e981196e27c2918cf3d2934dfd37 100644
--- a/src/ac/ed/lurg/landuse/LandCoverItem.java
+++ b/src/ac/ed/lurg/landuse/LandCoverItem.java
@@ -12,6 +12,7 @@ public class LandCoverItem implements RasterItem {
Map<LandDataType, Double> landcover = new HashMap<LandDataType, Double>();
+ /** Area in Mha */
public Double getLandCover(LandDataType landType) {
return landcover.get(landType);
}
@@ -19,7 +20,7 @@ public class LandCoverItem implements RasterItem {
public void setLandCover(LandDataType landType, double d) {
landcover.put(landType, d);
}
-
+
/*public double getTotal() {
double total = 0;
for (double d : landcover.values()) {
diff --git a/src/ac/ed/lurg/types/LandDataType.java b/src/ac/ed/lurg/types/LandDataType.java
index 5794c3f5622bee4c67f68eeb9a0b2574bc488419..9c0859495368a1bb8b432d4345229cc04ac027d4 100644
--- a/src/ac/ed/lurg/types/LandDataType.java
+++ b/src/ac/ed/lurg/types/LandDataType.java
@@ -2,7 +2,7 @@ package ac.ed.lurg.types;
public enum LandDataType {
- LAND ("land"),
+// LAND ("land"),
FOREST ("forest"),
OTHER_NATURAL ("otherNatural"),
CROPLAND ("cropland"),
diff --git a/src/ac/sac/raster/AbstractRasterReader.java b/src/ac/sac/raster/AbstractRasterReader.java
index b0f71a2953ec551ddf85d151cba8390318de181e..4812275f50f08d638494022045b4b9332dbcd8d0 100755
--- a/src/ac/sac/raster/AbstractRasterReader.java
+++ b/src/ac/sac/raster/AbstractRasterReader.java
@@ -100,7 +100,7 @@ public abstract class AbstractRasterReader<D extends RasterItem> {
for (String token : tokens) {
- if (dataset.getHeaderDetails().getNodataString().equals(token)) {
+ if (header.getNodataString().equals(token)) {
if (DEBUG) LogWriter.println(",");
}
else {