Skip to content

Rotated Surface Update #118

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 3 commits into from
Apr 12, 2022
Merged

Rotated Surface Update #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64855e8
added Rotated Surface
Apr 4, 2022
edc4f34
Merge remote-tracking branch 'remotes/origin/main' into dogukaratas-S…
Apr 12, 2022
4be1bf4
minor fixes
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
12 changes: 12 additions & 0 deletions RFEM/BasicObjects/surface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from RFEM.enums import SurfaceGeometry, SurfaceLoadDistributionDirection, SurfaceType
from RFEM.initModel import Model, clearAtributes, ConvertToDlString
import math

def CreateGeometryAndSetToModel(no, surface_type, boundary_lines_no, geometry_type, geometry_type_parameters, thickness = None, comment = None, params = None):
'''
Expand All @@ -15,6 +16,8 @@ def CreateGeometryAndSetToModel(no, surface_type, boundary_lines_no, geometry_ty
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]
for geometry_type == SurfaceGeometry.GEOMETRY_ROTATED:
geometry_type_parameters = [rotated_angle_of_rotation, [rotated_point_p_x, rotated_point_p_y, rotated_point_p_z], [rotated_point_r_x, rotated_point_r_y, rotated_point_r_z], rotated_boundary_line]
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
Expand Down Expand Up @@ -45,6 +48,15 @@ def CreateGeometryAndSetToModel(no, surface_type, boundary_lines_no, geometry_ty
clientObject.nurbs_order_in_direction_v = geometry_type_parameters[3]
elif geometry_type.name == 'GEOMETRY_PLANE':
geometry_type_parameters = None
elif geometry_type.name == 'GEOMETRY_ROTATED':
clientObject.rotated_angle_of_rotation = geometry_type_parameters[0] * (math.pi/180)
clientObject.rotated_point_p_x = geometry_type_parameters[1][0]
clientObject.rotated_point_p_y = geometry_type_parameters[1][1]
clientObject.rotated_point_p_z = geometry_type_parameters[1][2]
clientObject.rotated_point_r_x = geometry_type_parameters[2][0]
clientObject.rotated_point_r_y = geometry_type_parameters[2][1]
clientObject.rotated_point_r_z = geometry_type_parameters[2][2]
clientObject.rotated_boundary_line = geometry_type_parameters[3]
elif geometry_type.name == 'GEOMETRY_QUADRANGLE':
if len(geometry_type_parameters) != 4:
raise Exception('WARNING: The geometry type parameter needs to be of length 4. Kindly check list inputs for completeness and correctness.')
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/test_StandardSurface_Test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_standard_surface():
Node(12, 0.0, 10.0, 0.0)
Node(13, 5.0, 10.0, -2.5)
Node(14, 10.0, 10.0, 0.0)
Node(15, 0.0, 5.0, -2,5)
Node(15, 0.0, 5.0, -2.5)
Node(16, 10.0, 5.0, -2.5)

# NURBS-Curve Definition
Expand Down