wolfhece 2.1.100__py3-none-any.whl → 2.1.101__py3-none-any.whl

wolfhece/mesh2d/wolf2dprev.py

@@ -8100,9 +8100,12 @@ class prev_infiltration():
 
         sequence, nb_zones = self._infiltrations_chronology.shape
         for zone in range(1,nb_zones):
-            ax.plot(self._infiltrations_chronology[:, 0], self._infiltrations_chronology[:, zone], label=f'Infil {zone}')
+            ax.plot(self._infiltrations_chronology[:, 0], self._infiltrations_chronology[:, zone], label=f'Zone {zone}')
 
+        ax.set_xlabel(_('Time [s]'))
+        ax.set_ylabel(_('Infiltration [$m^3/s$]'))
         ax.legend()
+        fig.tight_layout()
 
         if show:
             fig.show()

wolfhece/scenario/config_manager.py

@@ -202,14 +202,15 @@ class Config_Manager_2D_GPU:
     Gestionnaire de configurations 2D - code GPU
     """
 
-    def __init__(self, workingdir:str = '', mapviewer:WolfMapViewer = None) -> None:
+    def __init__(self, workingdir:str = '', mapviewer:WolfMapViewer = None, python_venv:Path = None) -> None:
         """
         Recherche de toutes les modélisation dans un répertoire et ses sous-répertoires
         """
         self.wx_exists = wx.App.Get() is not None
 
-        self.workingdir = ''
-        self.wolfcli    = ''
+        self.workingdir:Path = None
+        self.wolfgpu:Path = None
+        self._py_env:Path = python_venv
 
         if workingdir == '':
             if self.wx_exists:
@@ -228,6 +229,7 @@ class Config_Manager_2D_GPU:
             logging.error(_('Directory does not exist !'))
             return
 
+        self.find_wolfgpu()
         self.workingdir = Path(workingdir)
         self.mapviewer  = mapviewer
 
@@ -239,6 +241,33 @@ class Config_Manager_2D_GPU:
 
         self.load_data()
 
+    def find_wolfgpu(self):
+        """ Find the wolfgpu Path from wolfgpu package"""
+
+        import importlib.util
+        import sys
+
+        if self._py_env is None:
+            self._py_env = Path(sys.executable).parent
+
+        # Find wolfgpu.exe in script directory
+        candidate = self._py_env / 'wolfgpu.exe'
+
+        if candidate.exists():
+            self.wolfgpu = candidate
+            return
+
+        candidate = self._py_env / 'Scripts' / 'wolfgpu.exe'
+
+        if candidate.exists():
+            self.wolfgpu = candidate
+            return
+        else:
+            logging.error(_('WOLFGPU not found !'))
+            self.wolfgpu = None
+            self._py_env = None
+
+
     def _test_ui(self):
         """ Test if the UI is available """
 
@@ -1263,25 +1292,35 @@ class Config_Manager_2D_GPU:
             logging.info(cursim.check_errors())
             logging.info(_('Simulation {} created !'.format(curdir)))
 
-
             with open(curdir / 'quickrun.bat', 'w', encoding='utf-8') as f:
+                f.write("@echo off\n")
+                f.write("\n")
                 f.write(str(curdir.drive) + '\n')
                 f.write('cd {}\n'.format(str(curdir.parent)))
-                f.write('wolfgpu -quickrun ' + str(curdir.name) + '\n')
-
-                # f.write("from pathlib import Path\n")
-                # f.write("from wolfgpu.simple_simulation import SimpleSimulation\n")
-                # f.write("from wolfgpu.SimulationRunner import SimulationRunner\n")
-                # f.write("from wolfgpu.glsimulation import ResultsStore\n\n")
-                # f.write("def main():\n")
-                # f.write("\tsim = SimpleSimulation.load(Path(__file__).parent)\n")
-                # f.write("\tresult_store:ResultsStore = SimulationRunner.quick_run(sim, Path(__file__).parent)")
-                # f.write("\n\nif __name__ == '__main__':\n")
-                # f.write("\tmain()\n")
+                f.write("\n")
+                f.write("WOLFGPU_PARAMS=-quickrun " + str(curdir.name) + "\n")
+                f.write("\n")
+                f.write("where wolfgpu.exe\n")
+                f.write("IF %ERRORLEVEL%==0 (\n")
+                f.write("wolfgpu %WOLFGPU_PARAMS%\n")
+                f.write("goto :end\n")
+                f.write(")\n")
+                f.write("\n")
+                f.write("echo -------------------------------\n")
+                f.write("echo ERROR !!!\n")
+                f.write("echo -------------------------------\n")
+                f.write("echo I can't find wolfgpu.exe.\n")
+                f.write("echo It is normally installed in the 'Scripts' subdirectory of your python\n")
+                f.write("echo directory (or environment).\n")
+                f.write("echo This 'Scripts' subdirectory must be available on the PATH environment variable.\n")
+                f.write("echo I am now going to try to run wolfgpu as a regular python module\n")
+                f.write("echo -------------------------------\n")
+                f.write("pause\n")
+                f.write("python -m wolfgpu.cli %WOLFGPU_PARAMS%\n")
+                f.write(":end\n")
 
             allsims.append(curdir / 'quickrun.bat')
 
-
         logging.info(_('Simulation creation finished !'))
         logging.warning(_('Do not forget to update/set the boundary conditions if not set by scripts !'))
 
@@ -1303,10 +1342,24 @@ class Config_Manager_2D_GPU:
         with open(path, 'w', encoding='utf-8') as f:
             f.write(batch)
 
+        if self.wolfgpu is None:
+            logging.warning('****************************************************')
+            logging.warning(_('Wolfgpu.exe not found !'))
+            logging.warning(_('It is normally installed in the "Scripts" subdirectory of your python directory (or environment).'))
+            logging.warning(_('This "Scripts" subdirectory must be available on the PATH environment variable.'))
+            logging.warning('****************************************************')
+        else:
+            logging.info('****************************************************')
+            logging.info(_('Wolfgpu.exe found in {}!').format(self.wolfgpu))
+            logging.info(_('You can now run the simulations !'))
+            logging.info(_('Do not forget to activate your Python virtual environment if you are using one !'))
+            logging.info('****************************************************')
+
         return batch
 
     def run_batch(self, batch:Path):
         """ run a batch file in a subprocess """
+
         if not batch.exists():
             logging.error(_('Batch file {} does not exist !'.format(batch)))
             return
@@ -1763,9 +1816,33 @@ class UI_Manager_2D_GPU():
 
         log = self._parent.check_consistency()
         if log =='':
-            self._txtctrl.WriteText(_("All is fine !"))
+            self._txtctrl.WriteText(_("All is fine !\n\n"))
         else:
-            self._txtctrl.WriteText(log)
+            self._txtctrl.WriteText(log +"\n\n")
+
+        # Info on Python Environment and wolfgpu Path and version
+        # -------------------------------------------------------
+
+        import sys
+        # Python Environment
+        self._txtctrl.write(_('Python Environment\n'))
+        self._txtctrl.write('-------------------\n')
+        self._txtctrl.write('Python version : {}\n'.format(sys.version))
+        self._txtctrl.write('Python path : {}\n'.format(sys.executable))
+        self._txtctrl.write('Python version info : {}\n'.format(sys.version_info))
+
+        # Test if wolfgpu.exe exists in script directory
+        # wolfgpu Path and version
+        self._txtctrl.write('\nWolfgpu Path and version\n')
+        self._txtctrl.write('------------------------\n')
+
+        wolfgpu = self._parent.wolfgpu
+        if wolfgpu.exists():
+            self._txtctrl.write('Wolfgpu.exe found in : {}\n'.format(self._parent.wolfgpu.parent))
+        else:
+            self._txtctrl.write('Wolfgpu.exe not found !\n')
+            self._parent.wolfgpu = None
+
 
     def choice_hydrograph(self) -> list[int]:
 
@@ -1975,7 +2052,7 @@ class UI_Manager_2D_GPU():
                 try:
                     if curwp.Shown:
                         cursim.from_wolfparam(curwp)
-                        cursim.save_json()
+                        cursim._save_json()
                 except Exception as e:
                     self._wp[cursim] = None
                     logging.debug(_('Error while saving parameters for simulation {}'.format(cursim.path.name)))
@@ -1989,7 +2066,7 @@ class UI_Manager_2D_GPU():
                 try:
                     if curwp.Shown:
                         cursim.from_wolfparam(curwp)
-                        cursim.save_json()
+                        cursim._save_json()
                 except Exception as e:
                     self._wp[cursim] = None
                     logging.debug(_('Error while saving parameters for simulation {}'.format(cursim.path.name)))