Skip to content

updated Member Class Line Assignment #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 12, 2022
Merged

updated Member Class Line Assignment #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6bfb05
updated Member Class Line Assignment
Apr 5, 2022
82e1aac
Merge remote-tracking branch 'remotes/origin/main' into dogukaratas-M…
Apr 12, 2022
c2c528c
New parameter on wrong place
Apr 12, 2022
031c1e6
style fix
Apr 12, 2022
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
2 changes: 2 additions & 0 deletions .gitconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[commit]
template = ~/.gitmessage
5 changes: 5 additions & 0 deletions .gitmessage
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Subject no more than 50 characters long>

<Description if needed>
Unit tests: <results e.g. 127 passed, 9 skipped in 152.67s>
Examples: <results e.g. passing>
4 changes: 2 additions & 2 deletions Examples/Cantilever/Demo1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# -*- coding: utf-8 -*-
import os
import sys
baseName = os.path.basename(__file__)
baseName = os.path.basename(__file__)5
dirName = os.path.dirname(__file__)
print('basename: ', baseName)
print('dirname: ', dirName)
sys.path.append(dirName + r'/../..')

from RFEM.enums import *
from RFEM.enums import NodalSupportType, LoadDirectionType
from RFEM.initModel import Model, Calculate_all
from RFEM.BasicObjects.material import Material
from RFEM.BasicObjects.section import Section
Expand Down
50 changes: 50 additions & 0 deletions RFEM/BasicObjects/member.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ def __init__(self,
end_section_no: int = 1,
start_member_hinge_no: int = 0,
end_member_hinge_no: int = 0,
line = None,
comment: str = '',
params: dict = None):
"""
Expand All @@ -23,6 +24,7 @@ def __init__(self,
end_section_no (int): Tag of End Section
start_member_hinge_no (int): Tag of Start Member Hinge
end_member_hinge_no (int): Tag of End Member Hinge
line (int, optional): Assigned Line
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
"""
Expand Down Expand Up @@ -54,6 +56,9 @@ def __init__(self,
# End Section No.
clientObject.section_end = end_section_no

# Assigned Line No.
clientObject.line = line

# Start Member Hinge No.
clientObject.member_hinge_start = start_member_hinge_no

Expand Down Expand Up @@ -82,6 +87,7 @@ def Beam(
start_section_no: int = 1,
end_section_no: int = 1,
distribution_parameters = [],
line = None,
comment: str = '',
params: dict = {'member_hinge_start':0, 'member_hinge_end': 0,
'member_eccentricity_start': 0, 'member_eccentricity_end': 0,
Expand Down Expand Up @@ -132,6 +138,7 @@ def Beam(
rotation_parameters = [rotation_surface, rotation_surface_plane_type]
start_section_no (int): Tag of Start Section
end_section_no (int): End of End Section
line (int, optional): Assigned Line
distribution_parameters (list): Distribution Parameters
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
Expand Down Expand Up @@ -278,6 +285,9 @@ def Beam(
# End Section No.
clientObject.section_end = end_section_no

# Assigned Line No.
clientObject.line = line

# Update parameters
params_up: dict = {'member_hinge_start':0, 'member_hinge_end': 0,
'member_eccentricity_start': 0, 'member_eccentricity_end': 0,
Expand Down Expand Up @@ -339,6 +349,7 @@ def Rigid(
end_node_no: int = 2,
rotation_specification_type = MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE,
rotation_parameters = [0],
line = None,
comment: str = '',
params: dict = {'member_hinge_start':0, 'member_hinge_end': 0,
'member_eccentricity_start': 0, 'member_eccentricity_end': 0,
Expand All @@ -360,6 +371,7 @@ def Rigid(
rotation_parameters = [rotation_plane_type]
for rotation_specification_type == MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_SURFACE:
rotation_parameters = [rotation_surface, rotation_surface_plane_type]
line (int, optional): Assigned Line
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
"""
Expand Down Expand Up @@ -423,6 +435,9 @@ def Rigid(
# Deactivation for Calculation
clientObject.is_deactivated_for_calculation = params_up['is_deactivated_for_calculation']

# Assigned Line No.
clientObject.line = line

# Comment
clientObject.comment = comment

Expand All @@ -446,6 +461,7 @@ def Rib(
rib_surfaces_no = [],
rib_alignment = MemberTypeRibAlignment.ALIGNMENT_ON_Z_SIDE_POSITIVE,
reference_width_type = MemberReferenceLengthWidthType.REFERENCE_LENGTH_WIDTH_SIXTH,
line = None,
comment: str = '',
params: dict = {'member_hinge_start':0, 'member_hinge_end': 0,
'support':0,
Expand All @@ -468,6 +484,7 @@ def Rib(
rib_surfaces_no (list): Surfaces Tags Assigned to Rib
rib_alignment (enum): Rib Alignment Enumeration
reference_width_type (enum): Reference Width Type Enumeration
line (int, optional): Assigned Line
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary

Expand Down Expand Up @@ -551,6 +568,9 @@ def Rib(
# Deactivation for Calculation
clientObject.is_deactivated_for_calculation = params_up['is_deactivated_for_calculation']

# Assigned Line No.
clientObject.line = line

# Comment
clientObject.comment = comment

Expand All @@ -570,6 +590,7 @@ def Truss(
rotation_specification_type = MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE,
rotation_parameters = [0],
section_no: int = 1,
line = None,
comment: str = '',
params: dict = {'member_eccentricity_start': 0, 'member_eccentricity_end': 0,
'member_nonlinearity': 0,
Expand All @@ -596,6 +617,7 @@ def Truss(
for rotation_specification_type == MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_SURFACE:
rotation_parameters = [rotation_surface, rotation_surface_plane_type]
section_no (int): Section Tag
line (int, optional): Assigned Line
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
"""
Expand Down Expand Up @@ -667,6 +689,9 @@ def Truss(
# Deactivation for Calculation
clientObject.is_deactivated_for_calculation = params_up['is_deactivated_for_calculation']

# Assigned Line No.
clientObject.line = line

# Comment
clientObject.comment = comment

Expand All @@ -686,6 +711,7 @@ def TrussOnlyN(
rotation_specification_type = MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE,
rotation_parameters = [0],
section_no: int = 1,
line = None,
comment: str = '',
params: dict = {'member_eccentricity_start': 0, 'member_eccentricity_end': 0,
'member_nonlinearity': 0,
Expand All @@ -712,6 +738,7 @@ def TrussOnlyN(
for rotation_specification_type == MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_SURFACE:
rotation_parameters = [rotation_surface, rotation_surface_plane_type]
section_no (int): Section Tag
line (int, optional): Assigned Line
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
"""
Expand Down Expand Up @@ -783,6 +810,9 @@ def TrussOnlyN(
# Deactivation for Calculation
clientObject.is_deactivated_for_calculation = params_up['is_deactivated_for_calculation']

# Assigned Line No.
clientObject.line = line

# Comment
clientObject.comment = comment

Expand All @@ -802,6 +832,7 @@ def Tension(
rotation_specification_type = MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE,
rotation_parameters = [0],
section_no: int = 1,
line = None,
comment: str = '',
params: dict = {'member_eccentricity_start': 0, 'member_eccentricity_end': 0,
'member_nonlinearity': 0,
Expand All @@ -828,6 +859,7 @@ def Tension(
for rotation_specification_type == MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_SURFACE:
rotation_parameters = [rotation_surface, rotation_surface_plane_type]
section_no (int): Section Tag
line (int, optional): Assigned Line
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
"""
Expand Down Expand Up @@ -899,6 +931,9 @@ def Tension(
# Deactivation for Calculation
clientObject.is_deactivated_for_calculation = params_up['is_deactivated_for_calculation']

# Assigned Line No.
clientObject.line = line

# Comment
clientObject.comment = comment

Expand All @@ -918,6 +953,7 @@ def Compression(
rotation_specification_type = MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE,
rotation_parameters = [0],
section_no: int = 1,
line = None,
comment: str = '',
params: dict = {'member_eccentricity_start': 0, 'member_eccentricity_end': 0,
'member_nonlinearity': 0,
Expand All @@ -944,6 +980,7 @@ def Compression(
for rotation_specification_type == MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_SURFACE:
rotation_parameters = [rotation_surface, rotation_surface_plane_type]
section_no (int): Section Tag
line (int, optional): Assigned Line
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
"""
Expand Down Expand Up @@ -1015,6 +1052,9 @@ def Compression(
# Deactivation for Calculation
clientObject.is_deactivated_for_calculation = params_up['is_deactivated_for_calculation']

# Assigned Line No.
clientObject.line = line

# Comment
clientObject.comment = comment

Expand All @@ -1034,6 +1074,7 @@ def Buckling(
rotation_specification_type = MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE,
rotation_parameters = [0],
section_no: int = 1,
line = None,
comment: str = '',
params: dict = {'member_eccentricity_start': 0, 'member_eccentricity_end': 0,
'member_nonlinearity': 0,
Expand All @@ -1060,6 +1101,7 @@ def Buckling(
for rotation_specification_type == MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_SURFACE:
rotation_parameters = [rotation_surface, rotation_surface_plane_type]
section_no (int): Section Tag
line (int, optional): Assigned Line
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
"""
Expand Down Expand Up @@ -1131,6 +1173,9 @@ def Buckling(
# Deactivation for Calculation
clientObject.is_deactivated_for_calculation = params_up['is_deactivated_for_calculation']

# Assigned Line No.
clientObject.line = line

# Comment
clientObject.comment = comment

Expand All @@ -1150,6 +1195,7 @@ def Cable(
rotation_specification_type = MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE,
rotation_parameters = [0],
section_no: int = 1,
line = None,
comment: str = '',
params: dict = {'end_modifications_member_start_extension': 0,
'end_modifications_member_start_slope_y': 0,
Expand All @@ -1174,6 +1220,7 @@ def Cable(
for rotation_specification_type == MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_SURFACE:
rotation_parameters = [rotation_surface, rotation_surface_plane_type]
section_no (int): Section Tag
line (int, optional): Assigned Line
comment (str, optional): Comment
params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
"""
Expand Down Expand Up @@ -1236,6 +1283,9 @@ def Cable(
# Deactivation for Calculation
clientObject.is_deactivated_for_calculation = params_up['is_deactivated_for_calculation']

# Assigned Line No.
clientObject.line = line

# Comment
clientObject.comment = comment

Expand Down