From f45350c10e35ccbf390be6d1aa14c8ce57c25079 Mon Sep 17 00:00:00 2001 From: Edwin Sutanudjaja Date: Wed, 17 Aug 2016 21:30:33 +0200 Subject: [PATCH 1/3] Fixing totalGroundwaterThickness for runs without MODFLOW and without limitFossilGroundwaterAbstraction. --- model/groundwater.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/model/groundwater.py b/model/groundwater.py index 62814b1ed..b23ef7601 100644 --- a/model/groundwater.py +++ b/model/groundwater.py @@ -210,10 +210,12 @@ def __init__(self, iniItems,landmask,spinUp): ##################################################################################################################################################### # total groundwater thickness (unit: m) # - For PCR-GLOBWB, the estimate of total groundwater thickness is needed to estimate for the following purpose: - # - productive aquifer areas (where capillary rise can occur and groundwater depletion can occur) - # - and also to estimate fossil groundwater capacity (the latter is needed only for run without MODFLOW) + # - to estimate fossil groundwater capacity (this is needed only for runs without MODFLOW) + # - to determine productive aquifer areas (where capillary rise can occur and groundwater depletion can occur) (for runs with/without MODFLOW) + # - Note that for runs with MODFLOW, ideally, we want to minimize enormous drawdown in non-productive aquifer areas totalGroundwaterThickness = None - if 'estimateOfTotalGroundwaterThickness' in iniItems.groundwaterOptions.keys(): + if 'estimateOfTotalGroundwaterThickness' in iniItems.groundwaterOptions.keys() and\ + (self.limitFossilGroundwaterAbstraction or self.useMODFLOW): totalGroundwaterThickness = vos.readPCRmapClone(iniItems.groundwaterOptions['estimateOfTotalGroundwaterThickness'], self.cloneMap, self.tmpDir, self.inputDir) From dc2450738773085585f3c6a19366457ee1c2b51c Mon Sep 17 00:00:00 2001 From: Edwin Sutanudjaja Date: Wed, 17 Aug 2016 21:33:46 +0200 Subject: [PATCH 2/3] Fixing totalGroundwaterThickness for runs without MODFLOW and without limitFossilGroundwaterAbstraction. --- model/groundwater.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/model/groundwater.py b/model/groundwater.py index b23ef7601..cbbd3ac1e 100644 --- a/model/groundwater.py +++ b/model/groundwater.py @@ -217,6 +217,8 @@ def __init__(self, iniItems,landmask,spinUp): if 'estimateOfTotalGroundwaterThickness' in iniItems.groundwaterOptions.keys() and\ (self.limitFossilGroundwaterAbstraction or self.useMODFLOW): + print "test" + totalGroundwaterThickness = vos.readPCRmapClone(iniItems.groundwaterOptions['estimateOfTotalGroundwaterThickness'], self.cloneMap, self.tmpDir, self.inputDir) From 32e6c73609246ffc628ee003a06eaf69615a99bc Mon Sep 17 00:00:00 2001 From: Edwin Sutanudjaja Date: Wed, 17 Aug 2016 21:34:20 +0200 Subject: [PATCH 3/3] Fixing totalGroundwaterThickness for runs without MODFLOW and without limitFossilGroundwaterAbstraction. --- model/groundwater.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/model/groundwater.py b/model/groundwater.py index cbbd3ac1e..b23ef7601 100644 --- a/model/groundwater.py +++ b/model/groundwater.py @@ -217,8 +217,6 @@ def __init__(self, iniItems,landmask,spinUp): if 'estimateOfTotalGroundwaterThickness' in iniItems.groundwaterOptions.keys() and\ (self.limitFossilGroundwaterAbstraction or self.useMODFLOW): - print "test" - totalGroundwaterThickness = vos.readPCRmapClone(iniItems.groundwaterOptions['estimateOfTotalGroundwaterThickness'], self.cloneMap, self.tmpDir, self.inputDir)