Skip to content

Ondrej Michal: static method decorators #112

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 11 commits into from
Mar 28, 2022
Merged

Ondrej Michal: static method decorators #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cfe07a8
added static method decorators where possible
Mar 18, 2022
4027c0e
removed default dictionary parameter
Mar 24, 2022
eb72801
forget to delete it
Mar 24, 2022
c988956
Nurbs refurbished
Mar 25, 2022
84fdcb9
added 'wait' to examples execution
Mar 25, 2022
4d723a4
Merge remote-tracking branch 'remotes/origin/main' into OndrejMichal_…
Mar 25, 2022
295d9b1
minor comment to test new set of rules in pylintrc
Mar 25, 2022
3f1a7b6
update
Mar 25, 2022
6c3900a
Merge remote-tracking branch 'remotes/origin/main' into OndrejMichal_…
Mar 25, 2022
95f6558
R0912, W1405 added
Mar 28, 2022
e5b51a0
bug 24241 fixed
Mar 28, 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
7 changes: 3 additions & 4 deletions Examples/Cantilever/Demo1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
print('dirname: ', dirName)
sys.path.append(dirName + r'/../..')

# Import der Bibliotheken
from RFEM.enums import NodalSupportType, LoadDirectionType
from RFEM.initModel import Model, Calculate_all
from RFEM.BasicObjects.material import Material
Expand Down Expand Up @@ -39,9 +38,9 @@

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

StaticAnalysisSettings.GeometricallyLinear(0, 1, "Linear")
StaticAnalysisSettings.SecondOrderPDelta(0, 2, "SecondOrder")
StaticAnalysisSettings.LargeDeformation(0, 3, "LargeDeformation")
StaticAnalysisSettings.GeometricallyLinear(1, "Linear")
StaticAnalysisSettings.SecondOrderPDelta(2, "SecondOrder")
StaticAnalysisSettings.LargeDeformation(3, "LargeDeformation")

LoadCase(1, 'Self-Weight', [True, 0.0, 0.0, 1.0])

Expand Down
18 changes: 9 additions & 9 deletions Examples/Hall/hall.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
Member(4*n+i, j+2, j+7, 0.0, 2, 2)
Member(4*n+i + n-1, j+4, j+9, 0.0, 2, 2)

# vertical bracing
# vertical bracing
# add a question about repeating in every block, one yes one no, only beginning and end

BracingV = input('Would you like to include vertical bracing? (Y/N)')
Expand All @@ -91,13 +91,13 @@
k = n*4+(n-1)*2
for i in range(n):
if i in (0, n-2):
Member.Tension(0, k+1+4*i, i*5+1, i*5+7,
Member.Tension(k+1+4*i, i*5+1, i*5+7,
MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE, [0], 3)
Member.Tension(0, k+2+4*i, i*5+2, i*5+6,
Member.Tension(k+2+4*i, i*5+2, i*5+6,
MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE, [0], 3)
Member.Tension(0, k+3+4*i, i*5+5, i*5+9,
Member.Tension(k+3+4*i, i*5+5, i*5+9,
MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE, [0], 3)
Member.Tension(0, k+4+4*i, i*5+4, i*5+10,
Member.Tension(k+4+4*i, i*5+4, i*5+10,
MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE, [0], 3)

# MAKE IT MORE GENERAL!
Expand All @@ -111,13 +111,13 @@
k = 4*n + 2*(n-1)
for i in range(n):
if i % 2 == 0:
Member.Tension(0, k+1+4*i, i*5+1, i*5+7,
Member.Tension(k+1+4*i, i*5+1, i*5+7,
MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE, [0], 3)
Member.Tension(0, k+2+4*i, i*5+2, i*5+6,
Member.Tension(k+2+4*i, i*5+2, i*5+6,
MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE, [0], 3)
Member.Tension(0, k+3+4*i, i*5+5, i*5+9,
Member.Tension(k+3+4*i, i*5+5, i*5+9,
MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE, [0], 3)
Member.Tension(0, k+4+4*i, i*5+4, i*5+10,
Member.Tension(k+4+4*i, i*5+4, i*5+10,
MemberRotationSpecificationType.COORDINATE_SYSTEM_ROTATION_VIA_ANGLE, [0], 3)

# horizontal bracing
Expand Down
194 changes: 97 additions & 97 deletions Examples/TrussGenerator_2D/TrussGenerator.py
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions RFEM/BasicObjects/bracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# start_section_no: int = 1,
# end_section_no: int = 1,
# comment: str = '',
# params: dict = {}):
# params: dict = None):

# '''
# Args:
Expand All @@ -23,7 +23,7 @@
# start_section_no (int): Tag of Start Section
# end_section_no (int): End of End Section
# comment (str, optional): Comment
# params (dict, optional): Parameters
# params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
# '''

# # Client model | Bracing
Expand Down Expand Up @@ -80,7 +80,7 @@
# start_bracing_hinge_no: int = 0,
# end_bracing_hinge_no: int = 0,
# comment: str = '',
# params: dict = {}):
# params: dict = None):

# '''
# Args:
Expand All @@ -94,7 +94,7 @@
# start_bracing_hinge_no (int): Hinge at Bracing Start
# end_bracing_hinge_no (int): Hinge at Bracing End
# comment (str, optional): Comment
# params (dict, optional): Parameters
# params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
# '''

# # Client model | Bracing
Expand Down Expand Up @@ -151,7 +151,7 @@
# start_bracing_hinge_no: int = 0,
# end_bracing_hinge_no: int = 0,
# comment: str = '',
# params: dict = {}):
# params: dict = None):

# '''
# Args:
Expand All @@ -165,7 +165,7 @@
# start_bracing_hinge_no (int): Hinge at Bracing Start
# end_bracing_hinge_no (int): Hinge at Bracing End
# comment (str, optional): Comment
# params (dict, optional): Parameters
# params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
# '''

# # Client model | Bracing
Expand Down
4 changes: 2 additions & 2 deletions RFEM/BasicObjects/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# insertion_point_y: int = 4,
# insertion_point_z: int = 3,
# comment: str = '',
# params: dict = {}):
# params: dict = None):

# '''
# Args:
Expand All @@ -30,7 +30,7 @@
# insertion_point_y (int): Insertion Point y
# insertion_point_z (int): Insertion Point z
# comment (str, optional): Comment
# params (dict, optional): Parameters
# params (dict, optional): Any WS Parameter relevant to the object and its value in form of a dictionary
# '''

# # Client model | Frame
Expand Down
Loading