wolfhece 2.1.113__py3-none-any.whl → 2.1.115__py3-none-any.whl

wolfhece/Results2DGPU.py

@@ -156,6 +156,7 @@ class wolfres2DGPU(Wolfresults_2D):
                  store = None):
 
         fname = Path(fname)
+        self._nap = None
 
         if not fname.name.lower() == 'simul_gpu_results':
             for curdir in fname.iterdir():
@@ -234,6 +235,7 @@ class wolfres2DGPU(Wolfresults_2D):
             curblock.qx = WolfArray(path.join(sim_path, 'simul.qxbin'))
             curblock.qy = WolfArray(path.join(sim_path, 'simul.qybin'))
             curblock.rough_n = WolfArray(path.join(sim_path, 'simul.frot'))
+            self._nap = WolfArray(path.join(sim_path, 'simul.napbin'))
 
         else:
 
@@ -304,6 +306,13 @@ class wolfres2DGPU(Wolfresults_2D):
                 logging.error(_('No manning file found in the simulation directory -- Results will not be shown in viewer'))
                 return -8
 
+            pathnap = sim_path / params['maps']['NAP']
+            if pathnap.exists():
+                self._nap = WolfArray(pathnap)
+            else:
+                logging.error(_('No nap file found in the simulation directory -- Results will not be shown in viewer'))
+                return -9
+
         # Force nullvalue to zero because it will influence the size of the arrow in vector field views
         curblock.qx.nullvalue = 0.
         curblock.qy.nullvalue = 0.
@@ -312,7 +321,7 @@ class wolfres2DGPU(Wolfresults_2D):
 
         self.head_blocks[getkeyblock(0)] = curblock.top.get_header()
 
-        to_check =[curblock.waterdepth, curblock.qx, curblock.qy, curblock.rough_n]
+        to_check =[curblock.waterdepth, curblock.qx, curblock.qy, curblock.rough_n, self._nap]
         check = False
         for curarray in to_check:
             check |= curarray.dx != curblock.top.dx
@@ -324,7 +333,7 @@ class wolfres2DGPU(Wolfresults_2D):
 
         if check:
             if (sim_path / 'simul.top').exists():
-                logging.error(_("Inconsistent header file in .top, .qxbin, .qybin or .frot files"))
+                logging.error(_("Inconsistent header file in .top, .qxbin, .qybin, .napbin or .frot files"))
                 logging.error(_("Forcing information into memory from the .top file -- May corrupt spatial positionning -- Please check your data !"))
             elif pathbathy.exists():
                 logging.error(_("Inconsistent header file"))
@@ -639,17 +648,40 @@ class wolfres2DGPU(Wolfresults_2D):
                 logging.error(_('Bad index for initial conditions'))
                 return
 
+        nap = self._nap
+
         self.set_currentview(views_2D.WATERDEPTH)
 
         hini = self.as_WolfArray()
+        hini.nullvalue = 0.
+        hini.set_nullvalue_in_mask()
+
+        if hini[nap == 1].max() > 0.:
+            logging.warning(_('Some cells are not dry in the initial conditions outside the NAP areas'))
+            logging.warning(_('Setting the water depth to zero in these cells'))
+            hini[nap == 0] = 0.
 
         self.set_currentview(views_2D.QX)
 
         qxini = self.as_WolfArray()
+        qxini.nullvalue = 0.
+        qxini.set_nullvalue_in_mask()
 
         self.set_currentview(views_2D.QY)
 
         qyini = self.as_WolfArray()
+        qyini.nullvalue = 0.
+        qyini.set_nullvalue_in_mask()
+
+        if qxini[nap == 1].max() > 0.:
+            logging.warning(_('Some cells are not dry in the initial conditions outside the NAP areas'))
+            logging.warning(_('Setting the water depth to zero in these cells'))
+            qxini[nap == 0] = 0.
+
+        if qyini[nap == 1].max() > 0.:
+            logging.warning(_('Some cells are not dry in the initial conditions outside the NAP areas'))
+            logging.warning(_('Setting the water depth to zero in these cells'))
+            qyini[nap == 0] = 0.
 
         if (hini is not None) and (qxini is not None) and (qyini is not None):
 
@@ -657,9 +689,10 @@ class wolfres2DGPU(Wolfresults_2D):
             # qxini = qxini.as_WolfArray()
             # qyini = qyini.as_WolfArray()
 
-            hini.write_all(self.filename.parent  / 'h.npy')
-            qxini.write_all(self.filename.parent / 'qx.npy')
-            qyini.write_all(self.filename.parent / 'qy.npy')
+            dir = Path(self.filename).parent
+            hini.write_all(dir  / 'h.npy')
+            qxini.write_all(dir / 'qx.npy')
+            qyini.write_all(dir / 'qy.npy')
 
             logging.info(_('Initial conditions saved as Numpy files'))
         else: