From ff1601be5fd8ed97efff08da654aa8cdf504828d Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 9 Jan 2018 07:29:48 +0100 Subject: [PATCH] FEM: fem tools package, move fem utils in it --- src/Mod/Fem/CMakeLists.txt | 2 +- .../PyGui/_ViewProviderFemConstraintElectrostaticPotential.py | 2 +- src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py | 2 +- .../Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py | 2 +- src/Mod/Fem/femsolver/calculix/solver.py | 2 +- src/Mod/Fem/femsolver/calculix/tasks.py | 2 +- src/Mod/Fem/femsolver/elmer/equations/elasticity.py | 2 +- src/Mod/Fem/femsolver/elmer/equations/electrostatic.py | 2 +- src/Mod/Fem/femsolver/elmer/equations/equation.py | 2 +- src/Mod/Fem/femsolver/elmer/equations/flow.py | 2 +- src/Mod/Fem/femsolver/elmer/equations/fluxsolver.py | 2 +- src/Mod/Fem/femsolver/elmer/equations/heat.py | 2 +- src/Mod/Fem/femsolver/elmer/solver.py | 2 +- src/Mod/Fem/femsolver/elmer/tasks.py | 2 +- src/Mod/Fem/femsolver/elmer/writer.py | 2 +- src/Mod/Fem/femsolver/run.py | 2 +- src/Mod/Fem/femsolver/z88/solver.py | 2 +- src/Mod/Fem/femsolver/z88/tasks.py | 2 +- src/Mod/Fem/{FemUtils.py => femtools/femutils.py} | 0 19 files changed, 18 insertions(+), 18 deletions(-) rename src/Mod/Fem/{FemUtils.py => femtools/femutils.py} (100%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index ee12933830..ee392eae7e 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -22,7 +22,6 @@ endif(BUILD_GUI) SET(FemScripts_SRCS Init.py InitGui.py - FemUtils.py ObjectsFem.py TestFem.py ) @@ -155,6 +154,7 @@ SET(FemTestsElmer_SRCS SET(FemTools_SRCS femtools/__init__.py femtools/ccxtools.py + femtools/femutils.py ) SET(FemObjectsScripts_SRCS diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py index 0dd8624821..4cdf6a216a 100644 --- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py +++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py @@ -27,7 +27,7 @@ __url__ = "http://www.freecadweb.org" import FreeCAD as App -import FemUtils +import femtools.femutils as FemUtils from . import ViewProviderFemConstraint from FreeCAD import Units diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py index ad1e255e2f..debc854f96 100644 --- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py +++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py @@ -27,7 +27,7 @@ __url__ = "http://www.freecadweb.org" import FreeCAD as App -import FemUtils +import femtools.femutils as FemUtils from . import ViewProviderFemConstraint from FreeCAD import Units diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py index 1e6a774e34..8734ec036d 100644 --- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py +++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py @@ -27,7 +27,7 @@ __url__ = "http://www.freecadweb.org" import FreeCAD as App -import FemUtils +import femtools.femutils as FemUtils from . import ViewProviderFemConstraint from FreeCAD import Units diff --git a/src/Mod/Fem/femsolver/calculix/solver.py b/src/Mod/Fem/femsolver/calculix/solver.py index 2501795173..312e6e8feb 100644 --- a/src/Mod/Fem/femsolver/calculix/solver.py +++ b/src/Mod/Fem/femsolver/calculix/solver.py @@ -31,7 +31,7 @@ import os import glob import FreeCAD -import FemUtils +import femtools.femutils as 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 4cfcc3f15a..85cde74853 100644 --- a/src/Mod/Fem/femsolver/calculix/tasks.py +++ b/src/Mod/Fem/femsolver/calculix/tasks.py @@ -32,7 +32,7 @@ import subprocess import os.path import FreeCAD as App -import FemUtils +import femtools.femutils as FemUtils 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 a15c150c2d..6625decf7e 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/elasticity.py +++ b/src/Mod/Fem/femsolver/elmer/equations/elasticity.py @@ -26,7 +26,7 @@ __author__ = "Markus Hovorka" __url__ = "http://www.freecadweb.org" -import FemUtils +import femtools.femutils as 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 98f543ec92..448c071795 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py +++ b/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py @@ -26,7 +26,7 @@ __author__ = "Markus Hovorka" __url__ = "http://www.freecadweb.org" -import FemUtils +import femtools.femutils as 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 8253640c94..b87b2b84ec 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 FemUtils +import femtools.femutils as FemUtils 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 786474d586..966f0a4956 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/flow.py +++ b/src/Mod/Fem/femsolver/elmer/equations/flow.py @@ -26,7 +26,7 @@ __author__ = "Markus Hovorka" __url__ = "http://www.freecadweb.org" -import FemUtils +import femtools.femutils as 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 bc69e11edd..553ef9043f 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/fluxsolver.py +++ b/src/Mod/Fem/femsolver/elmer/equations/fluxsolver.py @@ -26,7 +26,7 @@ __author__ = "Markus Hovorka" __url__ = "http://www.freecadweb.org" -import FemUtils +import femtools.femutils as 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 f992982ac7..dfe246525e 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/heat.py +++ b/src/Mod/Fem/femsolver/elmer/equations/heat.py @@ -26,7 +26,7 @@ __author__ = "Markus Hovorka" __url__ = "http://www.freecadweb.org" -import FemUtils +import femtools.femutils as 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 89fe136590..da87cade57 100644 --- a/src/Mod/Fem/femsolver/elmer/solver.py +++ b/src/Mod/Fem/femsolver/elmer/solver.py @@ -26,7 +26,7 @@ __author__ = "Markus Hovorka" __url__ = "http://www.freecadweb.org" -import FemUtils +import femtools.femutils as 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 826f48b781..2b1aa2fcfd 100644 --- a/src/Mod/Fem/femsolver/elmer/tasks.py +++ b/src/Mod/Fem/femsolver/elmer/tasks.py @@ -28,7 +28,7 @@ __url__ = "http://www.freecadweb.org" import subprocess import os.path -import FemUtils +import femtools.femutils as FemUtils 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 bc105a0f1a..ac7160887a 100644 --- a/src/Mod/Fem/femsolver/elmer/writer.py +++ b/src/Mod/Fem/femsolver/elmer/writer.py @@ -33,7 +33,7 @@ import tempfile from FreeCAD import Units import Fem -import FemUtils +import femtools.femutils as FemUtils import femmesh.gmshtools as gmshtools from .. import settings from . import sifio diff --git a/src/Mod/Fem/femsolver/run.py b/src/Mod/Fem/femsolver/run.py index f431351ef5..0d29f8ad3d 100644 --- a/src/Mod/Fem/femsolver/run.py +++ b/src/Mod/Fem/femsolver/run.py @@ -33,7 +33,7 @@ import threading import shutil import FreeCAD as App -import FemUtils +import femtools.femutils as FemUtils 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 2dbc533319..7f32be7689 100644 --- a/src/Mod/Fem/femsolver/z88/solver.py +++ b/src/Mod/Fem/femsolver/z88/solver.py @@ -31,7 +31,7 @@ import os import glob import FreeCAD -import FemUtils +import femtools.femutils as 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 d5ab8849cc..a199cb2c98 100644 --- a/src/Mod/Fem/femsolver/z88/tasks.py +++ b/src/Mod/Fem/femsolver/z88/tasks.py @@ -31,7 +31,7 @@ import subprocess import os.path import FreeCAD as App -import FemUtils +import femtools.femutils as FemUtils import feminout.importZ88O2Results as importZ88O2Results from .. import run diff --git a/src/Mod/Fem/FemUtils.py b/src/Mod/Fem/femtools/femutils.py similarity index 100% rename from src/Mod/Fem/FemUtils.py rename to src/Mod/Fem/femtools/femutils.py