From 3369aa4eca45fcc604e60b5e4ff9b1b35ce8680b Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sat, 6 Aug 2022 22:25:37 +0200 Subject: [PATCH] FEM: Python pep8 code formatting --- src/Mod/Fem/femsolver/elmer/equations/flow.py | 1 + src/Mod/Fem/femsolver/elmer/equations/heat.py | 3 ++- src/Mod/Fem/femsolver/elmer/writer.py | 6 ++++-- src/Mod/Fem/femsolver/z88/writer.py | 8 ++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Mod/Fem/femsolver/elmer/equations/flow.py b/src/Mod/Fem/femsolver/elmer/equations/flow.py index 2742a0029e..f2cda71707 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/flow.py +++ b/src/Mod/Fem/femsolver/elmer/equations/flow.py @@ -34,6 +34,7 @@ from ... import equationbase CONVECTION_TYPE = ["None", "Computed", "Constant"] + def create(doc, name="Flow"): return femutils.createObject( doc, name, Proxy, ViewProxy) diff --git a/src/Mod/Fem/femsolver/elmer/equations/heat.py b/src/Mod/Fem/femsolver/elmer/equations/heat.py index f3458605ee..08a023bd67 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/heat.py +++ b/src/Mod/Fem/femsolver/elmer/equations/heat.py @@ -35,6 +35,7 @@ from ... import equationbase CONVECTION_TYPE = ["None", "Computed", "Constant"] PHASE_CHANGE_MODEL = ["None", "Spatial 1", "Spatial 2", "Temporal"] + def create(doc, name="Heat"): return femutils.createObject( doc, name, Proxy, ViewProxy) @@ -67,7 +68,7 @@ class Proxy(nonlinear.Proxy, equationbase.HeatProxy): "Equation", "Model for phase change" ) - + obj.Bubbles = True obj.Stabilize = False obj.Convection = CONVECTION_TYPE diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py index d7273f3ebb..5b89043fa1 100644 --- a/src/Mod/Fem/femsolver/elmer/writer.py +++ b/src/Mod/Fem/femsolver/elmer/writer.py @@ -1348,8 +1348,10 @@ class Writer(object): if self._hasExpression(equation) != equation.NonlinearTolerance: equation.setExpression("NonlinearTolerance", str(equation.NonlinearTolerance)) if self._hasExpression(equation) != equation.NonlinearNewtonAfterTolerance: - equation.setExpression("NonlinearNewtonAfterTolerance",\ - str(equation.NonlinearNewtonAfterTolerance)) + equation.setExpression( + "NonlinearNewtonAfterTolerance", + str(equation.NonlinearNewtonAfterTolerance) + ) def _createNonlinearSolver(self, equation): # first check if we have to update diff --git a/src/Mod/Fem/femsolver/z88/writer.py b/src/Mod/Fem/femsolver/z88/writer.py index 9b400f8851..d9a62926e1 100644 --- a/src/Mod/Fem/femsolver/z88/writer.py +++ b/src/Mod/Fem/femsolver/z88/writer.py @@ -292,13 +292,13 @@ class FemInputWriterZ88(writerbase.FemInputWriter): MaxGS = prefs.GetInt("MaxGS", 100000000) MaxKOI = prefs.GetInt("MaxKOI", 2800000) global z88_dyn_template - templateArray = z88_dyn_template.splitlines() + template_array = z88_dyn_template.splitlines() output = "" - for line in templateArray: + for line in template_array: if line.find("MAXGS") > -1: - line = " MAXGS " + str(MaxGS) + line = " MAXGS {}".format(MaxGS) if line.find("MAXKOI") > -1: - line = " MAXKOI " + str(MaxKOI) + line = " MAXKOI {}".format(MaxKOI) output += line + "\n" solver_parameter_file_path = self.file_name + ".dyn"