Pull request #4: modified aux scripts (all but CAL_7)

Merge in CEFL/lisflood-calibration from damienWorking to develop * commit '61b118e42b9c390bae325a7fd7c146f2021c142e': modified aux scripts (all but CAL_7)
ec-jrc · Jun 3, 2021 · ab03bf6 · ab03bf6
2 parents 55dcb5a + 61b118e
commit ab03bf6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/bin/CAL_3_PREP_MISC.py b/bin/CAL_3_PREP_MISC.py
@@ -19,7 +19,7 @@
 import array
 import logging
 import random
-from pcrasterCommand import pcrasterCommand, getPCrasterPath
+from liscal.pcr_utils import pcrasterCommand, getPCrasterPath
 
 if __name__=="__main__":
 

diff --git a/bin/CAL_4_SPREAD_WORKLOAD.py b/bin/CAL_4_SPREAD_WORKLOAD.py
@@ -19,7 +19,7 @@
 import array
 import logging
 import random
-from pcrasterCommand import pcrasterCommand, getPCrasterPath
+from liscal.pcr_utils import pcrasterCommand, getPCrasterPath
 
 if __name__=="__main__":
 

diff --git a/bin/CAL_5_PREP_FORCING.py b/bin/CAL_5_PREP_FORCING.py
@@ -10,7 +10,7 @@
 import time
 import struct
 import shutil
-from pcrasterCommand import pcrasterCommand, getPCrasterPath
+from liscal.pcr_utils import pcrasterCommand, getPCrasterPath
 ver = sys.version
 ver = ver[:ver.find('(')-1]
 if ver.find('3.') > -1:

diff --git a/bin/CAL_6_CUT_MAPS.py b/bin/CAL_6_CUT_MAPS.py
@@ -10,11 +10,11 @@
   from configparser import ConfigParser # Python 3.8
 else:
   from ConfigParser import SafeConfigParser # Python 2.7-15
-import binFileIO
-from pcrasterCommand import pcrasterCommand, getPCrasterPath
-import rasterOps as ro
-import domain as dom
-import pyproj
+# import binFileIO
+from liscal.pcr_utils import pcrasterCommand, getPCrasterPath
+# import liscal.raster_operations as ro
+# import domain as dom
+# import pyproj
 import dask
 from dask.diagnostics import ResourceProfiler, Profiler, CacheProfiler, visualize
 import pcraster as pcr
@@ -452,7 +452,7 @@ def sliceArrayXapply(inArray, dims):
                     else:
                         os.system("cp " + filenc + " " + fileout)
 
-        # Transform into numpy binary
-        if ver.find('3.') > -1:
-            binFileIO.main(iniFile, file_CatchmentsToProcess)
+        # # Transform into numpy binary
+        # if ver.find('3.') > -1:
+        #     binFileIO.main(iniFile, file_CatchmentsToProcess)
         print('finito...')
diff --git a/settings_calibration.txt b/settings_calibration.txt
@@ -17,16 +17,16 @@ testConvergence = 0
 fastDebug = 0
 
 [CSV]
-Qmeta = /perm/rd/nedd/EFAS/efasCalib/src/Qmeta1.csv
-Qtss = /perm/rd/nedd/EFAS/efasCalib/src/ecQts.csv
+Qmeta = /perm/rd/nedd/EFAS/efasCalib/src/data/Qmeta1.csv
+Qtss = /perm/rd/nedd/EFAS/efasCalib/src/data/ecQts.csv
 
 [Path]
 Temp = %(Root)s/temp/
 Result = %(Root)s/result/
 Templates = /perm/rd/nedd/EFAS/efasCalib/src/templates/
 SubCatchmentPath = %(Root)s/catchments/
-ParamRanges = /perm/rd/nedd/EFAS/efasCalib/src/ParamRanges_LISFLOOD.csv
-#ParamRanges = /perm/rd/nedd/EFAS/efasCalib/src/ParamRanges_LISFLOOD_380_Efas4.csv
+ParamRanges = /perm/rd/nedd/EFAS/efasCalib/src/data/ParamRanges_LISFLOOD.csv
+#ParamRanges = /perm/rd/nedd/EFAS/efasCalib/src/data/ParamRanges_LISFLOOD_380_Efas4.csv
 CatchmentDataPath = /perm/rd/nedd/EFAS/efasCalib/input/maps/static/
 MeteoData = /perm/rd/nedd/EFAS/efasCalib/input/maps/forcings/day/
 WaterUseData = /perm/rd/nedd/EFAS/efasCalib/input/maps/water_abstraction/