Set max irrig amount for setaside to get zero intensity for that crop

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

@@ -204,8 +204,14 @@ public class GamsLocationOptimiser {
 			IrrigationItem irrigationItem = irrigationData.get(locationId);
 
 			for (CropType crop : CropType.getNonMeatTypes()) {
-				if (crop.equals(CropType.SETASIDE))
+				Vector<String> v = new Vector<String>();
+				v.add(crop.getGamsName());
+				v.add(locString);
+				
+				if (crop.equals(CropType.SETASIDE)) {
+					setGamsParamValue(irrigMaxP.addRecord(v), 1000, 3);  // need to set this to any positive value to give an incentive not to irrigate setaside
 					continue;
+				}
 				
 				double maxIrrig = irrigationItem.getMaxIrrigAmount(crop);
 				
@@ -213,10 +219,6 @@ public class GamsLocationOptimiser {
 						locationId, crop.getGamsName(), yresp.getYieldNone(crop), yresp.getYieldFertOnly(crop), yresp.getYieldIrrigOnly(crop), yresp.getYieldMax(crop), 
 						yresp.getFertParam(crop), yresp.getIrrigParam(crop), maxIrrig));
 
-				Vector<String> v = new Vector<String>();
-				v.add(crop.getGamsName());
-				v.add(locString);
-
 				setGamsParamValue(yNoneP.addRecord(v), yresp.getYieldNone(crop), 4);
 				setGamsParamValue(y_fert.addRecord(v), yresp.getYieldFertOnly(crop), 4);
 				setGamsParamValue(y_irrig.addRecord(v), yresp.getYieldIrrigOnly(crop), 4);