Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions RFEM/SteelDesign/steelServiceabilityConfiguration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
from RFEM.initModel import Model, clearAttributes, deleteEmptyAttributes, ConvertToDlString

class SteelDesignServiceabilityConfigurations():

def __init__(self,
no: int = 1,
name: str = 'SLS1',
members_no: str = 'All',
member_sets_no: str = 'All',
comment: str = '',
params: dict = None,
model = Model):

"""
Args:
no (int): Steel Design Serviceability Configuration Tag
user_defined_name (list): User Defined Name Configuration Name
members_no (str): Assign Configuration to Selected Members
member_sets_no (str): Assign Configuration to Selected Member Sets
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
model (RFEM Class, optional): Model to be edited
"""

# Client Model | Steel Design Serviceability Configurations
clientObject = model.clientModel.factory.create('ns0:steel_design_sls_configuration')

# Clears object atributes | Sets all atributes to None
clearAttributes(clientObject)

# ULS Configuration No.
clientObject.no = no

# User Defined Name
if name:
clientObject.user_defined_name_enabled = True
clientObject.name = name

# Assigned Members
if members_no == 'All':
clientObject.assigned_to_all_members = True

else:
clientObject.assigned_to_all_members = False
clientObject.assigned_to_members = ConvertToDlString(members_no)

#Assigned Member Sets
if member_sets_no == 'All':
clientObject.assigned_to_all_member_sets = True

else:
clientObject.assigned_to_all_member_sets = False
clientObject.assigned_to_member_sets = ConvertToDlString(member_sets_no)

# Comment
clientObject.comment = comment

# Adding optional parameters via dictionary
if params:
for key in params:
clientObject[key] = params[key]

# Delete None attributes for improved performance
deleteEmptyAttributes(clientObject)

# Add Global Parameters to Client Model
model.clientModel.service.set_steel_design_sls_configuration(clientObject)
1 change: 1 addition & 0 deletions UnitTests/test_steelBoundaryConditions.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

def test_steelEffectiveLengths():

Model.clientModel.service.delete_all()
Model.clientModel.service.begin_modification()

SetAddonStatus(Model.clientModel, AddOn.steel_design_active, True)
Expand Down
48 changes: 48 additions & 0 deletions UnitTests/test_steelDesignServiceabilityConfiguration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import os
import sys
PROJECT_ROOT = os.path.abspath(os.path.join(
os.path.dirname(__file__),
os.pardir)
)
sys.path.append(PROJECT_ROOT)

from RFEM.enums import AddOn, NodalSupportType
from RFEM.initModel import Model, SetAddonStatus
from RFEM.BasicObjects.material import Material
from RFEM.BasicObjects.section import Section
from RFEM.BasicObjects.node import Node
from RFEM.BasicObjects.member import Member
from RFEM.TypesForNodes.nodalSupport import NodalSupport
from RFEM.SteelDesign.steelServiceabilityConfiguration import SteelDesignServiceabilityConfigurations

if Model.clientModel is None:
Model()

def test_SteelDesignServiceabilityConfigurations():

Model.clientModel.service.delete_all()
Model.clientModel.service.begin_modification()

SetAddonStatus(Model.clientModel, addOn=AddOn.steel_design_active, status=True)

Material(1, 'S235')

Section(1, 'IPE 200')

Node(1, 0.0, 0.0, 0.0)
Node(2, 5, 0.0, 0.0)

Member(1, 1, 2, 0.0, 1, 1)

NodalSupport(1, '1', NodalSupportType.FIXED)

SteelDesignServiceabilityConfigurations(1, 'Test SLS')
SteelDesignServiceabilityConfigurations(2, 'SLS2', '1')

Model.clientModel.service.finish_modification()

config1 = Model.clientModel.service.get_steel_design_sls_configuration(1)
config2 = Model.clientModel.service.get_steel_design_sls_configuration(2)

assert config1.name == "Test SLS"
assert config2.assigned_to_members == '1'
1 change: 1 addition & 0 deletions UnitTests/test_steelDesignUltimateConfigurations.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

def test_SteelDesignUltimateConfigurations():

Model.clientModel.service.delete_all()
Model.clientModel.service.begin_modification()

SetAddonStatus(Model.clientModel, addOn=AddOn.steel_design_active, status=True)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

def test_timberDesignServiceLimitStateConfigurations():

Model.clientModel.service.delete_all()
Model.clientModel.service.begin_modification()

SetAddonStatus(Model.clientModel, addOn=AddOn.timber_design_active, status=True)
Expand Down
1 change: 1 addition & 0 deletions UnitTests/test_timberDesignUltimateConfigurations.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

def test_TimberDesignUltimateConfigurations():

Model.clientModel.service.delete_all()
Model.clientModel.service.begin_modification()

SetAddonStatus(Model.clientModel, addOn=AddOn.timber_design_active, status=True)
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/test_timberMemberLocalSectionReduction.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def test_timberMemberLocalSectionReduction():

SetAddonStatus(Model.clientModel, AddOn.timber_design_active, True)

# Now only in pre-release version (8/11/2022)
# TODO: Now only in pre-release version (8/11/2022)
#comp1 = Components(TimberMemberLocalSectionReductionType.REDUCTION_COMPONENT_TYPE_RECTANGLE_OPENING)
#comp2 = Components(TimberMemberLocalSectionReductionType.REDUCTION_COMPONENT_TYPE_CIRCLE_OPENING)
comp3 = Components(TimberMemberLocalSectionReductionType.REDUCTION_COMPONENT_TYPE_START_NOTCH)
Expand Down