Offset in irrig constraint now applied as a rate

hind1970/data/halfdeg/fpuGrouping.txt

-fpu,basin
-70,Nile,
+fpu,basin
\ No newline at end of file
-72,Nile
-74,Nile
-146,Nile
-149,Nile
-150,Nile
-203,Nile
-9,Amazon
-10,Amazon
-12,Amazon
-13,Amazon

src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java

-package ac.ed.lurg.country.gams;
+	package ac.ed.lurg.country.gams;
 
 import java.util.HashSet;
 import java.util.Map;

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

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import ac.ed.lurg.ModelConfig;
 import ac.ed.lurg.Timestep;
+import ac.ed.lurg.utils.LogWriter;
 import ac.sac.raster.RasterHeaderDetails;
 import ac.sac.raster.RasterKey;
 import ac.sac.raster.RasterSet;
@@ -28,11 +29,19 @@ public class IrrigationRasterSet extends RasterSet<IrrigationItem> {
 		Map<RasterKey, Double> lpjIrrigConstraints = getIrrigFromLpjRunoff(timestep.getYear(), false);
 		
 		for (Map.Entry<RasterKey, IrrigationItem> entry : entrySet()) {
+			if (entry.getKey().getCol() == 521 & entry.getKey().getRow()==121)
+				LogWriter.println("Found bit of Nepal");
+
 			IrrigationItem irrigItem = entry.getValue();
 			if (irrigItem != null) {
-				Double d = lpjIrrigConstraints.get(entry.getKey());
-				if (d != null)
-					irrigItem.setIrrigConstraint(d + irrigItem.getConstraintOffset());
+				Double lpjConstraint = lpjIrrigConstraints.get(entry.getKey());
+				double d;
+				if (lpjConstraint != null && lpjConstraint > 0 && irrigItem.getConstraintOffset() > 0)
+					d = irrigItem.getConstraintOffset() * lpjConstraint;
+				else
+					d = irrigItem.getBaselineIrrigConstraint();
+				
+				irrigItem.setIrrigConstraint(d);
 			}
 		}
 	}
@@ -41,11 +50,14 @@ public class IrrigationRasterSet extends RasterSet<IrrigationItem> {
 		Map<RasterKey, Double> lpjIrrigConstraints = getIrrigFromLpjRunoff(ModelConfig.ELLIOTT_BASEYEAR, true);
 
 		for (Map.Entry<RasterKey, IrrigationItem> entry : entrySet()) {
+			if (entry.getKey().getCol() == 521 & entry.getKey().getRow()==121)
+				LogWriter.println("Found bit of Nepal");
+			
 			IrrigationItem irrigItem = entry.getValue();
 			if (irrigItem != null) {
 				Double d = lpjIrrigConstraints.get(entry.getKey());
 				if (d != null) {
-					double offset = irrigItem.getBaselineIrrigConstraint() - d;
+					double offset = irrigItem.getBaselineIrrigConstraint()/d;
 					irrigItem.setConstraintOffsets(offset);
 				}
 			}
@@ -58,6 +70,9 @@ public class IrrigationRasterSet extends RasterSet<IrrigationItem> {
 		Collection<WaterBasin> waterBasins = fpuManager.getWaterBasins();
 
 		for (WaterBasin basin : waterBasins) {
+			if (basin.toString().contains("87")) 
+				LogWriter.println("Found Nepal");
+			
 			Collection<RasterKey> rasterKeys = fpuManager.getKeysFor(basin);
 			RasterSet<IrrigationItem> irrigData = createSubsetForKeys(rasterKeys);
 			double basinRunOff = 0.0, otherUses = 0.0, areaOfBasin = 0.0;