From 324861c517714b5031ecea94c7ec189035b53944 Mon Sep 17 00:00:00 2001
From: R0slyn <roslyn.henry.08@aberdeen.ac.uk>
Date: Tue, 15 Aug 2017 15:24:48 +0100
Subject: [PATCH] removing 0.4 in runoff*0.4, no longer needed as not back
calculating
---
src/ac/ed/lurg/landuse/IrrigationRasterSet.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/ac/ed/lurg/landuse/IrrigationRasterSet.java b/src/ac/ed/lurg/landuse/IrrigationRasterSet.java
index c3c39ad8..4cd9d8fa 100644
--- a/src/ac/ed/lurg/landuse/IrrigationRasterSet.java
+++ b/src/ac/ed/lurg/landuse/IrrigationRasterSet.java
@@ -51,11 +51,8 @@ public class IrrigationRasterSet extends RasterSet<IrrigationItem> {
}
- Double fpuRunOffAvailable = fpuRunOff * 0.4 * ModelConfig.ENVIRONMENTAL_WATER_CONSTRAINT; // 0.4
- // from
- // elliott
- // paper
-
+ Double fpuRunOffAvailable = fpuRunOff * ModelConfig.ENVIRONMENTAL_WATER_CONSTRAINT;
+
otherUses = fpuManager.fpuOtherUses.get(fpu.getInt()).get(year) * waterAvailabilityAdj;
if (fpuRunOffAvailable - otherUses < 0) {
waterAvailForIrrigPerCell = 0;
--
GitLab