Merge pull request #344 from Dlubal-Software/origin/BUG-176725_WS_Thickness_layers_direction

Fixed

Author: OndraMichal

RFEM/BasicObjects/thickness.py

@@ -397,7 +397,7 @@ def Variable_Circle(
     def Layers(
                  no: int = 1,
                  name: str = None,
-                 layers = [['E_THICKNESS_TYPE_DIRECTLY', 1, 0.012], ['E_THICKNESS_TYPE_DIRECTLY', 1, 0.01]],
+                 layers = [['E_THICKNESS_TYPE_DIRECTLY', 1, 0.012, pi / 2], ['E_THICKNESS_TYPE_DIRECTLY', 1, 0.01, pi / 2]],
                  stiffness_reduction: bool = False,
                  stiffness_modification: list = [[1, None], [1, None], [1, None], [1, None]],
                  specify_integration: bool = False,
@@ -416,7 +416,7 @@ def Layers(
             layers (list of lists): Layers Table as an Array. Angle of the material will be set if material model is orthotropic.
                 layers = [layer[0], layer[1], layer[2],...]
                 for layers[i][0] == 'E_THICKNESS_TYPE_DIRECTLY':
-                    layers[i] = ['E_THICKNESS_TYPE_DIRECTLY', material_tag(int), thickness_in_meter(float), comment(optional)]
+                    layers[i] = ['E_THICKNESS_TYPE_DIRECTLY', material_tag(int), thickness_in_meter(float), angle(float), comment(optional)]
                 for layers[i][0] == previously_defined_thickness_tag:
                     layers[i] = [previously_defined_thickness_tag(int), comment(optional)]
             stiffness_reduction (bool, optional): Enable/disable Stiffness Reduction
@@ -466,8 +466,9 @@ def Layers(
                 tlrt.row.thickness_type_or_id = 'E_THICKNESS_TYPE_DIRECTLY'
                 tlrt.row.material = layers[i][1]
                 tlrt.row.thickness = layers[i][2]
-                if len(layers[i]) == 4:
-                    tlrt.row.comment = layers[i][3]
+                tlrt.row.angle = layers[i][3]
+                if len(layers[i]) == 5:
+                    tlrt.row.comment = layers[i][4]
             elif type(layers[i][0]) == int:
                 tlrt.row.thickness_type_or_id = str(layers[i][0])
                 if len(layers[i]) == 2:

UnitTests/test_Thickness_Test.py

@@ -6,12 +6,13 @@
 )
 sys.path.append(PROJECT_ROOT)
 
-from RFEM.enums import ThicknessDirection, ThicknessOrthotropyType
+from RFEM.enums import ThicknessDirection, ThicknessOrthotropyType, MaterialType, MaterialModel, MaterialStiffnessModificationType
 from RFEM.enums import ThicknessShapeOrthotropySelfWeightDefinitionType, ThicknessStiffnessMatrixSelfWeightDefinitionType
 from RFEM.initModel import Model
 from RFEM.BasicObjects.material import Material
 from RFEM.BasicObjects.thickness import Thickness
 from RFEM.BasicObjects.node import Node
+from math import pi
 
 if Model.clientModel is None:
     Model()
@@ -20,7 +21,16 @@ def test_thickness():
 
     Model.clientModel.service.delete_all()
     Model.clientModel.service.begin_modification()
+    
     Material(1, 'C30/37')
+    params = { 
+        "material_type": MaterialType.TYPE_TIMBER.name,
+        "material_model": MaterialModel.MODEL_ORTHOTROPIC_2D.name,
+        "stiffness_modification": True,
+        "stiffness_modification_type": MaterialStiffnessModificationType.STIFFNESS_MODIFICATION_TYPE_DIVISION.name,
+        "application_context": "TIMBER_DESIGN"
+    }
+    Material(no=2, name="C24 BBS XL", params=params)
 
     ##  THICKNESS TYPE
 
@@ -75,7 +85,7 @@ def test_thickness():
     Thickness.Layers(
                      no= 7,
                      name= 'Layers',
-                     layers= [['E_THICKNESS_TYPE_DIRECTLY', 1, 0.123],
+                     layers= [['E_THICKNESS_TYPE_DIRECTLY', 2, 0.123, pi / 2],
                               [2, 'Defined Thicness']],
                      comment= 'Comment')
 
@@ -126,6 +136,7 @@ def test_thickness():
 
     th = Model.clientModel.service.get_thickness(7)
     assert th.layers_reference_table['thickness_layers_reference_table'][0].row['thickness'] == 0.123
+    assert th.layers_reference_table['thickness_layers_reference_table'][0].row['angle'] == pi / 2
     assert th.layers_reference_table['thickness_layers_reference_table'][1].row['thickness_type_or_id'] == '2'
     assert th.layers_reference_table['thickness_layers_reference_table'][1].row['comment'] == 'Defined Thicness'