src/Solver/RubarBE.py

@@ -52,8 +52,8 @@ class Rubar3(CommandLineSolver):
             ("rubarbe_condav", "3"),
             ("rubarbe_regime", "0"),
             ("rubarbe_iodev", "n"),
-            ("rubarbe_iodebord", ""),
+            # ("rubarbe_iodebord", ""),
-            ("rubarbe_iostockage", ""),
+            # ("rubarbe_iostockage", ""),
             ("rubarbe_iopdt", "y"),
             ("rubarbe_iovis", "n"),
             ("rubarbe_rep", "n"),
@@ -73,37 +73,36 @@ class Rubar3(CommandLineSolver):
             ("rubarbe_tf_4", "y"),
             ("rubarbe_tf_5", "y"),
             ("rubarbe_tf_6", "n"),
-            ("rubarbe_trased", "n"),
+            ("rubarbe_trased", "y"),
-            ("rubarbe_optfpc", "0"),
+            # ("rubarbe_optfpc", "0"),
-            # trased parameters
+            # ("rubarbe_ros", "2650.0"),
-            ("rubarbe_ros", "2650.0"),
+            # ("rubarbe_dm", "0.1"),
-            ("rubarbe_dm", "0.1"),
+            # ("rubarbe_segma", "1.0"),
-            ("rubarbe_segma", "1.0"),
             # Sediment parameters
-            ("rubarbe_sediment_ros", "2650.0"),
+            # ("rubarbe_sediment_ros", "2650.0"),
-            ("rubarbe_sediment_por", "0.4"),
+            # ("rubarbe_sediment_por", "0.4"),
-            ("rubarbe_sediment_dcharg", "0.0"),
+            # ("rubarbe_sediment_dcharg", "0.0"),
-            ("rubarbe_sediment_halfa", "1.0"),
+            # ("rubarbe_sediment_halfa", "1.0"),
-            ("rubarbe_sediment_mult_1", "1.0"),
+            # ("rubarbe_sediment_mult_1", "1.0"),
-            ("rubarbe_sediment_mult_2", ""),
+            # ("rubarbe_sediment_mult_2", ""),
-            ("rubarbe_sediment_mult_3", ""),
+            # ("rubarbe_sediment_mult_3", ""),
-            ("rubarbe_sediment_mult_4", ""),
+            # ("rubarbe_sediment_mult_4", ""),
-            ("rubarbe_sediment_mult_5", ""),
+            # ("rubarbe_sediment_mult_5", ""),
-            ("rubarbe_sediment_visc", "0.047"),
+            # ("rubarbe_sediment_visc", "0.047"),
-            ("rubarbe_sediment_opts", "6"),
+            # ("rubarbe_sediment_opts", "6"),
-            ("rubarbe_sediment_odchar", "0"),
+            # ("rubarbe_sediment_odchar", "0"),
-            ("rubarbe_sediment_unisol", "1"),
+            # ("rubarbe_sediment_unisol", "1"),
-            ("rubarbe_sediment_typdef", "3"),
+            # ("rubarbe_sediment_typdef", "3"),
-            ("rubarbe_sediment_depot", "2"),
+            # ("rubarbe_sediment_depot", "2"),
-            ("rubarbe_sediment_choixc", "2"),
+            # ("rubarbe_sediment_choixc", "2"),
-            ("rubarbe_sediment_option", "2"),
+            # ("rubarbe_sediment_option", "2"),
-            ("rubarbe_sediment_capsol", "1"),
+            # ("rubarbe_sediment_capsol", "1"),
-            ("rubarbe_sediment_bmiu", "0.85"),
+            # ("rubarbe_sediment_bmiu", "0.85"),
-            ("rubarbe_sediment_demix", "0"),
+            # ("rubarbe_sediment_demix", "0"),
-            ("rubarbe_sediment_defond", "1"),
+            # ("rubarbe_sediment_defond", "1"),
-            ("rubarbe_sediment_varcons", "1"),
+            # ("rubarbe_sediment_varcons", "1"),
-            ("rubarbe_sediment_dchard", "0.0"),
+            # ("rubarbe_sediment_dchard", "0.0"),
-            ("rubarbe_sediment_dchars", "0.0"),
+            # ("rubarbe_sediment_dchars", "0.0"),
         ]
 
         return lst
@@ -170,7 +169,7 @@ class Rubar3(CommandLineSolver):
             it = iter(params)
 
             line = 0
-            while line < 27:
+            while line < 25:
                 param = next(it)
                 name = param.name
                 value = param.value

src/View/Results/Window.py

@@ -1249,13 +1249,6 @@ class ResultsWindow(PamhyrWindow):
             return
 
         sep = " "
-
-        def is_float(string):
-            if string.replace(".", "").isnumeric():
-                return True
-            else:
-                return False
-
         with open(filename, 'r', newline='') as f:
             lines = f.readlines()
             x = []
@@ -1264,9 +1257,11 @@ class ResultsWindow(PamhyrWindow):
                 if line[0] != "*" and line[0] != "#" and line[0] != "$":
                     row = line.split(sep)
                     if len(row) >= 2:
-                        if is_float(row[0]) and is_float(row[1]):
+                        try:
                             x.append(float(row[0]))
                             y.append(float(row[1]))
+                        except:
+                            pass
 
         data_type_lst = ['Q(t)', 'Z(t)', 'Z(x)']
         data_type, ok = QInputDialog.getItem(