Claude François

src/Meshing/Internal.py

@@ -102,8 +102,8 @@ class InternalMeshing(AMeshingTool):
         # calcul number of intermediate profiles
         np = []
         for i in range(limites[0], limites[1]):
-            np.append(int((reach.profiles[i+1].rk -
-                           reach.profiles[i].rk) / step) - 1)
+            np.append(int(abs(reach.profiles[i+1].rk -
+                              reach.profiles[i].rk) / step) - 1)
             if np[-1] < 0:
                 np[-1] = 0
 

src/Solver/RubarBE.py

@@ -58,12 +58,12 @@ class Rubar3(CommandLineSolver):
             ("rubarbe_iovis", "n"),
             ("rubarbe_rep", "n"),
             ("rubarbe_tinit", "000:00:00:00"),
-            ("rubarbe_tmax", "999:99:99:00"),
+            ("rubarbe_tmax", "000:01:00:00"),  # 1 day
             ("rubarbe_tiopdt", "000:00:00:00"),
             ("rubarbe_dt", "5.0"),
             ("rubarbe_ts", "999:99:99:00"),
-            ("rubarbe_dtsauv", "00:00:00:05"),
-            ("rubarbe_psave", "00:00:00:05"),
+            ("rubarbe_dtsauv", "00:00:05:00"),
+            ("rubarbe_psave", "00:00:05:00"),
             ("rubarbe_fdeb1", "1"),
             ("rubarbe_fdeb2", "10"),
             ("rubarbe_fdeb3", "100"),

src/View/About/Window.py

@@ -55,7 +55,7 @@ class AboutWindow(PamhyrDialog):
 
             label = self.get_label_text("label_version")
             label = label.replace("@version", version)
-            label = label.replace("@codename", "(Le Coz)")
+            label = label.replace("@codename", "(Claude François)")
             self.set_label_text("label_version", label)
 
         # Authors

src/View/MainWindow.py

@@ -195,10 +195,10 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         title = "(dbg) " if self.conf.debug else ""
 
         if self._study is not None:
-            title += f"Pamhyr2 (Le Coz) - {self._study.name}"
+            title += f"Pamhyr2 (Claude François) - {self._study.name}"
             self.setWindowTitle(title)
         else:
-            title += "Pamhyr2 (Le Coz)"
+            title += "Pamhyr2 (Claude François)"
             self.setWindowTitle(title)
 
     def setup_tab(self):
@@ -1563,10 +1563,10 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
 
         if dialog.exec_():
             file_name = dialog.selectedFiles()
-            logger.info(f"Select results: {file_name}")
+            logger.info(f"Select results: {file_name[0]}")
 
             solver = None
-            if ".BIN" in file_name:
+            if ".BIN" in file_name[0]:
                 solver = Mage8("Mage8")
             else:
                 solver = Rubar3("Rubar3")

src/config.py

@@ -173,7 +173,7 @@ class Config(SQL):
                     posix = os.name == 'posix'
                     ext = "" if posix else ".exe"
                     path = os.path.join("@install_dir",
-                                        "rubar", f"rubar3{ext}")
+                                        "rubar", f"rubarbe{ext}")
 
                     self.execute(f"""
                       INSERT INTO solver VALUES (
@@ -372,7 +372,7 @@ class Config(SQL):
         ctor = solver_type_list["rubar3"]
         new = ctor("default-Rubar3")
         new._description = "Default Pamhyr2 Rubar 3 version"
-        path = os.path.join("@install_dir", "rubar", f"rubar3{ext}")
+        path = os.path.join("@install_dir", "rubar", f"rubarbe{ext}")
         new._cmd_solver = f""""{path}" @args @input"""
         self._solvers.append(new)