From 0ffa6de8b1ab9e31097b190c652deb9fede873c2 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 31 Mar 2019 15:08:01 +0200 Subject: [PATCH] FEM: solver frame work, move get binary to snake_case --- src/Mod/Fem/femsolver/calculix/tasks.py | 2 +- src/Mod/Fem/femsolver/elmer/tasks.py | 2 +- src/Mod/Fem/femsolver/elmer/writer.py | 2 +- src/Mod/Fem/femsolver/settings.py | 6 +++--- src/Mod/Fem/femsolver/z88/tasks.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py index 4c347b4f76..3ac74c2305 100644 --- a/src/Mod/Fem/femsolver/calculix/tasks.py +++ b/src/Mod/Fem/femsolver/calculix/tasks.py @@ -99,7 +99,7 @@ class Solve(run.Solve): # TODO do not run solver, do not try to read results in a smarter way than an Exception raise Exception('Error on writing CalculiX input file.\n') self.pushStatus("Executing solver...\n") - binary = settings.getBinary("Calculix") + binary = settings.get_binary("Calculix") self._process = subprocess.Popen( [binary, "-i", _inputFileName], cwd=self.directory, diff --git a/src/Mod/Fem/femsolver/elmer/tasks.py b/src/Mod/Fem/femsolver/elmer/tasks.py index 4a556c3047..21f8201922 100644 --- a/src/Mod/Fem/femsolver/elmer/tasks.py +++ b/src/Mod/Fem/femsolver/elmer/tasks.py @@ -93,7 +93,7 @@ class Solve(run.Solve): def run(self): self.pushStatus("Executing solver...\n") - binary = settings.getBinary("ElmerSolver") + binary = settings.get_binary("ElmerSolver") if binary is not None: self._process = subprocess.Popen( [binary], cwd=self.directory, diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py index dc622b47d7..4566547676 100644 --- a/src/Mod/Fem/femsolver/elmer/writer.py +++ b/src/Mod/Fem/femsolver/elmer/writer.py @@ -126,7 +126,7 @@ class Writer(object): if self.testmode: print("We are in testmode ElmerGrid may not be installed!") else: - binary = settings.getBinary("ElmerGrid") + binary = settings.get_binary("ElmerGrid") if binary is None: raise WriteError("Couldn't find ElmerGrid binary.") args = [binary, diff --git a/src/Mod/Fem/femsolver/settings.py b/src/Mod/Fem/femsolver/settings.py index 68bc3cfd36..2cdca32a90 100644 --- a/src/Mod/Fem/femsolver/settings.py +++ b/src/Mod/Fem/femsolver/settings.py @@ -63,7 +63,7 @@ class _SolverDlg(object): # get the parameter object where the paramete are saved in self.param_group = FreeCAD.ParamGet(self.param_path) - def getBinary(self): + def get_binary(self): # set the binary path to the FreeCAD defaults, ATM pure unix shell commands without path names are used # TODO see todo on use_default later in this module @@ -121,9 +121,9 @@ _SOLVER_PARAM = { } -def getBinary(name): +def get_binary(name): if name in _SOLVER_PARAM: - binary = _SOLVER_PARAM[name].getBinary() + binary = _SOLVER_PARAM[name].get_binary() FreeCAD.Console.PrintMessage('Solver binary path: {} \n'.format(binary)) return binary else: diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py index fe34b508c5..e3f89eb6e6 100644 --- a/src/Mod/Fem/femsolver/z88/tasks.py +++ b/src/Mod/Fem/femsolver/z88/tasks.py @@ -93,7 +93,7 @@ class Solve(run.Solve): # the subprocess was just copied, it seems to work :-) # TODO: search out for "Vektor GS" and "Vektor KOI" and print values, may be compared with the used ones self.pushStatus("Executing test solver...\n") - binary = settings.getBinary("Z88") + binary = settings.get_binary("Z88") self._process = subprocess.Popen( [binary, "-t", "-choly"], cwd=self.directory, @@ -105,7 +105,7 @@ class Solve(run.Solve): self.signalAbort.remove(self._process.terminate) self.pushStatus("Executing real solver...\n") - binary = settings.getBinary("Z88") + binary = settings.get_binary("Z88") self._process = subprocess.Popen( [binary, "-c", "-choly"], cwd=self.directory,