debug

packages/make-windows-dir.bat

@@ -48,7 +48,7 @@ copy /y ..\mage8-windows\libbief.dll pamhyr\mage8\
 
 rem rubar
 mkdir pamhyr\rubar
-copy /y ..\adists-windows\rubarbe.exe pamhyr\rubar\
+copy /y ..\rubar-windows\rubarbe.exe pamhyr\rubar\
 
 rem adists
 mkdir pamhyr\adists

src/Model/InitialConditions/InitialConditions.py

@@ -537,7 +537,10 @@ class InitialConditions(SQLSubModel):
                 strickler = 25.0
 
             if not compute_discharge:
-                discharge = data_discharge[profile.rk]
+                if profile.rk in data_discharge:
+                    discharge = data_discharge[profile.rk]
+                else:
+                    discharge = 0.0
             else:
                 discharge = (
                     # ((width * 0.8)
@@ -605,7 +608,10 @@ class InitialConditions(SQLSubModel):
                 strickler = 25.0
 
             if not compute_height:
-                height = data_height[profile.rk]
+                if profile.rk in data_height:
+                    height = data_height[profile.rk]
+                else:
+                    height = 0.0
             else:
                 if abs(incline) <= 0:
                     height = 0.0
@@ -656,7 +662,10 @@ class InitialConditions(SQLSubModel):
         for profile in profiles:
 
             if not compute_discharge:
-                d = data_discharge[profile.rk]
+                if profile.rk in data_discharge:
+                    d = data_discharge[profile.rk]
+                else:
+                    d = 0.0
             else:
                 d = discharge
             elevation = interp(profile.rk,

src/Model/Pollutants/Pollutants.py

@@ -307,6 +307,22 @@ class Pollutants(SQLSubModel):
     def data(self):
         return self._data
 
+    @data.setter
+    def data(self, data):
+        self._data = [PollutantCharacteristics(type=int(data[0]),
+                                               diametre=float(data[1]),
+                                               rho=float(data[2]),
+                                               porosity=float(data[3]),
+                                               cdc_riv=float(data[4]),
+                                               cdc_cas=float(data[5]),
+                                               apd=float(data[6]),
+                                               ac=float(data[7]),
+                                               bc=float(data[8]),
+                                               pollutant=self,
+                                               status=self._status
+                                               )
+                      ]
+
     @classmethod
     def _db_create(cls, execute, ext=""):
         execute(f"""
@@ -397,7 +413,7 @@ class Pollutants(SQLSubModel):
 
                 data["pollutant"] = new_pollutant
                 new_pollutant._data = PollutantCharacteristics._db_load(
-                    execute, data.copy()
+                    execute, data=data
                 )
 
                 loaded.add(pid)
@@ -421,7 +437,7 @@ class Pollutants(SQLSubModel):
             f"AND scenario = {self._status.scenario_id}"
         )
         execute(
-            f"DELETE FROM pollutants_characteristics " +
+            "DELETE FROM pollutants_characteristics " +
             f"WHERE pollutant = {self.id} " +
             f"AND scenario = {self._status.scenario_id}"
         )

src/Solver/AdisTS.py

@@ -260,7 +260,7 @@ class AdisTS(CommandLineSolver):
     _nodes_views = set()
 
     def get_reach_name(self, reach):
-        return f"Reach_{reach.id:>3}".replace(" ", "0")
+        return f"Reach_{reach.pamhyr_id:>3}".replace(" ", "0")
 
     def get_node_name(self, node):
         """Generate a 3 char name for node
@@ -271,7 +271,7 @@ class AdisTS(CommandLineSolver):
         Returns:
             A 3 char name string
         """
-        n = node.id
+        n = node.pamhyr_id
 
         # print("node name id: ", n)
 
@@ -401,9 +401,9 @@ class AdisTSwc(AdisTS):
         ) as f:
             for LC in POL_LC:
                 reach = next(filter(
-                    lambda edge: edge.id == LC.edge, study.river.edges()
+                    lambda edge: edge.id == LC.edge, study.river.enable_edges()
                 ))  # .name
-                reach_name = self.get_reach_name(self, reach)
+                reach_name = self.get_reach_name(reach)
                 f.write(f"${reach_name} {LC.begin_rk} {LC.end_rk}\n")
                 f.write(f"*temps   |débit massique (kg/s)\n")
                 f.write(f"*---------++++++++++\n")

src/Solver/RubarBE.py

@@ -169,9 +169,8 @@ class Rubar3(CommandLineSolver):
 
             it = iter(params)
 
-            line = 0
-            while line < 27:
-                param = next(it)
+            param = next(it, None)
+            while param is not None:
                 name = param.name
                 value = param.value
 
@@ -204,7 +203,7 @@ class Rubar3(CommandLineSolver):
                     # New line
                     f.write(f"\n")
 
-                line += 1
+                param = next(it, None)
 
     def _export_ts(self, study, repertory, qlog, name="0"):
         if qlog is not None:

src/View/Pollutants/UndoCommand.py

@@ -80,7 +80,7 @@ class AddCommand(QUndoCommand):
             self._new = self._pollutants_lst.new(
                 self._pollutants_lst, self._index
             )
-            self._new._data = [[0, 0., 0., 0., 0., 0., 0., 0., 0.]]
+            self._new.data = [0, 0., 0., 0., 0., 0., 0., 0., 0.]
             self._new_ic_adists = self._data.new(self._index, self._new.id)
         else:
             self._pollutants_lst.insert(self._index, self._new)

src/View/Translate.py

@@ -266,7 +266,6 @@ class MainTranslate(UnitTranslate):
             "incompatible study version"
         )
 
-
         self._dict["mb_unsaved_study_title"] = _translate(
             "MainWindow", "Open scenarios window"
         )

src/config.py

@@ -37,7 +37,7 @@ logger = logging.getLogger()
 
 class Config(SQL):
     def __init__(self):
-        self._version = '0.0.6'
+        self._version = '0.0.7'
         self.filename = Config.filename()
         self.set_default_value()
 
@@ -165,6 +165,29 @@ class Config(SQL):
                         "WHERE name='default-AdisTS'"
                     )
 
+                if int(release) < 7:
+                    posix = os.name == 'posix'
+                    ext = "" if posix else ".exe"
+
+                    self.execute(f"""
+                      INSERT INTO solver VALUES (
+                        'rubar3',
+                        'default-Rubar3',
+                        'Default Pamhyr2 Rubar 3 version',
+
+                        '', '', '',
+
+                        '',
+                        '@install_dir/rubar/rubar3{ext} @args @input',
+                        ''
+                      )
+                    """)
+                    self.execute(
+                        "UPDATE solver SET cmd_solver=" +
+                        f"'@install_dir/rubar/rubar3{ext} @args @input' "
+                        "WHERE name='default-Rubar3'"
+                    )
+
             self.execute(
                 f"UPDATE info SET value='{self._version}' " +
                 "WHERE key='version'"
@@ -337,6 +360,13 @@ class Config(SQL):
         new._cmd_solver = f""""@install_dir/adists/adists{ext}" @args @input"""
         self._solvers.append(new)
 
+        # Rubar3
+        ctor = solver_type_list["rubar3"]
+        new = ctor("default-Rubar3")
+        new._description = "Default Pamhyr2 RubarBE version"
+        new._cmd_solver = f""""@install_dir/rubar/rubarbe{ext}" @args @input"""
+        self._solvers.append(new)
+
         # Mage fake 7
 #         ctor = solver_type_list["mage_fake7"]
 #         new = ctor("default-mage-fake-7")