update tests

Author: claudioperez

tests/test_girder.py

@@ -37,6 +37,8 @@
     \hline
     \end{tabular}
 """
+
+
 def test_asbi():
 
     # Flat soffit
@@ -84,6 +86,7 @@ def test_asbi():
     assert shape.area == pytest.approx(6_135_000*u.mm**2, rel=1e-2)
 
 
+
 def test_torsion():
 
     shape = load_shape("G02", mesh_type="T6", mesh_scale=1)

tests/test_groups.py

@@ -1,6 +1,6 @@
 import pytest
 from xsection.library import WideFlange
-from xsection._benchmarks import load_shape
+from xsection._benchmarks import load_shape, ShapeM03
 
 
 
@@ -10,7 +10,9 @@
 tw = 0.1
 A_ref = (d-2*tf)*tw + 2*tf*b
 
+
 def test_1():
+
     for elem in ["T3", "T6"]:
         for mesher in ["triangle", "gmsh"]:
             shape = WideFlange(d=d, b=b, tf=tf, tw=tw, 
@@ -21,7 +23,7 @@ def test_1():
             A = 0
             for fiber in shape.create_fibers(group="1"):
                 A += fiber["area"]
-            assert A == pytest.approx(A_ref, rel=1e-6)
+            assert A == pytest.approx(A_ref, rel=1e-8)
 
 
 def test_2():
@@ -38,22 +40,47 @@ def test_2():
             A = 0
             for fiber in shape._create_fibers(shape.model, [], group="1"):
                 A += fiber["area"]
-            assert A == pytest.approx(A_ref, rel=1e-6)
+            assert A == pytest.approx(A_ref, rel=1e-8)
 
 
-def test_composite():
+def test_m01():
     shape = load_shape("M01")
 
     A1 = 0
     for fiber in shape.create_fibers(group="1"):
         A1 += fiber["area"]
+
     A2 = 0
     for fiber in shape.create_fibers(group="2"):
         A2 += fiber["area"]
+
+    
+    assert A2 == pytest.approx(shape._shapes[0].area, rel=1e-8)
+    assert A1 == pytest.approx(shape._shapes[1].area, rel=1e-8)
+
+
+
+def test_m03():
+    shape, properties = ShapeM03()
+
+    A_gross = 0.0
+    A_rebar = 0.0
+    A_core  = 0.0
+
+    for fiber in shape.create_fibers(group="rebar"):
+        A_rebar += fiber["area"]
+        A_gross += fiber["area"]
+
+    for fiber in shape.create_fibers(group="core"):
+        A_core  += fiber["area"]
+        A_gross += fiber["area"]
 
+    for fiber in shape.create_fibers(group="cover"):
+        A_gross += fiber["area"]
+
 
-    assert A2 == pytest.approx(
-        shape._shapes[0].area, rel=1e-6)
-    assert A1 == pytest.approx(
-        shape._shapes[1].area, rel=1e-6)
+
+    assert A_rebar == pytest.approx(properties["rebar"]["A"], rel=1e-8)
+    assert A_gross == pytest.approx(properties["gross"]["A"], rel=1e-8)
+
 

tests/test_r_twist.py

@@ -18,9 +18,11 @@ def test_T3():
     assert sv.twist_rigidity() == pytest.approx(J, rel=1e-2)
 
 
+
 def test_T3_material():
 
-    shape = Rectangle(b=3, d=5, 
+    shape = Rectangle(b=3,
+                      d=5, 
                       mesh_scale=1/40,
                       material={"E": 4, "G": 2},
                       mesher="triangle",
@@ -36,7 +38,8 @@ def test_T3_material():
 
 
 def test_T6():
-    shape = Rectangle(b=3, d=5, 
+    shape = Rectangle(b=3,
+                      d=5, 
                       mesh_scale=1/5,
                       mesher="triangle",
                       mesh_type="T6")
@@ -60,7 +63,8 @@ def test_T6_gmsh():
     from xsection.library import Rectangle
     from xsection.properties import torsion_constant
     material = {"E": 4, "G": 2}
-    shape = Rectangle(b=3, d=5,
+    shape = Rectangle(b=3,
+                      d=5,
                       mesh_scale=1/10,
                       material=material,
                       mesher="gmsh",
@@ -82,7 +86,8 @@ def test_T6_material_gmsh():
     from xsection.library import Rectangle
     from xsection.properties import torsion_constant
 
-    shape = Rectangle(b=3, d=5,
+    shape = Rectangle(b=3,
+                      d=5,
                       mesh_scale=1/10,
                       material={"E": 4, "G": 2},
                       mesher="gmsh",