Merge branch 'master' into master

FreeCAD · Feb 26, 2020 · 4b62adb · 4b62adb
2 parents e4e4d9f + 3d4013b
commit 4b62adb
Show file tree

Hide file tree

Showing 28 changed files with 1,096 additions and 63 deletions.
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
@@ -221,6 +221,7 @@ SET(FemTools_SRCS
     femtools/__init__.py
     femtools/membertools.py
     femtools/ccxtools.py
+    femtools/constants.py
     femtools/errors.py
     femtools/femutils.py
     femtools/tokrules.py

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/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py
@@ -63,6 +63,9 @@ def __init__(
             self.dir_name,
             "{}_inout_nodes.txt".format(self.mesh_object.Name)
         )
+        from femtools import constants
+        from FreeCAD import Units
+        self.gravity = Units.Quantity(constants.gravity()).getValueAs("mm/s^2")
 
     def write_calculix_input_file(self):
         timestart = time.process_time()
@@ -1095,9 +1098,10 @@ def write_constraints_selfweight(self, f):
             f.write("** " + selwei_obj.Label + "\n")
             f.write("*DLOAD\n")
             f.write(
-                "{},GRAV,9810,{},{},{}\n"
+                "{},GRAV,{},{},{},{}\n"
                 .format(
                     self.ccx_eall,
+                    self.gravity,
                     selwei_obj.Gravity_x,
                     selwei_obj.Gravity_y,
                     selwei_obj.Gravity_z

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,10 @@
 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 constants
+from femtools import femutils
+from femtools import membertools
 from .. import settings
 from . import sifio
 
@@ -60,10 +61,10 @@
 
 
 CONSTS_DEF = {
-    "Gravity": "9.82 m/s^2",
-    "StefanBoltzmann": "5.67e-8 W/(m^2*K^4)",
-    "PermittivityOfVacuum": "8.8542e-12 s^4*A^2/(m*kg)",
-    "BoltzmannConstant": "1.3807e-23 J/K",
+    "Gravity": constants.gravity(),
+    "StefanBoltzmann": constants.stefan_boltzmann(), 
+    "PermittivityOfVacuum": constants.permittivity_of_vakuum(),
+    "BoltzmannConstant": constants.boltzmann_constant(),
 }
 
 

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

diff --git a/src/Mod/Fem/femtools/constants.py b/src/Mod/Fem/femtools/constants.py
@@ -0,0 +1,56 @@
+# ***************************************************************************
+# *   Copyright (c) 2020 Bernd Hahnebach <bernd@bimstatik.org>              *
+# *                                                                         *
+# *   This program is free software; you can redistribute it and/or modify  *
+# *   it under the terms of the GNU Lesser General Public License (LGPL)    *
+# *   as published by the Free Software Foundation; either version 2 of     *
+# *   the License, or (at your option) any later version.                   *
+# *   for detail see the LICENCE text file.                                 *
+# *                                                                         *
+# *   This program is distributed in the hope that it will be useful,       *
+# *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+# *   GNU Library General Public License for more details.                  *
+# *                                                                         *
+# *   You should have received a copy of the GNU Library General Public     *
+# *   License along with this program; if not, write to the Free Software   *
+# *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+# *   USA                                                                   *
+# *                                                                         *
+# ***************************************************************************
+""" Collection of natural constants for the Fem module.
+
+This module contains natural constants for the Fem module.
+All constants are in SI units.
+"""
+
+
+__title__ = "Constants"
+__author__ = "Bernd Hahnebach"
+__url__ = "http://www.freecadweb.org"
+
+
+def gravity():
+    return "9.82 m/s^2"
+
+
+def stefan_boltzmann():
+    return "5.67e-8 W/(m^2*K^4)"
+
+
+def permittivity_of_vakuum():
+    return "8.8542e-12 s^4*A^2/(m*kg)"
+
+
+def boltzmann_constant():
+    return "1.3807e-23 J/K"
+
+
+"""
+from FreeCAD import Units
+from femtools import constants
+Units.Quantity(constants.gravity()).getValueAs("mm/s^2")
+
+"""
+
+# TODO: a unit test to be sure these values are returned!