From 5c1fa3c24e69477a6b02e4b6bb5c3bcc1b66766d Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Mon, 3 Apr 2023 18:00:02 +0200 Subject: [PATCH] FEM: code formatting, pep8, 302 --- src/Mod/Fem/femcommands/commands.py | 1 + src/Mod/Fem/femexamples/equation_deformation_spring_elmer.py | 3 +++ .../equation_electrostatics_capacitance_two_balls.py | 3 +++ .../equation_electrostatics_electricforce_elmer_nongui6.py | 3 +++ src/Mod/Fem/femexamples/equation_flow_elmer_2D.py | 3 +++ src/Mod/Fem/femexamples/equation_flow_initial_elmer_2D.py | 3 +++ src/Mod/Fem/femexamples/equation_flow_turbulent_elmer_2D.py | 3 +++ src/Mod/Fem/femexamples/equation_flux_elmer.py | 3 +++ src/Mod/Fem/femexamples/equation_magnetodynamics_2D_elmer.py | 3 +++ src/Mod/Fem/femexamples/equation_magnetodynamics_elmer.py | 3 +++ src/Mod/Fem/femexamples/equation_magnetostatics_2D_elmer.py | 3 +++ src/Mod/Fem/femsolver/elmer/equations/deformation.py | 1 + src/Mod/Fem/femsolver/elmer/equations/deformation_writer.py | 1 + src/Mod/Fem/femsolver/elmer/equations/elasticity_writer.py | 1 + src/Mod/Fem/femsolver/elmer/equations/electricforce_writer.py | 1 + src/Mod/Fem/femsolver/elmer/equations/electrostatic_writer.py | 1 + src/Mod/Fem/femsolver/elmer/equations/flow_writer.py | 1 + src/Mod/Fem/femsolver/elmer/equations/flux_writer.py | 1 + src/Mod/Fem/femsolver/elmer/equations/heat_writer.py | 1 + src/Mod/Fem/femsolver/elmer/equations/magnetodynamic.py | 1 + src/Mod/Fem/femsolver/elmer/equations/magnetodynamic2D.py | 1 + .../Fem/femsolver/elmer/equations/magnetodynamic2D_writer.py | 1 + src/Mod/Fem/femsolver/elmer/equations/magnetodynamic_writer.py | 1 + src/Mod/Fem/femsolver/settings.py | 2 ++ src/Mod/Fem/femtools/femutils.py | 1 + 25 files changed, 46 insertions(+) diff --git a/src/Mod/Fem/femcommands/commands.py b/src/Mod/Fem/femcommands/commands.py index 9fc2da335d..03aacd2836 100644 --- a/src/Mod/Fem/femcommands/commands.py +++ b/src/Mod/Fem/femcommands/commands.py @@ -219,6 +219,7 @@ class _ConstraintCentrif(CommandManager): self.is_active = "with_analysis" self.do_activated = "add_obj_on_gui_set_edit" + class _ConstraintCurrentDensity(CommandManager): "The FEM_ConstraintCurrentDensity command definition" diff --git a/src/Mod/Fem/femexamples/equation_deformation_spring_elmer.py b/src/Mod/Fem/femexamples/equation_deformation_spring_elmer.py index 96ed7f6a7c..582b2ef5d6 100644 --- a/src/Mod/Fem/femexamples/equation_deformation_spring_elmer.py +++ b/src/Mod/Fem/femexamples/equation_deformation_spring_elmer.py @@ -36,6 +36,7 @@ from . import manager from .manager import get_meshname from .manager import init_doc + def get_information(): return { "name": "Deformation (nonlinear elasticity) - Elmer", @@ -47,6 +48,7 @@ def get_information(): "equations": ["deformation"] } + def get_explanation(header=""): return header + """ @@ -58,6 +60,7 @@ Deformation equation - Elmer solver """ + def setup(doc=None, solvertype="elmer"): # init FreeCAD document diff --git a/src/Mod/Fem/femexamples/equation_electrostatics_capacitance_two_balls.py b/src/Mod/Fem/femexamples/equation_electrostatics_capacitance_two_balls.py index 4da032f455..260b923d07 100644 --- a/src/Mod/Fem/femexamples/equation_electrostatics_capacitance_two_balls.py +++ b/src/Mod/Fem/femexamples/equation_electrostatics_capacitance_two_balls.py @@ -34,6 +34,7 @@ from . import manager from .manager import get_meshname from .manager import init_doc + def get_information(): return { "name": "Electrostatics Capacitance Two Balls", @@ -45,6 +46,7 @@ def get_information(): "equations": ["electrostatic"] } + def get_explanation(header=""): return header + """ @@ -60,6 +62,7 @@ Electrostatics equation in FreeCAD FEM-Elmer """ + def setup(doc=None, solvertype="elmer"): # init FreeCAD document diff --git a/src/Mod/Fem/femexamples/equation_electrostatics_electricforce_elmer_nongui6.py b/src/Mod/Fem/femexamples/equation_electrostatics_electricforce_elmer_nongui6.py index 9c7b0c2b6e..89b80f7891 100644 --- a/src/Mod/Fem/femexamples/equation_electrostatics_electricforce_elmer_nongui6.py +++ b/src/Mod/Fem/femexamples/equation_electrostatics_electricforce_elmer_nongui6.py @@ -37,6 +37,7 @@ from . import manager from .manager import get_meshname from .manager import init_doc + def get_information(): return { "name": "Electrostatics Electricforce - Elmer NonGUI6", @@ -48,6 +49,7 @@ def get_information(): "equations": ["electrostatic"] } + def get_explanation(header=""): return header + """ @@ -63,6 +65,7 @@ Electrostatics equation in FreeCAD FEM-Elmer """ + def setup(doc=None, solvertype="elmer"): # init FreeCAD document diff --git a/src/Mod/Fem/femexamples/equation_flow_elmer_2D.py b/src/Mod/Fem/femexamples/equation_flow_elmer_2D.py index 5bf55721eb..cedbd45165 100644 --- a/src/Mod/Fem/femexamples/equation_flow_elmer_2D.py +++ b/src/Mod/Fem/femexamples/equation_flow_elmer_2D.py @@ -35,6 +35,7 @@ from . import manager from .manager import get_meshname from .manager import init_doc + def get_information(): return { "name": "Flow - Elmer 2D", @@ -47,6 +48,7 @@ def get_information(): "equations": ["flow", "heat"] } + def get_explanation(header=""): return header + """ @@ -58,6 +60,7 @@ Flow and Heat equation - Elmer solver """ + def setup(doc=None, solvertype="elmer"): # init FreeCAD document diff --git a/src/Mod/Fem/femexamples/equation_flow_initial_elmer_2D.py b/src/Mod/Fem/femexamples/equation_flow_initial_elmer_2D.py index 7edb3331ca..941d89b5f7 100644 --- a/src/Mod/Fem/femexamples/equation_flow_initial_elmer_2D.py +++ b/src/Mod/Fem/femexamples/equation_flow_initial_elmer_2D.py @@ -35,6 +35,7 @@ from . import manager from .manager import get_meshname from .manager import init_doc + def get_information(): return { "name": "Initial Flow - Elmer 2D", @@ -47,6 +48,7 @@ def get_information(): "equations": ["flow", "heat"] } + def get_explanation(header=""): return header + """ @@ -58,6 +60,7 @@ Flow and Heat equation with initial velocity - Elmer solver """ + def setup(doc=None, solvertype="elmer"): # init FreeCAD document diff --git a/src/Mod/Fem/femexamples/equation_flow_turbulent_elmer_2D.py b/src/Mod/Fem/femexamples/equation_flow_turbulent_elmer_2D.py index 454509b974..1fddc7118c 100644 --- a/src/Mod/Fem/femexamples/equation_flow_turbulent_elmer_2D.py +++ b/src/Mod/Fem/femexamples/equation_flow_turbulent_elmer_2D.py @@ -35,6 +35,7 @@ from . import manager from .manager import get_meshname from .manager import init_doc + def get_information(): return { "name": "Turbulent Flow - Elmer 2D", @@ -47,6 +48,7 @@ def get_information(): "equations": ["flow", "heat"] } + def get_explanation(header=""): return header + """ @@ -58,6 +60,7 @@ Flow and Heat equation in turbulent flow - Elmer solver """ + def setup(doc=None, solvertype="elmer"): # init FreeCAD document diff --git a/src/Mod/Fem/femexamples/equation_flux_elmer.py b/src/Mod/Fem/femexamples/equation_flux_elmer.py index 360270ee99..166e5610bd 100644 --- a/src/Mod/Fem/femexamples/equation_flux_elmer.py +++ b/src/Mod/Fem/femexamples/equation_flux_elmer.py @@ -31,6 +31,7 @@ from . import manager from .manager import get_meshname from .manager import init_doc + def get_information(): return { "name": "Flux - Elmer", @@ -42,6 +43,7 @@ def get_information(): "equations": ["electrostatic", "flux", "heat"] } + def get_explanation(header=""): return header + """ @@ -53,6 +55,7 @@ Potential flux and heat flux - Elmer solver """ + def setup(doc=None, solvertype="elmer"): # init FreeCAD document diff --git a/src/Mod/Fem/femexamples/equation_magnetodynamics_2D_elmer.py b/src/Mod/Fem/femexamples/equation_magnetodynamics_2D_elmer.py index dd3220b355..073e1565c7 100644 --- a/src/Mod/Fem/femexamples/equation_magnetodynamics_2D_elmer.py +++ b/src/Mod/Fem/femexamples/equation_magnetodynamics_2D_elmer.py @@ -36,6 +36,7 @@ from . import manager from .manager import get_meshname from .manager import init_doc + def get_information(): return { "name": "Inductive heating - Elmer 2D", @@ -47,6 +48,7 @@ def get_information(): "equations": ["electromagnetic"] } + def get_explanation(header=""): return header + """ @@ -58,6 +60,7 @@ Magnetodynamic2D equation - Elmer solver """ + def setup(doc=None, solvertype="elmer"): # init FreeCAD document diff --git a/src/Mod/Fem/femexamples/equation_magnetodynamics_elmer.py b/src/Mod/Fem/femexamples/equation_magnetodynamics_elmer.py index 60eab7bae0..546c557385 100644 --- a/src/Mod/Fem/femexamples/equation_magnetodynamics_elmer.py +++ b/src/Mod/Fem/femexamples/equation_magnetodynamics_elmer.py @@ -35,6 +35,7 @@ from . import manager from .manager import get_meshname from .manager import init_doc + def get_information(): return { "name": "Magnetic Field Around Wire", @@ -46,6 +47,7 @@ def get_information(): "equations": ["electromagnetic"] } + def get_explanation(header=""): return header + """ @@ -57,6 +59,7 @@ Magnetodynamic equation - Elmer solver """ + def setup(doc=None, solvertype="elmer"): # init FreeCAD document diff --git a/src/Mod/Fem/femexamples/equation_magnetostatics_2D_elmer.py b/src/Mod/Fem/femexamples/equation_magnetostatics_2D_elmer.py index 39c07025eb..e915993482 100644 --- a/src/Mod/Fem/femexamples/equation_magnetostatics_2D_elmer.py +++ b/src/Mod/Fem/femexamples/equation_magnetostatics_2D_elmer.py @@ -34,6 +34,7 @@ from . import manager from .manager import get_meshname from .manager import init_doc + def get_information(): return { "name": "Magnetostatic - Elmer 2D", @@ -45,6 +46,7 @@ def get_information(): "equations": ["magnetostatic"] } + def get_explanation(header=""): return header + """ @@ -56,6 +58,7 @@ Magnetodynamic2D equation - Elmer solver """ + def setup(doc=None, solvertype="elmer"): # init FreeCAD document diff --git a/src/Mod/Fem/femsolver/elmer/equations/deformation.py b/src/Mod/Fem/femsolver/elmer/equations/deformation.py index 48b3d9fd70..a0d40ebf93 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/deformation.py +++ b/src/Mod/Fem/femsolver/elmer/equations/deformation.py @@ -32,6 +32,7 @@ from femtools import femutils from . import nonlinear from ... import equationbase + def create(doc, name="Deformation"): return femutils.createObject( doc, name, Proxy, ViewProxy) diff --git a/src/Mod/Fem/femsolver/elmer/equations/deformation_writer.py b/src/Mod/Fem/femsolver/elmer/equations/deformation_writer.py index a473e0779d..ef50ec7da6 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/deformation_writer.py +++ b/src/Mod/Fem/femsolver/elmer/equations/deformation_writer.py @@ -35,6 +35,7 @@ from .. import sifio from .. import writer as general_writer from femtools import femutils + class DeformationWriter: def __init__(self, writer, solver): diff --git a/src/Mod/Fem/femsolver/elmer/equations/elasticity_writer.py b/src/Mod/Fem/femsolver/elmer/equations/elasticity_writer.py index 975c1f2689..2e52062b32 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/elasticity_writer.py +++ b/src/Mod/Fem/femsolver/elmer/equations/elasticity_writer.py @@ -36,6 +36,7 @@ from .. import writer as general_writer from femtools import femutils from . import elasticity + class ElasticityWriter: def __init__(self, writer, solver): diff --git a/src/Mod/Fem/femsolver/elmer/equations/electricforce_writer.py b/src/Mod/Fem/femsolver/elmer/equations/electricforce_writer.py index e0ba63b076..b82cdffa70 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/electricforce_writer.py +++ b/src/Mod/Fem/femsolver/elmer/equations/electricforce_writer.py @@ -32,6 +32,7 @@ __url__ = "https://www.freecad.org" from .. import sifio from . import electricforce + class EFwriter: def __init__(self, writer, solver): diff --git a/src/Mod/Fem/femsolver/elmer/equations/electrostatic_writer.py b/src/Mod/Fem/femsolver/elmer/equations/electrostatic_writer.py index de5984f248..fe5fd34211 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/electrostatic_writer.py +++ b/src/Mod/Fem/femsolver/elmer/equations/electrostatic_writer.py @@ -32,6 +32,7 @@ __url__ = "https://www.freecad.org" from .. import sifio + class ESwriter: def __init__(self, writer, solver): diff --git a/src/Mod/Fem/femsolver/elmer/equations/flow_writer.py b/src/Mod/Fem/femsolver/elmer/equations/flow_writer.py index 59c2e925ab..8649ba4a84 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/flow_writer.py +++ b/src/Mod/Fem/femsolver/elmer/equations/flow_writer.py @@ -34,6 +34,7 @@ from .. import sifio from .. import writer as general_writer from . import flow + class Flowwriter: def __init__(self, writer, solver): diff --git a/src/Mod/Fem/femsolver/elmer/equations/flux_writer.py b/src/Mod/Fem/femsolver/elmer/equations/flux_writer.py index c4116f9458..f898a68a8e 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/flux_writer.py +++ b/src/Mod/Fem/femsolver/elmer/equations/flux_writer.py @@ -33,6 +33,7 @@ __url__ = "https://www.freecad.org" from .. import sifio from . import flux + class Fluxwriter: def __init__(self, writer, solver): diff --git a/src/Mod/Fem/femsolver/elmer/equations/heat_writer.py b/src/Mod/Fem/femsolver/elmer/equations/heat_writer.py index 066dde3d0b..cc9840a117 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/heat_writer.py +++ b/src/Mod/Fem/femsolver/elmer/equations/heat_writer.py @@ -36,6 +36,7 @@ from femtools import membertools from femmesh import meshtools from . import heat + class Heatwriter: def __init__(self, writer, solver): diff --git a/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic.py b/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic.py index c4d21e8ebb..d1db09c355 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic.py +++ b/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic.py @@ -32,6 +32,7 @@ from femtools import femutils from . import nonlinear from ... import equationbase + def create(doc, name="Magnetodynamic"): return femutils.createObject( doc, name, Proxy, ViewProxy) diff --git a/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic2D.py b/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic2D.py index e3fd701a5f..704c63efc8 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic2D.py +++ b/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic2D.py @@ -32,6 +32,7 @@ from femtools import femutils from . import nonlinear from ... import equationbase + def create(doc, name="Magnetodynamic2D"): return femutils.createObject( doc, name, Proxy, ViewProxy) diff --git a/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic2D_writer.py b/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic2D_writer.py index 54883099ce..7632174975 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic2D_writer.py +++ b/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic2D_writer.py @@ -34,6 +34,7 @@ from FreeCAD import Units from .. import sifio from .. import writer as general_writer + class MgDyn2Dwriter: def __init__(self, writer, solver): diff --git a/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic_writer.py b/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic_writer.py index d9ba9e481a..17df28dacb 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic_writer.py +++ b/src/Mod/Fem/femsolver/elmer/equations/magnetodynamic_writer.py @@ -34,6 +34,7 @@ from FreeCAD import Units from .. import sifio from .. import writer as general_writer + class MgDynwriter: def __init__(self, writer, solver): diff --git a/src/Mod/Fem/femsolver/settings.py b/src/Mod/Fem/femsolver/settings.py index a620a3d53f..34799f5b2e 100644 --- a/src/Mod/Fem/femsolver/settings.py +++ b/src/Mod/Fem/femsolver/settings.py @@ -167,6 +167,7 @@ def get_dir_setting(): return DirSetting.CUSTOM return DirSetting.TEMPORARY + def get_default_solver(): """ Return default solver name. """ @@ -182,6 +183,7 @@ def get_default_solver(): param_group = FreeCAD.ParamGet(_GENERAL_PARAM) return solver_map[param_group.GetInt("DefaultSolver", 0)] + class _SolverDlg(object): """ Internal query logic for solver specific settings. diff --git a/src/Mod/Fem/femtools/femutils.py b/src/Mod/Fem/femtools/femutils.py index d2234cebc9..4c52da5374 100644 --- a/src/Mod/Fem/femtools/femutils.py +++ b/src/Mod/Fem/femtools/femutils.py @@ -397,6 +397,7 @@ def startProgramInfo(code): info.dwFlags = subprocess.STARTF_USESHOWWINDOW return info + def expandParentObject(): """ expands parent and selected obj in tree view """ trees = FreeCADGui.getMainWindow().findChildren(QtGui.QTreeWidget)