diff --git a/src/Mod/Fem/femcommands/manager.py b/src/Mod/Fem/femcommands/manager.py index e6490737dc..69774a2107 100644 --- a/src/Mod/Fem/femcommands/manager.py +++ b/src/Mod/Fem/femcommands/manager.py @@ -28,7 +28,7 @@ __url__ = "http://www.freecadweb.org" # @{ import FreeCAD -import femtools.femutils as femutils +from femtools import femutils if FreeCAD.GuiUp: import FreeCADGui diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py index cca9537471..cc1f3bac35 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py @@ -33,8 +33,8 @@ import FreeCADGui from . import ViewProviderFemConstraint # for the panel -import femtools.femutils as femutils -import femtools.membertools as membertools +from femtools import femutils +from femtools import membertools from FreeCAD import Units from . import FemSelectionWidgets diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py index 3e7c648db4..f8f012f7d1 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py @@ -33,8 +33,8 @@ import FreeCADGui from . import ViewProviderFemConstraint # for the panel -import femtools.femutils as femutils -import femtools.membertools as membertools +from femtools import femutils +from femtools import membertools from FreeCAD import Units from . import FemSelectionWidgets diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py index 5cfdb43387..5262150101 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintInitialFlowVelocity.py @@ -33,8 +33,8 @@ import FreeCADGui from . import ViewProviderFemConstraint # for the panel -import femtools.femutils as femutils -import femtools.membertools as membertools +from femtools import femutils +from femtools import membertools from FreeCAD import Units diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py index 9de35883d1..cb9b470a1b 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py @@ -390,7 +390,7 @@ class _TaskPanelFemMeshGmsh: self.gmsh_runs = True self.console_log("We are going to start ...") self.get_active_analysis() - import femmesh.gmshtools as gmshtools + from femmesh import gmshtools gmsh_mesh = gmshtools.GmshTools(self.obj, self.analysis) self.console_log("Start Gmsh ...") error = "" diff --git a/src/Mod/Fem/feminout/importCcxFrdResults.py b/src/Mod/Fem/feminout/importCcxFrdResults.py index e1311824d1..697809e664 100644 --- a/src/Mod/Fem/feminout/importCcxFrdResults.py +++ b/src/Mod/Fem/feminout/importCcxFrdResults.py @@ -127,7 +127,7 @@ def importFrd( # complementary result object calculations import femresult.resulttools as restools - import femtools.femutils as femutils + from femtools import femutils if not res_obj.MassFlowRate: # information 1: # only compact result if not Flow 1D results diff --git a/src/Mod/Fem/femmesh/gmshtools.py b/src/Mod/Fem/femmesh/gmshtools.py index 594f34cfa9..73c863ef92 100644 --- a/src/Mod/Fem/femmesh/gmshtools.py +++ b/src/Mod/Fem/femmesh/gmshtools.py @@ -35,7 +35,7 @@ from FreeCAD import Console import Fem from FreeCAD import Units from . import meshtools -import femtools.femutils as femutils +from femtools import femutils class GmshTools(): diff --git a/src/Mod/Fem/femresult/resulttools.py b/src/Mod/Fem/femresult/resulttools.py index be35b03775..e3e0b276e6 100644 --- a/src/Mod/Fem/femresult/resulttools.py +++ b/src/Mod/Fem/femresult/resulttools.py @@ -27,7 +27,7 @@ __url__ = "http://www.freecadweb.org" # @{ import FreeCAD -import femtools.femutils as femutils +from femtools import femutils import numpy as np from math import isnan diff --git a/src/Mod/Fem/femsolver/calculix/solver.py b/src/Mod/Fem/femsolver/calculix/solver.py index cdee5bd634..35aa09a91b 100644 --- a/src/Mod/Fem/femsolver/calculix/solver.py +++ b/src/Mod/Fem/femsolver/calculix/solver.py @@ -30,7 +30,7 @@ import os import glob import FreeCAD -import femtools.femutils as femutils +from femtools import femutils from .. import run from .. import solverbase diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py index c1be39c03b..348c4b021f 100644 --- a/src/Mod/Fem/femsolver/calculix/tasks.py +++ b/src/Mod/Fem/femsolver/calculix/tasks.py @@ -32,8 +32,8 @@ import subprocess import os.path import FreeCAD -import femtools.femutils as femutils -import femtools.membertools as membertools +from femtools import femutils +from femtools import membertools import feminout.importCcxFrdResults as importCcxFrdResults import feminout.importCcxDatResults as importCcxDatResults diff --git a/src/Mod/Fem/femsolver/elmer/equations/elasticity.py b/src/Mod/Fem/femsolver/elmer/equations/elasticity.py index 23cdae5ff6..33a755c3e2 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/elasticity.py +++ b/src/Mod/Fem/femsolver/elmer/equations/elasticity.py @@ -26,7 +26,7 @@ __url__ = "http://www.freecadweb.org" ## \addtogroup FEM # @{ -import femtools.femutils as femutils +from femtools import femutils from ... import equationbase from . import linear diff --git a/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py b/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py index c16edc60c1..96e4de9a2c 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py +++ b/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py @@ -26,7 +26,7 @@ __url__ = "http://www.freecadweb.org" ## \addtogroup FEM # @{ -import femtools.femutils as femutils +from femtools import femutils from ... import equationbase from . import linear diff --git a/src/Mod/Fem/femsolver/elmer/equations/equation.py b/src/Mod/Fem/femsolver/elmer/equations/equation.py index 4078677195..8fbf7bbbe3 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/equation.py +++ b/src/Mod/Fem/femsolver/elmer/equations/equation.py @@ -28,7 +28,7 @@ __url__ = "http://www.freecadweb.org" import FreeCAD as App from ... import equationbase -import femtools.membertools as membertools +from femtools import membertools if App.GuiUp: import FreeCADGui as Gui diff --git a/src/Mod/Fem/femsolver/elmer/equations/flow.py b/src/Mod/Fem/femsolver/elmer/equations/flow.py index f84b5b1d20..d3c3e26872 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/flow.py +++ b/src/Mod/Fem/femsolver/elmer/equations/flow.py @@ -26,7 +26,7 @@ __url__ = "http://www.freecadweb.org" ## \addtogroup FEM # @{ -import femtools.femutils as femutils +from femtools import femutils from . import nonlinear from ... import equationbase diff --git a/src/Mod/Fem/femsolver/elmer/equations/fluxsolver.py b/src/Mod/Fem/femsolver/elmer/equations/fluxsolver.py index ed6c59440d..64a85ab070 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/fluxsolver.py +++ b/src/Mod/Fem/femsolver/elmer/equations/fluxsolver.py @@ -26,7 +26,7 @@ __url__ = "http://www.freecadweb.org" ## \addtogroup FEM # @{ -import femtools.femutils as femutils +from femtools import femutils from ... import equationbase from . import linear diff --git a/src/Mod/Fem/femsolver/elmer/equations/heat.py b/src/Mod/Fem/femsolver/elmer/equations/heat.py index 9c05eafea0..fb74164827 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/heat.py +++ b/src/Mod/Fem/femsolver/elmer/equations/heat.py @@ -26,7 +26,7 @@ __url__ = "http://www.freecadweb.org" ## \addtogroup FEM # @{ -import femtools.femutils as femutils +from femtools import femutils from . import nonlinear from ... import equationbase diff --git a/src/Mod/Fem/femsolver/elmer/solver.py b/src/Mod/Fem/femsolver/elmer/solver.py index 5553863114..b270fceae9 100644 --- a/src/Mod/Fem/femsolver/elmer/solver.py +++ b/src/Mod/Fem/femsolver/elmer/solver.py @@ -26,7 +26,7 @@ __url__ = "http://www.freecadweb.org" ## \addtogroup FEM # @{ -import femtools.femutils as femutils +from femtools import femutils from .. import run from .. import solverbase diff --git a/src/Mod/Fem/femsolver/elmer/tasks.py b/src/Mod/Fem/femsolver/elmer/tasks.py index 86b3cf4d52..334272d14e 100644 --- a/src/Mod/Fem/femsolver/elmer/tasks.py +++ b/src/Mod/Fem/femsolver/elmer/tasks.py @@ -31,8 +31,8 @@ import os.path import sys import FreeCAD -import femtools.femutils as femutils -import femtools.membertools as membertools +from femtools import femutils +from femtools import membertools from .. import run from .. import settings diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py index dd69d6e604..dd4abdd25a 100644 --- a/src/Mod/Fem/femsolver/elmer/writer.py +++ b/src/Mod/Fem/femsolver/elmer/writer.py @@ -34,9 +34,9 @@ import tempfile from FreeCAD import Units from FreeCAD import Console import Fem -import femtools.femutils as femutils -import femtools.membertools as membertools -import femmesh.gmshtools as gmshtools +from femmesh import gmshtools +from femtools import femutils +from femtools import membertools from .. import settings from . import sifio diff --git a/src/Mod/Fem/femsolver/run.py b/src/Mod/Fem/femsolver/run.py index 7b22ba2936..51afcfa299 100644 --- a/src/Mod/Fem/femsolver/run.py +++ b/src/Mod/Fem/femsolver/run.py @@ -40,8 +40,8 @@ import shutil import tempfile import FreeCAD as App -import femtools.femutils as femutils -import femtools.membertools as membertools +from femtools import femutils +from femtools import membertools from . import settings from . import signal from . import task diff --git a/src/Mod/Fem/femsolver/z88/solver.py b/src/Mod/Fem/femsolver/z88/solver.py index 8ff21e9ced..f0c7e9872a 100644 --- a/src/Mod/Fem/femsolver/z88/solver.py +++ b/src/Mod/Fem/femsolver/z88/solver.py @@ -30,7 +30,7 @@ import os import glob import FreeCAD -import femtools.femutils as femutils +from femtools import femutils from .. import run from .. import solverbase diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py index 2192930caf..413bda7283 100644 --- a/src/Mod/Fem/femsolver/z88/tasks.py +++ b/src/Mod/Fem/femsolver/z88/tasks.py @@ -31,8 +31,8 @@ import subprocess import os.path import FreeCAD -import femtools.femutils as femutils -import femtools.membertools as membertools +from femtools import femutils +from femtools import membertools import feminout.importZ88O2Results as importZ88O2Results from .. import run diff --git a/src/Mod/Fem/femtools/ccxtools.py b/src/Mod/Fem/femtools/ccxtools.py index 6d750f1c0d..871f0824bd 100644 --- a/src/Mod/Fem/femtools/ccxtools.py +++ b/src/Mod/Fem/femtools/ccxtools.py @@ -32,8 +32,8 @@ import os import sys import subprocess import FreeCAD -import femtools.femutils as femutils -import femtools.membertools as membertools +from femtools import femutils +from femtools import membertools from PySide import QtCore if FreeCAD.GuiUp: from PySide import QtGui