packages/make-windows-dir.bat

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

src/Model/Pollutants/Pollutants.py

@@ -320,8 +320,7 @@ class Pollutants(SQLSubModel):
                                                bc=float(data[8]),
                                                pollutant=self,
                                                status=self._status
-                                               )
+                                              )]
-                      ]
 
     @classmethod
     def _db_create(cls, execute, ext=""):

src/Solver/RubarBE.py

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

src/View/Translate.py

@@ -266,6 +266,7 @@ 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.7'
+        self._version = '0.0.6'
         self.filename = Config.filename()
         self.set_default_value()
 
@@ -165,29 +165,6 @@ 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'"
@@ -360,13 +337,6 @@ 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")