Merge pull request #82 from BAMresearch/80-small-fixes-for-beam-design

improved parameter name and location of test
BAMresearch · Nov 23, 2022 · 3ae12f9 · 3ae12f9
2 parents 05b081c + 0f328c9
commit 3ae12f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lebedigital/BeamDesign/beam_design.py b/lebedigital/BeamDesign/beam_design.py
@@ -164,8 +164,8 @@ def check_design(span:float,
                  height:float,
                  point_load:float,
                  distributed_load:float,
-                 fck:float,
-                 fyk:float,
+                 compr_str_concrete:float,
+                 yield_str_steel:float,
                  steel_dia:float,
                  n_bottom:int,
                  cover:float,
@@ -181,9 +181,9 @@ def check_design(span:float,
         beam width in mm.
     height: int
         beam depth in mm.
-    fck : float
+    compr_str_concrete : float
         charateristic compressive strength of concrete in N/mm2.
-    fyk : float
+    yield_str_steel : float
         Yield strength of steel in N/mm2.
     steel_dia : float
         Diameter of steel in mm.
@@ -201,7 +201,7 @@ def check_design(span:float,
         Optimal will be close to zero.
     """
     max_moment, max_shear_force = max_bending_moment_and_shear_force(span, point_load, distributed_load)
-    design = beam_section_design(width, height, max_moment, max_shear_force, fck, fyk, steel_dia, cover)
+    design = beam_section_design(width, height, max_moment, max_shear_force, compr_str_concrete, yield_str_steel, steel_dia, cover)
     specified_area = (math.pi * steel_dia ** 2 / 4) * n_bottom
     required_area = design["required_area_bottom_steel[mm^2]"]
 

diff --git a/tests/beam_design/test_beam_design.py → .../demonstrator_scripts/test_beam_design.py b/tests/beam_design/test_beam_design.py → .../demonstrator_scripts/test_beam_design.py
@@ -15,8 +15,8 @@ def test_beam_design():
                                    height=height,
                                    point_load = 36e3,
                                    distributed_load= 0,
-                                   fck=20,
-                                   fyk=500,
+                                   compr_str_concrete=20,
+                                   yield_str_steel=500,
                                    steel_dia=12,
                                    n_bottom=3,
                                    cover=25)