FEM: improve imports

FreeCAD · Feb 26, 2020 · f9f5a7d · f9f5a7d
1 parent 778c269
commit f9f5a7d
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 33 deletions.
diff --git a/src/Mod/Fem/femcommands/manager.py b/src/Mod/Fem/femcommands/manager.py
@@ -28,7 +28,7 @@
 #  @{
 
 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
@@ -33,8 +33,8 @@
 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
@@ -33,8 +33,8 @@
 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
@@ -33,8 +33,8 @@
 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
@@ -390,7 +390,7 @@ def run_gmsh(self):
         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
@@ -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
@@ -35,7 +35,7 @@
 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
@@ -27,7 +27,7 @@
 #  @{
 
 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
@@ -30,7 +30,7 @@
 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
@@ -32,8 +32,8 @@
 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
@@ -26,7 +26,7 @@
 ## \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
@@ -26,7 +26,7 @@
 ## \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
@@ -28,7 +28,7 @@
 
 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
@@ -26,7 +26,7 @@
 ## \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
@@ -26,7 +26,7 @@
 ## \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
@@ -26,7 +26,7 @@
 ## \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
@@ -26,7 +26,7 @@
 ## \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
@@ -31,8 +31,8 @@
 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
@@ -34,9 +34,9 @@
 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
@@ -40,8 +40,8 @@
 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
@@ -30,7 +30,7 @@
 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
@@ -31,8 +31,8 @@
 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
@@ -32,8 +32,8 @@
 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