From 5d4b753940d778dca3686be08924a816d76ee4f3 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 31 Jul 2022 23:45:55 +0200 Subject: [PATCH] FEM: python code formatting --- src/Mod/Fem/Init.py | 8 +++++-- src/Mod/Fem/femguiutils/selection_widgets.py | 2 -- .../femsolver/elmer/equations/nonlinear.py | 2 +- src/Mod/Fem/femsolver/elmer/tasks.py | 14 +++++++---- src/Mod/Fem/femsolver/elmer/writer.py | 24 ++++++++++++------- src/Mod/Fem/femsolver/settings.py | 1 + .../Fem/femtaskpanels/task_material_common.py | 2 +- .../Fem/femtaskpanels/task_solver_ccxtools.py | 1 + src/Mod/Fem/femtest/app/test_common.py | 1 - src/Mod/Fem/femtest/app/test_open.py | 1 - src/Mod/Fem/femtest/app/test_solver_elmer.py | 1 - src/Mod/Fem/femtest/app/test_solver_z88.py | 1 - src/Mod/Fem/femtest/gui/test_open.py | 1 - 13 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/Mod/Fem/Init.py b/src/Mod/Fem/Init.py index f938071f6b..7923e61e2b 100644 --- a/src/Mod/Fem/Init.py +++ b/src/Mod/Fem/Init.py @@ -62,8 +62,12 @@ FreeCAD.addExportType("FEM mesh Python (*.meshpy)", "feminout.importPyMesh") FreeCAD.addExportType("FEM mesh TetGen (*.poly)", "feminout.convert2TetGen") # see FemMesh::read() and FemMesh::write() methods in src/Mod/Fem/App/FemMesh.cpp -FreeCAD.addImportType("FEM mesh formats (*.bdf *.dat *.inp *.med *.unv *.vtk *.vtu *.pvtu *.z88)", "Fem") -FreeCAD.addExportType("FEM mesh formats (*.dat *.inp *.med *.stl *.unv *.vtk *.vtu *.z88)", "Fem") +FreeCAD.addImportType( + "FEM mesh formats (*.bdf *.dat *.inp *.med *.unv *.vtk *.vtu *.pvtu *.z88)", "Fem" +) +FreeCAD.addExportType( + "FEM mesh formats (*.dat *.inp *.med *.stl *.unv *.vtk *.vtu *.z88)", "Fem" +) FreeCAD.addExportType("FEM mesh Nastran (*.bdf)", "feminout.exportNastranMesh") diff --git a/src/Mod/Fem/femguiutils/selection_widgets.py b/src/Mod/Fem/femguiutils/selection_widgets.py index f245ca8c96..18ea208bbc 100644 --- a/src/Mod/Fem/femguiutils/selection_widgets.py +++ b/src/Mod/Fem/femguiutils/selection_widgets.py @@ -30,8 +30,6 @@ __url__ = "https://www.freecadweb.org" # \ingroup FEM # \brief FreeCAD FEM FemSelectWidget -import sys - from PySide import QtGui from PySide import QtCore diff --git a/src/Mod/Fem/femsolver/elmer/equations/nonlinear.py b/src/Mod/Fem/femsolver/elmer/equations/nonlinear.py index 399ed28ce9..33c7fb3d37 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/nonlinear.py +++ b/src/Mod/Fem/femsolver/elmer/equations/nonlinear.py @@ -78,7 +78,7 @@ class Proxy(linear.Proxy): # forum thread: https://forum.freecadweb.org/viewtopic.php?p=613897#p613897 obj.setExpression('NonlinearTolerance', "1e-8") obj.setExpression('NonlinearNewtonAfterTolerance', "1e-3") - obj.setExpression('RelaxationFactor', "1.0") # must often be < 1 down to 0.01 + obj.setExpression('RelaxationFactor', "1.0") # must often be < 1 down to 0.01 class ViewProxy(linear.ViewProxy): diff --git a/src/Mod/Fem/femsolver/elmer/tasks.py b/src/Mod/Fem/femsolver/elmer/tasks.py index 3557b8ce4d..1d508d7130 100644 --- a/src/Mod/Fem/femsolver/elmer/tasks.py +++ b/src/Mod/Fem/femsolver/elmer/tasks.py @@ -194,9 +194,11 @@ class Solve(run.Solve): FrequencyList = [] for line in OutputList: LineList = line.split(" ") - if (len(LineList) > 1) \ - and (LineList[0] == "EigenSolve:") \ - and (LineList[1] == "Computed"): + if ( + len(LineList) > 1 + and LineList[0] == "EigenSolve:" + and LineList[1] == "Computed" + ): # we found a result and take now the next LineList[2] lines modeCount = int(LineList[2]) modeNumber = modeCount @@ -217,8 +219,9 @@ class Solve(run.Solve): # now we can perform the calculation eigenFreq = cmath.sqrt(eigenFreq) / (2 * cmath.pi) # create an output line - FrequencyList.append("Mode " + str(modeNumber - modeCount + 1) \ - + ": " + str(eigenFreq.real) + " Hz") + FrequencyList.append( + "Mode {}: {} Hz".format(modeNumber - modeCount + 1, eigenFreq.real) + ) modeCount = modeCount - 1 if modeNumber > 0: # push the results and append to output @@ -237,6 +240,7 @@ class Solve(run.Solve): except ValueError: return False + class Results(run.Results): def run(self): diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py index 263f28f396..649fd89ec9 100644 --- a/src/Mod/Fem/femsolver/elmer/writer.py +++ b/src/Mod/Fem/femsolver/elmer/writer.py @@ -231,7 +231,7 @@ class Writer(object): if system() == "Windows": subprocess.call( args, - stdout=subprocess.DEVNULL, + stdout=subprocess.DEVNULL, startupinfo=femutils.startProgramInfo("hide") ) else: @@ -241,11 +241,11 @@ class Writer(object): args.extend(["-partdual", "-metiskway", num_cores, "-out", self.directory]) if system() == "Windows": - subprocess.call( - args, - stdout=subprocess.DEVNULL, - startupinfo=femutils.startProgramInfo("hide") - ) + subprocess.call( + args, + stdout=subprocess.DEVNULL, + startupinfo=femutils.startProgramInfo("hide") + ) else: subprocess.call(args, stdout=subprocess.DEVNULL) @@ -423,17 +423,23 @@ class Writer(object): else self._getAllBodies()) for name in (n for n in refs if n in bodies): if "Density" not in m: - raise WriteError("Used material does not specify the necessary 'Density'.") + raise WriteError( + "Used material does not specify the necessary 'Density'." + ) self._material( name, "Density", self._getDensity(m)) if "ThermalConductivity" not in m: - raise WriteError("Used material does not specify the necessary 'Thermal Conductivity'.") + raise WriteError( + "Used material does not specify the necessary 'Thermal Conductivity'." + ) self._material( name, "Heat Conductivity", self._convert(m["ThermalConductivity"], "M*L/(T^3*O)")) if "SpecificHeat" not in m: - raise WriteError("Used material does not specify the necessary 'Specific Heat'.") + raise WriteError( + "Used material does not specify the necessary 'Specific Heat'." + ) self._material( name, "Heat Capacity", self._convert(m["SpecificHeat"], "L^2/(T^2*O)")) diff --git a/src/Mod/Fem/femsolver/settings.py b/src/Mod/Fem/femsolver/settings.py index 214677eabc..81dbebf1b1 100644 --- a/src/Mod/Fem/femsolver/settings.py +++ b/src/Mod/Fem/femsolver/settings.py @@ -106,6 +106,7 @@ def get_binary(name): ) return None + def get_cores(name): """ Read number of CPU cores for solver *name* honoring user settings. diff --git a/src/Mod/Fem/femtaskpanels/task_material_common.py b/src/Mod/Fem/femtaskpanels/task_material_common.py index a7e2a7d46d..a9f6b21487 100644 --- a/src/Mod/Fem/femtaskpanels/task_material_common.py +++ b/src/Mod/Fem/femtaskpanels/task_material_common.py @@ -137,7 +137,7 @@ class _TaskPanel: # hide some groupBox according to material category # note: input_fd_vol_expansion_coefficient is currently not used - # it might be used in future for solids + # it might be used in future for solids self.parameterWidget.label_category.setText(self.obj.Category) if self.obj.Category == "Fluid": self.parameterWidget.groupBox_mechanical.setVisible(0) diff --git a/src/Mod/Fem/femtaskpanels/task_solver_ccxtools.py b/src/Mod/Fem/femtaskpanels/task_solver_ccxtools.py index 3a755b7724..06d519171c 100644 --- a/src/Mod/Fem/femtaskpanels/task_solver_ccxtools.py +++ b/src/Mod/Fem/femtaskpanels/task_solver_ccxtools.py @@ -41,6 +41,7 @@ import FreeCADGui import FemGui + def unicode(text, *args): return str(text) diff --git a/src/Mod/Fem/femtest/app/test_common.py b/src/Mod/Fem/femtest/app/test_common.py index 14b0a8969d..0927f9d84e 100644 --- a/src/Mod/Fem/femtest/app/test_common.py +++ b/src/Mod/Fem/femtest/app/test_common.py @@ -25,7 +25,6 @@ __title__ = "Common FEM unit tests" __author__ = "Bernd Hahnebach" __url__ = "https://www.freecadweb.org" -import sys import unittest import FreeCAD diff --git a/src/Mod/Fem/femtest/app/test_open.py b/src/Mod/Fem/femtest/app/test_open.py index b3c9e31959..808119b4f6 100644 --- a/src/Mod/Fem/femtest/app/test_open.py +++ b/src/Mod/Fem/femtest/app/test_open.py @@ -25,7 +25,6 @@ __title__ = "Open files FEM App unit tests" __author__ = "Bernd Hahnebach" __url__ = "https://www.freecadweb.org" -import sys import tempfile import unittest from os.path import join diff --git a/src/Mod/Fem/femtest/app/test_solver_elmer.py b/src/Mod/Fem/femtest/app/test_solver_elmer.py index 43a77225af..3b62252ccf 100644 --- a/src/Mod/Fem/femtest/app/test_solver_elmer.py +++ b/src/Mod/Fem/femtest/app/test_solver_elmer.py @@ -25,7 +25,6 @@ __title__ = "Solver elmer FEM unit tests" __author__ = "Bernd Hahnebach" __url__ = "https://www.freecadweb.org" -import sys import unittest from os.path import join diff --git a/src/Mod/Fem/femtest/app/test_solver_z88.py b/src/Mod/Fem/femtest/app/test_solver_z88.py index 8cedbb1749..6cd626fd7d 100644 --- a/src/Mod/Fem/femtest/app/test_solver_z88.py +++ b/src/Mod/Fem/femtest/app/test_solver_z88.py @@ -26,7 +26,6 @@ __title__ = "Solver z88 FEM unit tests" __author__ = "Bernd Hahnebach" __url__ = "https://www.freecadweb.org" -import sys import unittest from os import listdir from os.path import join diff --git a/src/Mod/Fem/femtest/gui/test_open.py b/src/Mod/Fem/femtest/gui/test_open.py index d7fd521a3b..a185b5026a 100644 --- a/src/Mod/Fem/femtest/gui/test_open.py +++ b/src/Mod/Fem/femtest/gui/test_open.py @@ -25,7 +25,6 @@ __title__ = "Open files FEM Gui unit tests" __author__ = "Bernd Hahnebach" __url__ = "https://www.freecadweb.org" -import sys import tempfile import unittest from os.path import join