From 73f0dad8db31b5efacb9f7e8142d229bc0d2be9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Steinhagen?= Date: Thu, 19 May 2022 15:19:39 +0200 Subject: [PATCH 1/2] BasicObjects All appropriate BasicObjects contain a delete function within their class. UnitTests only available for classes where the model_info has a corresponding 'count' return for that type. --- RFEM/BasicObjects/line.py | 16 +++++- RFEM/BasicObjects/material.py | 15 +++++- RFEM/BasicObjects/member.py | 16 +++++- RFEM/BasicObjects/node.py | 16 +++++- RFEM/BasicObjects/opening.py | 15 +++++- RFEM/BasicObjects/section.py | 15 +++++- RFEM/BasicObjects/solid.py | 18 +++++-- RFEM/BasicObjects/surface.py | 16 +++++- RFEM/BasicObjects/thickness.py | 16 +++++- UnitTests/test_basic_objects.py | 47 +++++++++++++++++ UnitTests/test_node.py | 17 ++++++ UnitTests/test_solids.py | 93 +++++++++++++++++++++++++++++++++ 12 files changed, 284 insertions(+), 16 deletions(-) diff --git a/RFEM/BasicObjects/line.py b/RFEM/BasicObjects/line.py index 91b579e2..2988598d 100644 --- a/RFEM/BasicObjects/line.py +++ b/RFEM/BasicObjects/line.py @@ -1,5 +1,5 @@ -from RFEM.initModel import Model, clearAtributes, ConvertToDlString -from RFEM.enums import LineType, LineArcAlphaAdjustmentTarget +from RFEM.initModel import Model, clearAtributes, ConvertToDlString, ConvertStrToListOfInt +from RFEM.enums import LineType, LineArcAlphaAdjustmentTarget, ObjectTypes class Line(): def __init__(self, @@ -460,3 +460,15 @@ def NURBS( # Add Line to client model model.clientModel.service.set_line(clientObject) + + @staticmethod + def DeleteLine(lines_no: str = '1 2', model = Model): + + ''' + Args: + lines_no (str): Tags of Lines to be deleted + ''' + + # Delete from client model + for line in ConvertStrToListOfInt(lines_no): + model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_LINE.name, line) \ No newline at end of file diff --git a/RFEM/BasicObjects/material.py b/RFEM/BasicObjects/material.py index aa4bcc6e..326570a4 100644 --- a/RFEM/BasicObjects/material.py +++ b/RFEM/BasicObjects/material.py @@ -1,4 +1,5 @@ -from RFEM.initModel import clearAtributes, Model +from RFEM.initModel import clearAtributes, Model, ConvertStrToListOfInt +from RFEM.enums import ObjectTypes class Material(): @@ -39,3 +40,15 @@ def __init__(self, # Add material to client model model.clientModel.service.set_material(clientObject) + + @staticmethod + def DeleteMaterial(materials_no: str = '1 2', model = Model): + + ''' + Args: + materials_no (str): Tags of Materials to be deleted + ''' + + # Delete from client model + for material in ConvertStrToListOfInt(materials_no): + model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_MATERIAL.name, material) diff --git a/RFEM/BasicObjects/member.py b/RFEM/BasicObjects/member.py index 48b2c7d5..3f9b7d5e 100644 --- a/RFEM/BasicObjects/member.py +++ b/RFEM/BasicObjects/member.py @@ -1,5 +1,5 @@ -from RFEM.enums import MemberType, MemberRotationSpecificationType, MemberSectionDistributionType, MemberTypeRibAlignment, MemberReferenceLengthWidthType, MemberResultBeamIntegration -from RFEM.initModel import Model, clearAtributes +from RFEM.enums import MemberType, MemberRotationSpecificationType, MemberSectionDistributionType, MemberTypeRibAlignment, MemberReferenceLengthWidthType, MemberResultBeamIntegration, ObjectTypes +from RFEM.initModel import Model, clearAtributes, ConvertStrToListOfInt class Member(): def __init__(self, @@ -1983,3 +1983,15 @@ def CouplingHingeHinge( # Add Member to client model model.clientModel.service.set_member(clientObject) + + @staticmethod + def DeleteMember(members_no: str = '1 2', model = Model): + + ''' + Args: + members_no (str): Tags of Members to be deleted + ''' + + # Delete from client model + for member in ConvertStrToListOfInt(members_no): + model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_MEMBER.name, member) \ No newline at end of file diff --git a/RFEM/BasicObjects/node.py b/RFEM/BasicObjects/node.py index b93571a7..09a76e71 100644 --- a/RFEM/BasicObjects/node.py +++ b/RFEM/BasicObjects/node.py @@ -1,7 +1,7 @@ from RFEM.enums import NodeType from RFEM.enums import NodeCoordinateSystemType -from RFEM.enums import NodeReferenceType -from RFEM.initModel import Model, clearAtributes +from RFEM.enums import NodeReferenceType, ObjectTypes +from RFEM.initModel import Model, clearAtributes, ConvertStrToListOfInt from math import pi class Node(): @@ -431,3 +431,15 @@ def OnMember( # Add Node to client model model.clientModel.service.set_node(clientObject) + + @staticmethod + def DeleteNode(nodes_no: str = '1 2', model = Model): + + ''' + Args: + nodes_no (str): Tags of Nodes to be deleted + ''' + + # Delete from client model + for node in ConvertStrToListOfInt(nodes_no): + model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_NODE.name, node) \ No newline at end of file diff --git a/RFEM/BasicObjects/opening.py b/RFEM/BasicObjects/opening.py index b402891b..5240e865 100644 --- a/RFEM/BasicObjects/opening.py +++ b/RFEM/BasicObjects/opening.py @@ -1,4 +1,5 @@ -from RFEM.initModel import Model, clearAtributes, ConvertToDlString +from RFEM.initModel import Model, clearAtributes, ConvertToDlString, ConvertStrToListOfInt +from RFEM.enums import ObjectTypes class Opening(): def __init__(self, @@ -38,3 +39,15 @@ def __init__(self, # Add Opening to client model model.clientModel.service.set_opening(clientObject) + + @staticmethod + def DeleteOpening(openings_no: str = '1 2', model = Model): + + ''' + Args: + openings_no (str): Tags of Openings to be deleted + ''' + + # Delete from client model + for opening in ConvertStrToListOfInt(openings_no): + model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_OPENING.name, opening) diff --git a/RFEM/BasicObjects/section.py b/RFEM/BasicObjects/section.py index 861b1c54..da50558f 100644 --- a/RFEM/BasicObjects/section.py +++ b/RFEM/BasicObjects/section.py @@ -1,4 +1,5 @@ -from RFEM.initModel import Model, clearAtributes +from RFEM.initModel import Model, clearAtributes, ConvertStrToListOfInt +from RFEM.enums import ObjectTypes class Section(): def __init__(self, @@ -43,3 +44,15 @@ def __init__(self, # Add Section to client model model.clientModel.service.set_section(clientObject) + + @staticmethod + def DeleteSection(sections_no: str = '1 2', model = Model): + + ''' + Args: + sections_no (str): Tags of Sections to be deleted + ''' + + # Delete from client model + for section in ConvertStrToListOfInt(sections_no): + model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_SECTION.name, section) \ No newline at end of file diff --git a/RFEM/BasicObjects/solid.py b/RFEM/BasicObjects/solid.py index d4346897..dfb188ad 100644 --- a/RFEM/BasicObjects/solid.py +++ b/RFEM/BasicObjects/solid.py @@ -1,5 +1,5 @@ -from RFEM.initModel import Model, clearAtributes, ConvertToDlString -from RFEM.enums import SolidType +from RFEM.initModel import Model, clearAtributes, ConvertToDlString, ConvertStrToListOfInt +from RFEM.enums import SolidType, ObjectTypes class Solid(): def __init__(self, @@ -231,4 +231,16 @@ def Soil( clientObject[key] = params[key] # Add Surface to client model - model.clientModel.service.set_solid(clientObject) \ No newline at end of file + model.clientModel.service.set_solid(clientObject) + + @staticmethod + def DeleteSolid(solids_no: str = '1 2', model = Model): + + ''' + Args: + solids_no (str): Tags of Solids to be deleted + ''' + + # Delete solids from client model + for solid in ConvertStrToListOfInt(solids_no): + model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_SOLID.name, solid) \ No newline at end of file diff --git a/RFEM/BasicObjects/surface.py b/RFEM/BasicObjects/surface.py index 417f2e89..b13c3491 100644 --- a/RFEM/BasicObjects/surface.py +++ b/RFEM/BasicObjects/surface.py @@ -1,5 +1,5 @@ -from RFEM.enums import SurfaceGeometry, SurfaceLoadDistributionDirection, SurfaceType -from RFEM.initModel import Model, clearAtributes, ConvertToDlString +from RFEM.enums import SurfaceGeometry, SurfaceLoadDistributionDirection, SurfaceType, ObjectTypes +from RFEM.initModel import Model, clearAtributes, ConvertToDlString, ConvertStrToListOfInt import math def CreateGeometryAndSetToModel(no, surface_type, boundary_lines_no, geometry_type, geometry_type_parameters, thickness = None, comment = None, params = None, model = Model): @@ -359,3 +359,15 @@ def LoadDistribution( # Add Surface to client model model.clientModel.service.set_surface(clientObject) + + @staticmethod + def DeleteSurface(surfaces_no: str = '1 2', model = Model): + + ''' + Args: + surfaces_no (str): Tags of Surfaces to be deleted + ''' + + # Delete surfaces from client model + for surface in ConvertStrToListOfInt(surfaces_no): + model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_SURFACE.name, surface) diff --git a/RFEM/BasicObjects/thickness.py b/RFEM/BasicObjects/thickness.py index a3340c8e..fbed68b2 100644 --- a/RFEM/BasicObjects/thickness.py +++ b/RFEM/BasicObjects/thickness.py @@ -1,8 +1,8 @@ from RFEM.enums import ThicknessDirection, ThicknessType -from RFEM.enums import ThicknessOrthotropyType, AddOn +from RFEM.enums import ThicknessOrthotropyType, AddOn, ObjectTypes from RFEM.enums import ThicknessShapeOrthotropySelfWeightDefinitionType from RFEM.enums import ThicknessStiffnessMatrixSelfWeightDefinitionType -from RFEM.initModel import Model, GetAddonStatus, clearAtributes, SetAddonStatus +from RFEM.initModel import Model, GetAddonStatus, clearAtributes, SetAddonStatus, ConvertStrToListOfInt from math import pi class Thickness(): @@ -686,3 +686,15 @@ def StiffnessMatrix( # Add Thickness to client model model.clientModel.service.set_thickness(clientObject) + + @staticmethod + def DeleteThickness(thickness_no: str = '1 2', model = Model): + + ''' + Args: + thickness_no (str): Tags of Thickness to be deleted + ''' + + # Delete from client model + for thickness in ConvertStrToListOfInt(thickness_no): + model.clientModel.service.delete_object(ObjectTypes.E_OBJECT_TYPE_THICKNESS.name, thickness) \ No newline at end of file diff --git a/UnitTests/test_basic_objects.py b/UnitTests/test_basic_objects.py index e86e27e6..c411dec6 100644 --- a/UnitTests/test_basic_objects.py +++ b/UnitTests/test_basic_objects.py @@ -210,6 +210,29 @@ def test_lineSetGroup(): assert round(line_set.length, 6) == 4.472136 +def test_line_delete(): + + Model.clientModel.service.delete_all() + Model.clientModel.service.begin_modification() + + Node(1, 0, 0, 0) + Node(2, 0, 0, -5) + Node(3, 5, 0, -5) + Node(4, 5, 0, 0) + + Line(1, '1 2') + Line(2, '2 3') + Line(3, '3 4') + Line(4, '4 1') + + Line.DeleteLine('2 4') + + Model.clientModel.service.finish_modification() + + modelInfo = Model.clientModel.service.get_model_info() + + assert modelInfo.property_line_count == 2 + def test_material(): Model.clientModel.service.delete_all() @@ -281,6 +304,30 @@ def test_member_set(): assert member_set.members == '1 2' assert member_set.length == 10 +def test_member_delete(): + + Model.clientModel.service.delete_all() + Model.clientModel.service.begin_modification() + + Node(1, 0, 0, 0) + Node(2, 5, 0, 0) + Node(3, 10, 0, 0) + + Material(1, 'S235') + + Section(1, 'IPE 300', 1) + + Member(1, 1, 2, 0, 1, 1) + Member(2, 2, 3, 0, 1, 1) + + Member.DeleteMember('1') + + Model.clientModel.service.finish_modification() + + modelInfo = Model.clientModel.service.get_model_info() + + assert modelInfo.property_member_count == 1 + ## Bugs must be solved in Node.py def test_opening(): diff --git a/UnitTests/test_node.py b/UnitTests/test_node.py index 623de046..baf4eada 100644 --- a/UnitTests/test_node.py +++ b/UnitTests/test_node.py @@ -48,3 +48,20 @@ def test_node(): assert node.type == 'TYPE_BETWEEN_TWO_POINTS' node = Model.clientModel.service.get_node(7) assert node.type == 'TYPE_ON_MEMBER' + +def test_node_delete(): + + Model.clientModel.service.delete_all() + Model.clientModel.service.begin_modification() + + Node(1, 0, 0, 0) + Node(2, 0, 0, -5) + Node(3, 0, 0, -10) + + Node.DeleteNode('1 3') + + Model.clientModel.service.finish_modification() + + modelInfo = Model.clientModel.service.get_model_info() + + assert modelInfo.property_node_count == 1 \ No newline at end of file diff --git a/UnitTests/test_solids.py b/UnitTests/test_solids.py index dc88d24a..742d5e5e 100644 --- a/UnitTests/test_solids.py +++ b/UnitTests/test_solids.py @@ -202,3 +202,96 @@ def test_solids_and_solid_sets(): solidSet = Model.clientModel.service.get_solid_set(3) assert solidSet.set_type == SetType.SET_TYPE_GROUP.name assert solidSet.solids == '1 4' + +def test_solid_delete(): + + Model.clientModel.service.delete_all() + Model.clientModel.service.begin_modification() + + Material(1, 'S235') + Material(2, 'Sand') + + # Solid 1 + Node(1, 0.0, 0.0, 0.0) + Node(2, 10.0, 0.0, 0.0) + Node(3, 10.0, 10.0, 0.0) + Node(4, 0.0, 10.0, 0.0) + + Node(5, 0.0, 0.0, -5.0) + Node(6, 10.0, 0.0, -5.0) + Node(7, 10.0, 10.0, -5.0) + Node(8, 0.0, 10.0, -5.0) + + Line(1, '1 2') + Line(2, '2 3') + Line(3, '3 4') + Line(4, '4 1') + + Line(5, '5 6') + Line(6, '6 7') + Line(7, '7 8') + Line(8, '8 5') + + Line(9, '1 5') + Line(10, '2 6') + Line(11, '3 7') + Line(12, '4 8') + + Thickness(1, 'My Test Thickness', 1, 0.05) + + Surface(1, '1-4', 1) + Surface(2, '5-8', 1) + Surface(3, '1 9 5 10', 1) + Surface(4, '2 10 6 11', 1) + Surface(5, '3 11 7 12', 1) + Surface(6, '4 12 8 9', 1) + + Solid.Soil(1, '1-6', 2) + + solid = Model.clientModel.service.get_solid(1) + assert round(solid.volume, 1) == 500 + assert solid.type == 'TYPE_SOIL' + + # Solid 2 + Node(9, 0.0, 20.0, 0.0) + Node(10, 10.0, 20.0, 0.0) + Node(11, 10.0, 30.0, 0.0) + Node(12, 0.0, 30.0, 0.0) + + Node(13, 0.0, 20.0, -5.0) + Node(14, 10.0, 20.0, -5.0) + Node(15, 10.0, 30.0, -5.0) + Node(16, 0.0, 30.0, -5.0) + + Line(13, '9 10') + Line(14, '10 11') + Line(15, '11 12') + Line(16, '12 9') + + Line(17, '13 14') + Line(18, '14 15') + Line(19, '15 16') + Line(20, '16 13') + + Line(21, '9 13') + Line(22, '10 14') + Line(23, '11 15') + Line(24, '12 16') + + Surface(7, '13-16', 1) + Surface(8, '17-20', 1) + Surface(9, '13 22 17 21', 1) + Surface(10, '15 23 19 24', 1) + Surface(11, '16 21 20 24', 1) + Surface(12, '14 22 18 23', 1) + + Material(3, 'S275') + Solid.Standard(2, '7-12', 3) + + Solid.DeleteSolid('1') + + Model.clientModel.service.finish_modification() + + modelInfo = Model.clientModel.service.get_model_info() + + assert modelInfo.property_solid_count == 1 From c36ab05713ebde7495d5882f6c86df182eebad88 Mon Sep 17 00:00:00 2001 From: MichalO Date: Tue, 31 May 2022 12:43:10 +0200 Subject: [PATCH 2/2] 'Tags' changed to 'Numbers' Unit tests: 152 passed, 8 skipped in 178.99s --- RFEM/BasicObjects/line.py | 2 +- RFEM/BasicObjects/lineSet.py | 6 +++--- RFEM/BasicObjects/material.py | 2 +- RFEM/BasicObjects/member.py | 2 +- RFEM/BasicObjects/memberSet.py | 6 +++--- RFEM/BasicObjects/node.py | 2 +- RFEM/BasicObjects/opening.py | 4 ++-- RFEM/BasicObjects/section.py | 2 +- RFEM/BasicObjects/solid.py | 12 ++++++------ RFEM/BasicObjects/solidSet.py | 6 +++--- RFEM/BasicObjects/surface.py | 18 +++++++++--------- RFEM/BasicObjects/surfaceSet.py | 6 +++--- RFEM/BasicObjects/thickness.py | 2 +- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/RFEM/BasicObjects/line.py b/RFEM/BasicObjects/line.py index 2988598d..dc0fed53 100644 --- a/RFEM/BasicObjects/line.py +++ b/RFEM/BasicObjects/line.py @@ -466,7 +466,7 @@ def DeleteLine(lines_no: str = '1 2', model = Model): ''' Args: - lines_no (str): Tags of Lines to be deleted + lines_no (str): Numbers of Lines to be deleted ''' # Delete from client model diff --git a/RFEM/BasicObjects/lineSet.py b/RFEM/BasicObjects/lineSet.py index d71de12f..1d71220c 100644 --- a/RFEM/BasicObjects/lineSet.py +++ b/RFEM/BasicObjects/lineSet.py @@ -13,7 +13,7 @@ def __init__(self, ''' Args: no (int): Line Set Tag - lines_no (str): Tags of Lines Contained Within Line Set + lines_no (str): Numbers of Lines Contained Within Line Set line_set_type (enum): Line Set Type Enumeration comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -56,7 +56,7 @@ def ContinuousLines( ''' Args: no (int): Line Set Tag - lines_no (str): Tags of Lines Contained Within Continuous Line Set + lines_no (str): Numbers of Lines Contained Within Continuous Line Set comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary ''' @@ -98,7 +98,7 @@ def GroupOfLines( ''' Args: no (int): Line Set Tag - lines_no (str): Tags of Lines Contained Within Group of Lines Line Set + lines_no (str): Numbers of Lines Contained Within Group of Lines Line Set comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary ''' diff --git a/RFEM/BasicObjects/material.py b/RFEM/BasicObjects/material.py index 326570a4..793773ba 100644 --- a/RFEM/BasicObjects/material.py +++ b/RFEM/BasicObjects/material.py @@ -46,7 +46,7 @@ def DeleteMaterial(materials_no: str = '1 2', model = Model): ''' Args: - materials_no (str): Tags of Materials to be deleted + materials_no (str): Numbers of Materials to be deleted ''' # Delete from client model diff --git a/RFEM/BasicObjects/member.py b/RFEM/BasicObjects/member.py index 3f9b7d5e..2bec4877 100644 --- a/RFEM/BasicObjects/member.py +++ b/RFEM/BasicObjects/member.py @@ -1989,7 +1989,7 @@ def DeleteMember(members_no: str = '1 2', model = Model): ''' Args: - members_no (str): Tags of Members to be deleted + members_no (str): Numbers of Members to be deleted ''' # Delete from client model diff --git a/RFEM/BasicObjects/memberSet.py b/RFEM/BasicObjects/memberSet.py index f5476680..d044d016 100644 --- a/RFEM/BasicObjects/memberSet.py +++ b/RFEM/BasicObjects/memberSet.py @@ -13,7 +13,7 @@ def __init__(self, ''' Args: no (int): Member Set Tag - members_no (str): Tags of Members Contained Within Member Set + members_no (str): Numbers of Members Contained Within Member Set member_set_type (enum): Member Set Type Enumeration comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -56,7 +56,7 @@ def ContinuousMembers( ''' Args: no (int): Member Set Tag - members_no (str): Tags of Members Contained Within Continuous Member Set + members_no (str): Numbers of Members Contained Within Continuous Member Set comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary ''' @@ -98,7 +98,7 @@ def GroupOfmembers( ''' Args: no (int): Member Set Tag - members_no (str): Tags of Members Contained Within Group of Members Member Set + members_no (str): Numbers of Members Contained Within Group of Members Member Set comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary ''' diff --git a/RFEM/BasicObjects/node.py b/RFEM/BasicObjects/node.py index 09a76e71..10f3993e 100644 --- a/RFEM/BasicObjects/node.py +++ b/RFEM/BasicObjects/node.py @@ -437,7 +437,7 @@ def DeleteNode(nodes_no: str = '1 2', model = Model): ''' Args: - nodes_no (str): Tags of Nodes to be deleted + nodes_no (str): Numbers of Nodes to be deleted ''' # Delete from client model diff --git a/RFEM/BasicObjects/opening.py b/RFEM/BasicObjects/opening.py index 5240e865..f0ba7b85 100644 --- a/RFEM/BasicObjects/opening.py +++ b/RFEM/BasicObjects/opening.py @@ -12,7 +12,7 @@ def __init__(self, ''' Args: no (int): Opening Tag - lines_no (str): Tags of Lines defining Opening + lines_no (str): Numbers of Lines defining Opening comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary ''' @@ -45,7 +45,7 @@ def DeleteOpening(openings_no: str = '1 2', model = Model): ''' Args: - openings_no (str): Tags of Openings to be deleted + openings_no (str): Numbers of Openings to be deleted ''' # Delete from client model diff --git a/RFEM/BasicObjects/section.py b/RFEM/BasicObjects/section.py index ebc343ad..66968cad 100644 --- a/RFEM/BasicObjects/section.py +++ b/RFEM/BasicObjects/section.py @@ -51,7 +51,7 @@ def DeleteSection(sections_no: str = '1 2', model = Model): ''' Args: - sections_no (str): Tags of Sections to be deleted + sections_no (str): Numbers of Sections to be deleted ''' # Delete from client model diff --git a/RFEM/BasicObjects/solid.py b/RFEM/BasicObjects/solid.py index dfb188ad..1fb43e3b 100644 --- a/RFEM/BasicObjects/solid.py +++ b/RFEM/BasicObjects/solid.py @@ -13,7 +13,7 @@ def __init__(self, ''' Args: no (int): Solid Tag - boundary_surfaces_no (str): Tags of Surfaces defining Solid + boundary_surfaces_no (str): Numbers of Surfaces defining Solid material_no (int): Tag of Material assigned to Solid comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -57,7 +57,7 @@ def Standard( ''' Args: no (int): Solid Tag - boundary_surfaces_no (str): Tags of Surfaces defining Solid + boundary_surfaces_no (str): Numbers of Surfaces defining Solid material_no (int): Tag of Material assigned to Solid comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -104,7 +104,7 @@ def Gas( ''' Args: no (int): Solid Tag - boundary_surfaces_no (str): Tags of Surfaces defining Gas + boundary_surfaces_no (str): Numbers of Surfaces defining Gas material_no (int): Tag of Material assigned to Solid comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -151,7 +151,7 @@ def Contact( ''' Args: no (int): Solid Tag - boundary_surfaces_no (str): Tags of Surfaces defining Contact + boundary_surfaces_no (str): Numbers of Surfaces defining Contact material_no (int): Tag of Material assigned to Solid comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -198,7 +198,7 @@ def Soil( ''' Args: no (int): Solid Tag - boundary_surfaces_no (str): Tags of Surfaces defining Soil + boundary_surfaces_no (str): Numbers of Surfaces defining Soil material_no (int): Tag of Material assigned to Solid comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -238,7 +238,7 @@ def DeleteSolid(solids_no: str = '1 2', model = Model): ''' Args: - solids_no (str): Tags of Solids to be deleted + solids_no (str): Numbers of Solids to be deleted ''' # Delete solids from client model diff --git a/RFEM/BasicObjects/solidSet.py b/RFEM/BasicObjects/solidSet.py index 51c61834..d01e7d30 100644 --- a/RFEM/BasicObjects/solidSet.py +++ b/RFEM/BasicObjects/solidSet.py @@ -13,7 +13,7 @@ def __init__(self, ''' Args: no (int): Solid Set Tag - solids_no (str): Tags of Solids Contained Within Solid Set + solids_no (str): Numbers of Solids Contained Within Solid Set solid_set_type (enum): Solid Set Type Enumeration comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -56,7 +56,7 @@ def ContinuousSolids( ''' Args: no (int): Solid Set Tag - solids_no (str): Tags of Solids Contained Within Continuous Solid Set + solids_no (str): Numbers of Solids Contained Within Continuous Solid Set comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary ''' @@ -98,7 +98,7 @@ def GroupOfSolids( ''' Args: no (int): Solid Set Tag - solids_no (str): Tags of Solids Contained Within Group of Solids Solid Set + solids_no (str): Numbers of Solids Contained Within Group of Solids Solid Set comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary ''' diff --git a/RFEM/BasicObjects/surface.py b/RFEM/BasicObjects/surface.py index b13c3491..01e90b9d 100644 --- a/RFEM/BasicObjects/surface.py +++ b/RFEM/BasicObjects/surface.py @@ -7,7 +7,7 @@ def CreateGeometryAndSetToModel(no, surface_type, boundary_lines_no, geometry_ty Args: no (int): Surface Tag surface_type (enum): Surface Type Enumeration - boundary_lines_no (str): Tags of Lines defining Standard Surface + boundary_lines_no (str): Numbers of Lines defining Standard Surface geometry_type (enum): Geometry Type Enumeration geometry_type_parameters (list): Geometry Type Parameters for geometry_type == SurfaceGeometry.GEOMETRY_NURBS: @@ -96,7 +96,7 @@ def __init__(self, ''' Args: no (int): Surface Tag - boundary_lines_no (str): Tags of Lines defining Surface + boundary_lines_no (str): Numbers of Lines defining Surface thickness (int): Tag of Thickness assigned to Surface comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -150,7 +150,7 @@ def Standard( geometry_type_parameters = None for geometry_type == SurfaceGeometry.GEOMETRY_QUADRANGLE: geometry_type_parameters = [quadrangle_corner_node_1, quadrangle_corner_node_2, quadrangle_corner_node_3, quadrangle_corner_node_4] - boundary_lines_no (str): Tags of Lines defining Standard Surface + boundary_lines_no (str): Numbers of Lines defining Standard Surface thickness (int): Tag of Thickness assigned to Standard Surface comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -179,7 +179,7 @@ def WithoutThickness( geometry_type_parameters = None for geometry_type == SurfaceGeometry.GEOMETRY_QUADRANGLE: geometry_type_parameters = [quadrangle_corner_node_1, quadrangle_corner_node_2, quadrangle_corner_node_3, quadrangle_corner_node_4] - boundary_lines_no (str): Tags of Lines defining Without Thickness Surface + boundary_lines_no (str): Numbers of Lines defining Without Thickness Surface comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary ''' @@ -207,7 +207,7 @@ def Rigid( geometry_type_parameters = None for geometry_type == SurfaceGeometry.GEOMETRY_QUADRANGLE: geometry_type_parameters = [quadrangle_corner_node_1, quadrangle_corner_node_2, quadrangle_corner_node_3, quadrangle_corner_node_4] - boundary_lines_no (str): Tags of Lines defining Rigid Surface + boundary_lines_no (str): Numbers of Lines defining Rigid Surface comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary ''' @@ -236,7 +236,7 @@ def Membrane( geometry_type_parameters = None for geometry_type == SurfaceGeometry.GEOMETRY_QUADRANGLE: geometry_type_parameters = [quadrangle_corner_node_1, quadrangle_corner_node_2, quadrangle_corner_node_3, quadrangle_corner_node_4] - boundary_lines_no (str): Tags of Lines defining Membrane Surface + boundary_lines_no (str): Numbers of Lines defining Membrane Surface thickness (int): Tag of Thickness assigned to Membrane Surface comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -266,7 +266,7 @@ def WithoutMemberaneTension( geometry_type_parameters = None for geometry_type == SurfaceGeometry.GEOMETRY_QUADRANGLE: geometry_type_parameters = [quadrangle_corner_node_1, quadrangle_corner_node_2, quadrangle_corner_node_3, quadrangle_corner_node_4] - boundary_lines_no (str): Tags of Lines defining Without Membrane Tension Surface + boundary_lines_no (str): Numbers of Lines defining Without Membrane Tension Surface thickness (int): Tag of Thickness assigned to Without Membrane Tension Surface comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -294,7 +294,7 @@ def LoadDistribution( ''' Args: no (int): Surface Tag - boundary_lines_no (str): Tags of Lines defining Load Distribution Surface + boundary_lines_no (str): Numbers of Lines defining Load Distribution Surface load_transfer_direction (enum): Surface Load Transfer Direction Enumeration surface_weight_enabled (bool): Activate/De-Activate Surface Weight surface_weight (float): Magnitude of Surface Weight @@ -365,7 +365,7 @@ def DeleteSurface(surfaces_no: str = '1 2', model = Model): ''' Args: - surfaces_no (str): Tags of Surfaces to be deleted + surfaces_no (str): Numbers of Surfaces to be deleted ''' # Delete surfaces from client model diff --git a/RFEM/BasicObjects/surfaceSet.py b/RFEM/BasicObjects/surfaceSet.py index fd0e8bd8..7b3a6a1f 100644 --- a/RFEM/BasicObjects/surfaceSet.py +++ b/RFEM/BasicObjects/surfaceSet.py @@ -13,7 +13,7 @@ def __init__(self, ''' Args: no (int): Surfaces Set Tag - surfaces_no (str): Tags of Surfaces Contained Within Surface Set + surfaces_no (str): Numbers of Surfaces Contained Within Surface Set surfaces_set_type (enum): Surface Set Type Enumeration comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -56,7 +56,7 @@ def ContinuousSurfaces( ''' Args: no (int): Surfaces Set Tag - surfaces_no (str): Tags of Surfaces Contained Within Continuous Surface Set + surfaces_no (str): Numbers of Surfaces Contained Within Continuous Surface Set surfaces_set_type (enum): Surface Set Type Enumeration comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary @@ -99,7 +99,7 @@ def GroupOfSurfaces( ''' Args: no (int): Surfaces Set Tag - surfaces_no (str): Tags of Surfaces Contained Within Group of Surfaces Surface Set + surfaces_no (str): Numbers of Surfaces Contained Within Group of Surfaces Surface Set comment (str, optional): Comments params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary ''' diff --git a/RFEM/BasicObjects/thickness.py b/RFEM/BasicObjects/thickness.py index fbed68b2..1aaa560d 100644 --- a/RFEM/BasicObjects/thickness.py +++ b/RFEM/BasicObjects/thickness.py @@ -692,7 +692,7 @@ def DeleteThickness(thickness_no: str = '1 2', model = Model): ''' Args: - thickness_no (str): Tags of Thickness to be deleted + thickness_no (str): Numbers of Thickness to be deleted ''' # Delete from client model