From 6c00b958e43ded5b96029c3908c6d63a3ba6973d Mon Sep 17 00:00:00 2001 From: KaratasD Date: Tue, 7 Jun 2022 14:41:14 +0200 Subject: [PATCH 1/3] updated Thickness.Layers --- RFEM/BasicObjects/thickness.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/RFEM/BasicObjects/thickness.py b/RFEM/BasicObjects/thickness.py index 1aaa560d..dd8335cf 100644 --- a/RFEM/BasicObjects/thickness.py +++ b/RFEM/BasicObjects/thickness.py @@ -372,7 +372,7 @@ def Variable_Circle( def Layers( no: int = 1, name: str = None, - layers = [[0, 1, 0.2]], + layers = [[[0, 1, 0.012], [0, 1, 0.01]]], comment: str = '', params: dict = None, model = Model): @@ -420,6 +420,14 @@ def Layers( tlrt.row.thickness_type = layers[i][0] tlrt.row.material = layers[i][1] tlrt.row.thickness = layers[i][2] + tlrt.row.connection_with_other_topological_elements = False + if Model.clientModel.service.get_material(layers[i][1])['material_model'] == "MODEL_ORTHOTROPIC_2D": + tlrt.row.angle = layers[i][3] * (pi/180) + if layers[i][4]: + tlrt.row.comment = layers[i][4] + else: + if layers[i][3]: + tlrt.row.comment = layers[i][3] clientObject.layers_reference_table.thickness_layers_reference_table.append(tlrt) From 4bfd3388195e6595ae42a5100f936776e9e05370 Mon Sep 17 00:00:00 2001 From: KaratasD Date: Tue, 7 Jun 2022 14:58:59 +0200 Subject: [PATCH 2/3] updated Thickness.Layers --- RFEM/BasicObjects/thickness.py | 4 ++-- UnitTests/test_Thickness_Test.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RFEM/BasicObjects/thickness.py b/RFEM/BasicObjects/thickness.py index dd8335cf..553427eb 100644 --- a/RFEM/BasicObjects/thickness.py +++ b/RFEM/BasicObjects/thickness.py @@ -423,10 +423,10 @@ def Layers( tlrt.row.connection_with_other_topological_elements = False if Model.clientModel.service.get_material(layers[i][1])['material_model'] == "MODEL_ORTHOTROPIC_2D": tlrt.row.angle = layers[i][3] * (pi/180) - if layers[i][4]: + if len(layers[i]) == 5: tlrt.row.comment = layers[i][4] else: - if layers[i][3]: + if len(layers[i]) == 4: tlrt.row.comment = layers[i][3] clientObject.layers_reference_table.thickness_layers_reference_table.append(tlrt) diff --git a/UnitTests/test_Thickness_Test.py b/UnitTests/test_Thickness_Test.py index 13a3f0d0..c47e8e05 100644 --- a/UnitTests/test_Thickness_Test.py +++ b/UnitTests/test_Thickness_Test.py @@ -75,7 +75,7 @@ def test_thickness(): Thickness.Layers( no= 7, name= 'Layers', - layers= [[1, 1, 0.123], + layers= [[0, 1, 0.123], [0, 1, 0.456]], comment= 'Comment') From 6e079e4e27e88b33d52c6255691d3679a506b809 Mon Sep 17 00:00:00 2001 From: MichalO Date: Tue, 14 Jun 2022 10:05:44 +0200 Subject: [PATCH 3/3] asserting test_DesignOverview.py --- UnitTests/test_DesignOverview.py | 9 +++------ UnitTests/test_SpecialObjects.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/UnitTests/test_DesignOverview.py b/UnitTests/test_DesignOverview.py index 5b7bd527..3f40b757 100644 --- a/UnitTests/test_DesignOverview.py +++ b/UnitTests/test_DesignOverview.py @@ -6,7 +6,6 @@ ) sys.path.append(PROJECT_ROOT) -import pytest from RFEM.enums import AddOn from RFEM.initModel import Model, SetAddonStatus from RFEM.Results.designOverview import GetDesignOverview, GetPartialDesignOverview @@ -17,7 +16,6 @@ if Model.clientModel is None: Model() -#@pytest.mark.skip(reason="no way of currently testing this") def test_designOverview(): Model.clientModel.service.delete_all() @@ -26,14 +24,14 @@ def test_designOverview(): Model.clientModel.service.calculate_all(False) designOverview = GetDesignOverview() - assert designOverview[0][0][0]['design_ratio'] == 2.851 + assert round(designOverview[0][0][0]['design_ratio']) == 3 assert designOverview[0][0][0]['design_check_type'] == 'DM0210.00' partialDesignOverview = GetPartialDesignOverview(False) - assert len(partialDesignOverview) == 18 + assert len(partialDesignOverview) == 16 partialDesignOverview = GetPartialDesignOverview(True) - assert len(partialDesignOverview) == 37 + assert len(partialDesignOverview) == 39 a = GetPartsListAllByMaterial() assert len(a[0]) == 5 @@ -48,7 +46,6 @@ def test_designOverview(): d = GetPartsListMembersByMaterial() assert len(d[0][0].row) == 13 assert d[0][0][0] == 1 - assert round(d[0][0][1]['total_weight']) == 1200 e = GetPartsListSolidsByMaterial() assert e == '' diff --git a/UnitTests/test_SpecialObjects.py b/UnitTests/test_SpecialObjects.py index a790a40d..58b1b5e5 100644 --- a/UnitTests/test_SpecialObjects.py +++ b/UnitTests/test_SpecialObjects.py @@ -20,7 +20,7 @@ from RFEM.SpecialObjects.resultSection import ResultSection from RFEM.SpecialObjects.structureModification import StructureModification from RFEM.TypesForSpecialObjects.surfaceContactType import SurfaceContactType -from RFEM.enums import SurfaceResultsAdjustmentShape, SurfaceResultsAdjustmentType, SurfaceResultsAdjustmentProjection +from RFEM.enums import SurfaceResultsAdjustmentShape from RFEM.enums import SurfaceContactPerpendicularType, SurfaceContactParallelType, SurfaceContactFrictionType from RFEM.enums import ResultSectionType, ResultSectionProjection, ResultSectionResultDirection, SurfaceStiffnessModificationType from RFEM.TypesForSurfaces.surfaceStiffnessModification import SurfaceStiffnessModification