Merge pull request #77 from CALFEM/develop

Develop
CALFEM · Aug 20, 2024 · e3083ec · e3083ec
2 parents 6e534bf + f83986b
commit e3083ec
Show file tree

Hide file tree

Showing 5 changed files with 152 additions and 147 deletions.
diff --git a/example_output.py b/example_output.py
@@ -15,23 +15,23 @@
 |  0.0000e+00 |
 |  7.5887e-03 |
 +-------------+
-+------------+
-|          r |
-|------------|
-| 6.6667e+03 |
-| 0.0000e+00 |
-| 0.0000e+00 |
-| 0.0000e+00 |
-| 3.3333e+03 |
-| 3.6380e-12 |
-+------------+
++-------------+
+|           r |
+|-------------|
+|  6.6667e+03 |
+|  0.0000e+00 |
+|  9.0949e-12 |
+| -1.0914e-11 |
+|  3.3333e+03 |
+|  0.0000e+00 |
++-------------+
 
 ## es1
 
 +-------------+------------+
 |          V1 |         M1 |
 |-------------+------------|
-| -6.6667e+03 | 0.0000e+00 |
+| -6.6667e+03 | 9.1437e-12 |
 | -6.6667e+03 | 6.6667e+03 |
 | -6.6667e+03 | 1.3333e+04 |
 | -6.6667e+03 | 2.0000e+04 |
@@ -70,7 +70,7 @@
 | 3.3333e+03 | 1.0000e+04 |
 | 3.3333e+03 | 6.6667e+03 |
 | 3.3333e+03 | 3.3333e+03 |
-| 3.3333e+03 | 0.0000e+00 |
+| 3.3333e+03 | 4.5719e-12 |
 +------------+------------+
 
 ## ed2
@@ -84,7 +84,7 @@
 | -1.9920e-02 |
 | -1.4334e-02 |
 | -7.4833e-03 |
-|  6.9389e-18 |
+|  0.0000e+00 |
 +-------------+
 
 ## ec2
@@ -314,14 +314,14 @@
 |  2.4009e+05 |
 |  6.1603e+05 |
 |  1.9293e+05 |
-| -1.1642e-10 |
 |  2.3283e-10 |
+| -2.3283e-10 |
+|  1.1642e-10 |
 | -1.1642e-10 |
-|  0.0000e+00 |
 | -2.3283e-10 |
-|  9.3132e-10 |
-|  1.4552e-10 |
 |  3.4925e-10 |
+| -2.9104e-11 |
+|  4.6566e-10 |
 +-------------+
 
 ## Element forces:
@@ -381,14 +381,14 @@
 |  2.4009e+05 |
 |  6.1603e+05 |
 |  1.9293e+05 |
-| -1.1642e-10 |
 |  2.3283e-10 |
+| -2.3283e-10 |
+|  1.1642e-10 |
 | -1.1642e-10 |
-|  0.0000e+00 |
 | -2.3283e-10 |
-|  9.3132e-10 |
-|  1.4552e-10 |
 |  3.4925e-10 |
+| -2.9104e-11 |
+|  4.6566e-10 |
 +-------------+
 
 ## Element forces:
@@ -425,15 +425,15 @@
 |  1.9268e+03 |
 |  2.8741e+04 |
 |  4.4527e+02 |
-|  8.2764e-11 |
 |  0.0000e+00 |
-|  7.2760e-12 |
-|  5.9117e-11 |
 |  0.0000e+00 |
-|  3.6380e-12 |
+| -3.6380e-12 |
+| -2.3283e-10 |
+|  0.0000e+00 |
+| -7.2760e-12 |
 | -3.9268e+03 |
 |  3.1259e+04 |
-| -9.0949e-13 |
+|  0.0000e+00 |
 +-------------+
 
 ## es1
@@ -489,7 +489,7 @@
 | 4.3111e-05 | 4.6722e-05 |
 | 2.8741e-05 | 1.7554e-05 |
 | 1.4370e-05 | 3.5858e-06 |
-| 0.0000e+00 | 1.7347e-18 |
+| 0.0000e+00 | 3.4694e-18 |
 +------------+------------+
 
 ## es2
@@ -517,36 +517,36 @@
 | -3.1259e+04 | -3.9268e+03 | -2.3561e+03 |
 | -3.1259e+04 | -3.9268e+03 | -1.5707e+03 |
 | -3.1259e+04 | -3.9268e+03 | -7.8535e+02 |
-| -3.1259e+04 | -3.9268e+03 | -5.5511e-12 |
+| -3.1259e+04 | -3.9268e+03 |  0.0000e+00 |
 +-------------+-------------+-------------+
 
 ## edi2
 
-+------------+-------------+
-|         u1 |          v1 |
-|------------+-------------|
-| 3.1259e-04 |  7.5161e-03 |
-| 2.9696e-04 |  8.3527e-03 |
-| 2.8133e-04 |  9.0027e-03 |
-| 2.6570e-04 |  9.4761e-03 |
-| 2.5007e-04 |  9.7825e-03 |
-| 2.3444e-04 |  9.9319e-03 |
-| 2.1881e-04 |  9.9341e-03 |
-| 2.0318e-04 |  9.7988e-03 |
-| 1.8755e-04 |  9.5359e-03 |
-| 1.7193e-04 |  9.1552e-03 |
-| 1.5630e-04 |  8.6665e-03 |
-| 1.4067e-04 |  8.0796e-03 |
-| 1.2504e-04 |  7.4044e-03 |
-| 1.0941e-04 |  6.6506e-03 |
-| 9.3777e-05 |  5.8282e-03 |
-| 7.8148e-05 |  4.9468e-03 |
-| 6.2518e-05 |  4.0163e-03 |
-| 4.6889e-05 |  3.0466e-03 |
-| 3.1259e-05 |  2.0474e-03 |
-| 1.5630e-05 |  1.0286e-03 |
-| 0.0000e+00 | -6.9389e-18 |
-+------------+-------------+
++------------+------------+
+|         u1 |         v1 |
+|------------+------------|
+| 3.1259e-04 | 7.5161e-03 |
+| 2.9696e-04 | 8.3527e-03 |
+| 2.8133e-04 | 9.0027e-03 |
+| 2.6570e-04 | 9.4761e-03 |
+| 2.5007e-04 | 9.7825e-03 |
+| 2.3444e-04 | 9.9319e-03 |
+| 2.1881e-04 | 9.9341e-03 |
+| 2.0318e-04 | 9.7988e-03 |
+| 1.8755e-04 | 9.5359e-03 |
+| 1.7193e-04 | 9.1552e-03 |
+| 1.5630e-04 | 8.6665e-03 |
+| 1.4067e-04 | 8.0796e-03 |
+| 1.2504e-04 | 7.4044e-03 |
+| 1.0941e-04 | 6.6506e-03 |
+| 9.3777e-05 | 5.8282e-03 |
+| 7.8148e-05 | 4.9468e-03 |
+| 6.2518e-05 | 4.0163e-03 |
+| 4.6889e-05 | 3.0466e-03 |
+| 3.1259e-05 | 2.0474e-03 |
+| 1.5630e-05 | 1.0286e-03 |
+| 0.0000e+00 | 0.0000e+00 |
++------------+------------+
 
 ## es3
 
@@ -604,9 +604,9 @@
 | 7.5161e-03 | -3.1259e-04 |
 +------------+-------------+
 sfac=
-54.773001983988756
+54.77300198398879
 sfac=
-3.6286308510485656e-05""",
+3.628630851048567e-05""",
 "exs_flw_diff2.py":"""
 ## Ex
 
@@ -688,25 +688,25 @@
 
 +-------------+
 | -1.4039e+01 |
-| -5.6843e-14 |
 |  0.0000e+00 |
 |  0.0000e+00 |
 |  0.0000e+00 |
+|  5.6843e-14 |
 |  4.0394e+00 |
 +-------------+
 
 ## Element flows:
 
-q1 = 
+q1 =
 14.039386189223357
-q2 = 
+q2 =
 14.039386189223451
-q3 = 
-14.039386189223482
-q4 = 
+q3 =
+14.039386189223485
+q4 =
 4.039386189223492
-q5 = 
-4.039386189223447""",
+q5 =
+4.03938618922342""",
 "exs_spring.py":"""
 ## Stiffness matrix K:
 
@@ -764,19 +764,19 @@
 
 +-------------+
 | -1.4039e+01 |
-| -5.6843e-14 |
 |  0.0000e+00 |
 |  0.0000e+00 |
 |  0.0000e+00 |
+|  5.6843e-14 |
 |  4.0394e+00 |
 +-------------+
 
 ## Element flows r:
 
 q1 = 14.039386189223357
 q2 = 14.039386189223451
-q3 = 14.039386189223482
+q3 = 14.039386189223485
 q4 = 4.039386189223492
-q5 = 4.039386189223447"""
+q5 = 4.03938618922342"""
 
 }
diff --git a/examples/exm_qt_vis.py b/examples/exm_qt_vis.py
@@ -19,7 +19,7 @@ def __init__(self):
 
         # Load user interface from UI-file
 
-        loadUi('exm_qt.ui', self)
+        loadUi('exm_qt_vis.ui', self)
 
         Figure = cfv.figureClass()
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "calfem-python"
-version = "3.6.8"
+version = "3.6.9"
 description = "CALFEM for Python"
 authors = [
     {name = "Jonas Lindemann", email = "jonas.lindemann@lunarc.lu.se"},

diff --git a/src/calfem/vis_mpl.py b/src/calfem/vis_mpl.py
@@ -16,7 +16,12 @@
 import matplotlib.patches as patches
 import matplotlib as mpl
 import matplotlib.tri as tri
-from numpy.lib.function_base import place
+
+try:
+    from numpy.lib.function_base import place
+except:
+    print("from numpy.lib.function_base import place - Not available")
+    pass
 
 from calfem.core import beam2crd
 import calfem.core as cfc