changes to protected areas setup

src/ac/ed/lurg/ModelMain.java

@@ -583,6 +583,7 @@ public class ModelMain {
 			areasItem.setCropFraction(CropType.WHEAT, 0.5); // random start as don't have better data
 			areasItem.setCropFraction(CropType.MAIZE, 0.5);
 			areasItem.setProtectedArea(landCover.getProtectedArea());
+			areasItem.setUnavailableFract(landCover.getUnavailableFract());
 			landUseRaster.put(key, areasItem);
 		}
 		//outputAreas(initialLC);

src/ac/ed/lurg/landuse/LandCoverItem.java

@@ -43,8 +43,12 @@ public class LandCoverItem implements RasterItem {
 		this.proportionProtectedFract=proportionProtectedFract;
 	}
 	
-	public double getProtectedArea(){
-		return Math.max(proportionProtectedFract, unavailableFract)*totalArea;
+	public double getProtectedArea(){ 
+		return proportionProtectedFract*totalArea;
+	}
+	
+	public double getUnavailableFract(){
+		return unavailableFract;
 	}
 	
 	public void setMaxCropFraction(double maxCropFraction){

src/ac/ed/lurg/landuse/LandUseItem.java

@@ -20,6 +20,7 @@ public class LandUseItem implements InterpolatingRasterItem<LandUseItem>, Serial
 	private Map<CropType, Double> cropFractions = new HashMap<CropType, Double>();
 	private Map<LandCoverType, Double> landCoverAreas = new HashMap<LandCoverType, Double>();
 	private double protectedArea; //protected area in Mha
+	private double unavailableFract; //area unavailable due to altitude etc 
 	
 	public LandUseItem() {}
 	
@@ -36,15 +37,16 @@ public class LandUseItem implements InterpolatingRasterItem<LandUseItem>, Serial
 	}
 	
 	public double getProtectedAreaIncMinNatural() {
+		
+		double protectedLand = 0;
 		double minOrProtectedA = 0;
-		double protectedA = 0;
-		double minNatural = getTotalLandCoverArea() * ModelConfig.MIN_NATURAL_RATE;
+		if(ModelConfig.PROTECTED_AREAS_ENABLED)
+			protectedLand = protectedArea;
 		
-		if (ModelConfig.PROTECTED_AREAS_ENABLED) {
-			protectedA = protectedArea;
-		}
+		double unprotectedLand = getTotalLandCoverArea()-protectedLand;
+		double unsuitableLand = Math.max(unprotectedLand * ModelConfig.MIN_NATURAL_RATE,unprotectedLand*unavailableFract);
 		
-		minOrProtectedA = Math.max(protectedA, minNatural);
+		minOrProtectedA = protectedLand + unsuitableLand;
 		return minOrProtectedA;
 		
 	}
@@ -363,4 +365,8 @@ public class LandUseItem implements InterpolatingRasterItem<LandUseItem>, Serial
 	public String toString() {
 		return "LandUseItem: [landCoverAreas=" + landCoverAreas + ", protectedArea=" + protectedArea + "], suitableLand " +  getSuitableLand();
 	}
+
+	public void setUnavailableFract(double unavailableFract) {
+		this.unavailableFract = unavailableFract;
+	}
 }
\ No newline at end of file