Minor fixes

Author: ChrisWGeorge

QSWAT3/QSWAT/TauDEMUtils.py

@@ -220,6 +220,11 @@ def run(command, inFiles, inParms, outFiles, numProcesses, output, mustRun):
         if hasQGIS:
             output.append(' '.join(commands) + '\n\n')
             output.moveCursor(QTextCursor.End)
+        # In windows PROJ seems to need PROJ_LIB instead of the more recent PROJ_DATA
+        # In windows gdalplugins now stored under TauDEMDir so they are compatible with gdal304 dlls stored there
+        if Parameters._ISWIN:
+            os.environ['PROJ_LIB'] = os.getenv('PROJ_DATA')
+            os.environ['GDAL_DRIVER_PATH'] = TauDEMDir + '/gdalplugins'
         proc = subprocess.run(commands, 
                               shell=True, 
                               stdout=subprocess.PIPE, 
@@ -287,4 +292,4 @@ def logerror(msg, hasQGIS):
             QSWATUtils.logerror(msg)
         else:
             print(msg)
-        
+        

QSWAT3/QSWAT/hrus.py

@@ -2345,38 +2345,41 @@ def generateBasins(self, progressBar: QProgressBar, progressLabel: QLabel, root:
                             landuseCount += 1
                             # use an equivalent landuse if any
                             crop = self._gv.db.translateLanduse(int(crop))
+                        isWet = False
+                        if crop != cropNoData:
+                            cropCode = self._gv.db.getLanduseCode(crop)
+                            isWet = cropCode in Parameters._WATERLANDUSES 
                         soilCol = soilColFun(col, x)
                         if 0 <= soilCol < soilNumberCols and 0 <= soilRow < soilNumberRows:
                             soil = cast(int, soilData[0, soilCol])
                             if soilIsNoDataFun(soil):
                                 soil = soilNoData
                         else:
                             soil = soilNoData
+                        # make sure crop and soil do not conflict about water
+                        if self._gv.db.useSSURGO:
+                            if isWet:
+                                soil = Parameters._SSURGOWater
+                            else:
+                                if soil == Parameters._SSURGOWater:
+                                    isWet = True
+                                    if crop == cropNoData or cropCode not in Parameters._WATERLANDUSES:
+                                        crop = self._gv.db.getLanduseCat('WATR')
                         if soil == soilNoData:
                             soilIsNoData = True
                         else:
                             soilIsNoData = False
-                            # use an equivalent soil if any
-                            soil, OK = self._gv.db.translateSoil(int(soil))
+                            if soil == Parameters._SSURGOWater:
+                                OK = True 
+                            else:   
+                                # use an equivalent soil if any
+                                soil, OK = self._gv.db.translateSoil(int(soil))
                         if soilIsNoData:
                             soilNoDataCount += 1
                         elif OK:
                             soilDefinedCount += 1
                         else:
                             soilUndefinedCount += 1
-                        # make sure crop and soil do not conflict about water
-                        isWet = False
-                        if crop != cropNoData:
-                            cropCode = self._gv.db.getLanduseCode(crop)
-                            isWet = cropCode in Parameters._WATERLANDUSES 
-                        if self._gv.db.useSSURGO:
-                            if isWet:
-                                soil = Parameters._SSURGOWater
-                            else:
-                                if soil == Parameters._SSURGOWater:
-                                    isWet = True
-                                    if crop == cropNoData or cropCode not in Parameters._WATERLANDUSES:
-                                        crop = self._gv.db.getLanduseCat('WATR')
                         slopeCol = slopeColFun(col, x)
                         if 0 <= slopeCol < slopeNumberCols and 0 <= slopeRow < slopeNumberRows:
                             slopeValue = cast(float, slopeData[0, slopeCol])

QSWAT3/QSWAT/parameters.py

@@ -142,7 +142,7 @@ class Parameters:
     _NEARNESSTHRESHOLD = 0.1
 
     # landuses for which we use just one SSURGO soil and where we make the slope at most _WATERMAXSLOPE 
-    _WATERLANDUSES = {'WATR', 'WETN', 'WETF', 'RIWF', 'UPWF', 'RIWN', 'UPWN'}
+    _WATERLANDUSES = {'WATR', 'WETN', 'WETF', 'WETW', 'RIWF', 'UPWF', 'RIWN', 'UPWN'}
     _WATERMAXSLOPE = 0.00001
     # similar for TNC projects using FAO or HWSD soils
     _TNCWATERLANDUSES = {'WEWO', 'WETL', 'WEHB', 'WATR', 'TWEW', 'TWET', 'TWEH'}