Skip to content
Snippets Groups Projects
Commit 6946e69e authored by Peter Alexander's avatar Peter Alexander
Browse files

Change how land cover fraction calculated

parent 97481171
No related branches found
No related tags found
No related merge requests found
......@@ -78,6 +78,15 @@ public class AreasItem implements RasterItem {
landCoverAreas.put(c, d);
}
public double getTotalLandCoverArea() {
double d = 0;
for (LandCoverType l : LandCoverType.values()) {
d += getLandCoverArea(l);
}
return d;
}
public double getSuitableLand() {
double d = 0;
......
......@@ -89,7 +89,13 @@ public class LpjgOutputer {
double lat = cropAreaRaster.getXCoordin(key);
double lon = cropAreaRaster.getYCoordin(key);
double area = cropAreaRaster.getAreaMha(key);
double expectedArea = cropAreaRaster.getAreaMha(key);
double area = item.getTotalLandCoverArea();
if (area > 0 && Math.abs((expectedArea-area)/expectedArea) > 0.01) { // zero area, due to data not being found, already reported so ignored here
LogWriter.printlnError("Land cover areas look strange " + key + ": expected=" + expectedArea + ", actual=" + area);
}
double crop = item.getLandCoverArea(LandCoverType.CROPLAND);
double pasture = item.getLandCoverArea(LandCoverType.PASTURE);
double forest = item.getLandCoverArea(LandCoverType.FOREST);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment