Bringing Bart's recent changes into the inequality branch

Including abandonment of agricultural land

src/ac/ed/lurg/utils/calib/CalibrationManager.java

@@ -114,7 +114,8 @@ public class CalibrationManager implements Serializable {
 
         {
             double adj;
-            if (Math.abs(countryIrrig / baseCountryIrrig - 1) < 0.5 || Math.abs(countryIrrig - baseCountryIrrig) < 1) {
+	    double ratio = countryIrrig / baseCountryIrrig;
+            if ((ratio > 0.5 && ratio < 2) || Math.abs(countryIrrig - baseCountryIrrig) < 1) {
                 adj  = 1;
             } else {
                 adj = 1 + 0.5 * lambda * ((countryIrrig - baseCountryIrrig) / (countryIrrig + baseCountryIrrig));