diff --git a/src/Solver/RubarBE.py b/src/Solver/RubarBE.py index e30cbc4d..6b3810ba 100644 --- a/src/Solver/RubarBE.py +++ b/src/Solver/RubarBE.py @@ -39,7 +39,7 @@ class Rubar3(CommandLineSolver): self._type = "rubar3" self._cmd_input = "" - self._cmd_solver = "@path @input -o @output" + self._cmd_solver = "@path @args @input -o @output" self._cmd_output = "" @classmethod @@ -129,7 +129,7 @@ class Rubar3(CommandLineSolver): def output_param(self): name = self._study.name - return f"{name}" + return f"hydlim.{name}" def log_file(self): name = self._study.name @@ -496,6 +496,32 @@ class Rubar3(CommandLineSolver): for d0, d1 in bc.data: f.write(f"{d1} {d0}\n") + def read_hydlim(self, study, fname, results, qlog=None, name="0"): + return + + @timer + def results(self, study, repertory, qlog=None, name="0"): + results = Results( + study=study, + solver=self, + repertory=repertory, + name=name, + ) + results_file = f"hydlim.{name}" + + fname = os.path.join(repertory, results_file) + if not os.path.isfile(fname): + logger.info(f"Result file {results_file} does not exist") + return None + try: + self.read_hydlim(study, fname, results, qlog, name=name) + except Exception as e: + logger.error(f"Failed to read results") + logger_exception(e) + return None + + return results + class RubarBE(Rubar3): _type = "rubarbe" @@ -506,5 +532,5 @@ class RubarBE(Rubar3): self._type = "rubarbe" self._cmd_input = "" - self._cmd_solver = "@path @input -o @output" + self._cmd_solver = "@path @args @input -o @output" self._cmd_output = "" diff --git a/src/Solver/Solvers.py b/src/Solver/Solvers.py index 73270814..f6fb93b6 100644 --- a/src/Solver/Solvers.py +++ b/src/Solver/Solvers.py @@ -34,7 +34,7 @@ solver_long_name = { # "mage_fake7": "Mage fake v7", "adistswc": "Adis-TS_WC", # "rubarbe": "RubarBE", - # "rubar3": "Rubar3", + "rubar3": "Rubar3", } solver_type_list = { @@ -44,5 +44,5 @@ solver_type_list = { # "mage_fake7": MageFake7, "adistswc": AdisTSwc, # "rubarbe": RubarBE, - # "rubar3": Rubar3, + "rubar3": Rubar3, }