Merge pull request #11 from idaholab/test/add-system-tests.py

Test/add system tests.py

Author: Crowder44

src/bim2fem/ifcplus/api/distribution_element.py

@@ -13,7 +13,7 @@
 import ifcopenshell.api.type
 import numpy as np
 import ifcopenshell.util.representation
-from typing import Literal, cast
+from typing import cast
 import ifcopenshell.api.system
 import ifcopenshell.api.root
 import ifcopenshell.api.spatial
@@ -241,18 +241,6 @@ def create_pipe_segment(
         object_z_axis_in_global_coordinates,
     )
 
-    object_z_axis_in_global_coordinates = (
-        bim2fem.ifcplus.util.geometry.convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=object_z_axis_in_global_coordinates,
-        )
-    )
-
-    object_x_axis_in_global_coordinates = (
-        bim2fem.ifcplus.util.geometry.convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=object_x_axis_in_global_coordinates,
-        )
-    )
-
     length = float(np.linalg.norm(object_z_axis_in_global_coordinates))
 
     outer_radius = nominal_diameter / 2 + thickness / 2
@@ -291,8 +279,8 @@ def create_pipe_segment(
     bim2fem.ifcplus.api.placement.edit_object_placement(
         product=pipe_segment,
         repositioned_origin=object_origin_in_global_coordinates,
-        repositioned_z_axis=object_z_axis_in_global_coordinates,
-        repositioned_x_axis=object_x_axis_in_global_coordinates,
+        repositioned_z_axis=tuple(object_z_axis_in_global_coordinates.tolist()),
+        repositioned_x_axis=tuple(object_x_axis_in_global_coordinates.tolist()),
         place_object_relative_to_parent=place_object_relative_to_parent,
     )
 

src/bim2fem/ifcplus/api/geometry.py

@@ -420,35 +420,32 @@ def add_vertex_point(
 
 
 def add_edge(
-    edge_start: ifcopenshell.entity_instance,
-    edge_end: ifcopenshell.entity_instance,
+    edge_start_as_vertex_point: ifcopenshell.entity_instance,
+    edge_end_as_vertex_point: ifcopenshell.entity_instance,
 ) -> ifcopenshell.entity_instance:
     """Add an IfcEdge"""
 
-    assert edge_start.is_a("IfcVertexPoint")
-    assert edge_end.is_a("IfcVertexPoint")
+    ifc4_file = edge_start_as_vertex_point.file
 
-    ifc4_file = edge_start.file
-
-    edge = ifc4_file.createIfcEdge(edge_start, edge_end)
+    edge = ifc4_file.createIfcEdge(
+        edge_start_as_vertex_point,
+        edge_end_as_vertex_point,
+    )
 
     return edge
 
 
 def add_curved_edge(
-    vertex_point_at_point_of_curvature: ifcopenshell.entity_instance,
-    vertex_point_at_point_of_tangency: ifcopenshell.entity_instance,
+    point_of_curvature_as_vertex_point: ifcopenshell.entity_instance,
+    point_of_tangency_as_vertex_point: ifcopenshell.entity_instance,
     center_of_curvature: tuple[float, float, float],
 ) -> ifcopenshell.entity_instance:
     """Add an IfcEdgeCurve"""
 
-    assert vertex_point_at_point_of_curvature.is_a("IfcVertexPoint")
-    assert vertex_point_at_point_of_tangency.is_a("IfcVertexPoint")
-
-    ifc4_file = vertex_point_at_point_of_curvature.file
+    ifc4_file = point_of_curvature_as_vertex_point.file
 
-    point_of_curvature = vertex_point_at_point_of_curvature.VertexGeometry.Coordinates
-    point_of_tangency = vertex_point_at_point_of_tangency.VertexGeometry.Coordinates
+    point_of_curvature = point_of_curvature_as_vertex_point.VertexGeometry.Coordinates
+    point_of_tangency = point_of_tangency_as_vertex_point.VertexGeometry.Coordinates
 
     radius_of_curvature = float(
         np.linalg.norm(np.array(point_of_curvature) - np.array(center_of_curvature))
@@ -484,8 +481,8 @@ def add_curved_edge(
     same_sense = True
 
     edge_curve = ifc4_file.createIfcEdgeCurve(
-        vertex_point_at_point_of_curvature,
-        vertex_point_at_point_of_tangency,
+        point_of_curvature_as_vertex_point,
+        point_of_tangency_as_vertex_point,
         edge_geometry,
         same_sense,
     )
@@ -508,7 +505,7 @@ def add_face_bound(
             v2 = vertex_points_of_bound[0]
         else:
             v2 = vertex_points_of_bound[index + 1]
-        edge = add_edge(edge_start=v1, edge_end=v2)
+        edge = add_edge(edge_start_as_vertex_point=v1, edge_end_as_vertex_point=v2)
         oriented_edge = ifc4_file.create_entity(
             type="IfcOrientedEdge",
             EdgeElement=edge,

src/bim2fem/ifcplus/api/structural.py

@@ -105,8 +105,8 @@ def create_linear_structural_curve_member(
 
     # Add and assign representation
     representation_item = bim2fem.ifcplus.api.geometry.add_edge(
-        edge_start=vertex_points[0],
-        edge_end=vertex_points[1],
+        edge_start_as_vertex_point=vertex_points[0],
+        edge_end_as_vertex_point=vertex_points[1],
     )
     shape_model = bim2fem.ifcplus.api.geometry.add_shape_model(
         ifc4_file=ifc4_file,
@@ -218,8 +218,8 @@ def create_curved_structural_curve_member(
 
     # Add and assign representation
     representation_item = bim2fem.ifcplus.api.geometry.add_curved_edge(
-        vertex_point_at_point_of_curvature=vertex_points[0],
-        vertex_point_at_point_of_tangency=vertex_points[1],
+        point_of_curvature_as_vertex_point=vertex_points[0],
+        point_of_tangency_as_vertex_point=vertex_points[1],
         center_of_curvature=horizontal_curve.center_of_curvature,
     )
     shape_model = bim2fem.ifcplus.api.geometry.add_shape_model(

src/bim2fem/ifcplus/api/system.py

@@ -1,6 +1,5 @@
 # Copyright 2025, Battelle Energy Alliance, LLC All Rights Reserved
 
-
 import ifcopenshell.api.system
 import ifcopenshell.util.system
 import bim2fem.ifcplus.api.distribution_element
@@ -156,20 +155,20 @@ def add_shape_representation_to_distribution_ports(
             )
 
 
-def create_piping_system_from_polyline(
+def create_pipe_run_from_polyline(
     ifc4_file: ifcopenshell.file,
     polyline: list[tuple[float, float, float]],
     nominal_diameter: float,
     thickness: float,
     material: ifcopenshell.entity_instance,
     distribution_system: ifcopenshell.entity_instance,
     elbow_radius_type: ELBOW_RADIUS_TYPE = "LONG",
-    branch_name: str = "Unnamed Branch",
+    branch_name: str = "Pipe Run",
     spatial_element: ifcopenshell.entity_instance | None = None,
     place_objects_relative_to_parent: bool = False,
     add_shape_representation_to_ports: bool = False,
 ) -> list[ifcopenshell.entity_instance]:
-    """Create a single path pipe branch composed of IfcPipeSegments and
+    """Create a single path pipe run composed of IfcPipeSegments and
     IfcPipeFittings (Elbows)."""
 
     if len(polyline) < 2:
@@ -299,7 +298,7 @@ def create_piping_system_from_polyline(
     return piping_elements
 
 
-def connect_two_distribution_ports_via_piping_with_no_intelligence(
+def connect_two_distribution_ports_via_pipe_run(
     ifc4_file: ifcopenshell.file,
     source_port: ifcopenshell.entity_instance,
     sink_port: ifcopenshell.entity_instance,
@@ -312,7 +311,7 @@ def connect_two_distribution_ports_via_piping_with_no_intelligence(
     spatial_element: ifcopenshell.entity_instance | None = None,
     add_shape_representation_to_ports: bool = False,
 ) -> list[ifcopenshell.entity_instance]:
-    """Connect two IfcDistributionPorts using a single path pipe branch formed via no
+    """Connect two IfcDistributionPorts using a pipe run formed via no
     intelligent method."""
 
     source_port_origin = bim2fem.ifcplus.util.system.get_port_location(
@@ -345,11 +344,13 @@ def connect_two_distribution_ports_via_piping_with_no_intelligence(
         ).tolist()
     )
 
-    (
-        delta_x_between_second_and_penultimate_point,
-        delta_y_between_second_and_penultimate_point,
-        _,
-    ) = tuple((np.array(penultimate_point) - np.array(second_point)).tolist())
+    delta_x_between_second_and_penultimate_point = (
+        np.array(penultimate_point) - np.array(second_point)
+    )[0]
+
+    delta_y_between_second_and_penultimate_point = (
+        np.array(penultimate_point) - np.array(second_point)
+    )[1]
 
     third_point = tuple(
         (
@@ -365,7 +366,7 @@ def connect_two_distribution_ports_via_piping_with_no_intelligence(
         ).tolist()
     )
 
-    piping_elements = create_piping_system_from_polyline(
+    piping_elements = create_pipe_run_from_polyline(
         ifc4_file=ifc4_file,
         polyline=[
             source_port_origin,

src/bim2fem/ifcplus/util/geometry.py

@@ -651,19 +651,11 @@ def from_3pt_polyline(
             - np.array(unit_vector_from_PC_to_PI) * tangent_length
         )
 
-        point_of_curvature = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=point_of_curvature
-        )
-
         point_of_tangency = (
             np.array(point_of_intersection)
             + np.array(unit_vector_from_PI_to_PT) * tangent_length
         )
 
-        point_of_tangency = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=point_of_tangency
-        )
-
         unit_vector_from_PC_to_CC = calculate_cross_product_of_two_vectors(
             vector1=axis_of_rotation,
             vector2=unit_vector_from_PC_to_PI,
@@ -674,18 +666,14 @@ def from_3pt_polyline(
             + np.array(unit_vector_from_PC_to_CC) * radius_of_curvature
         )
 
-        center_of_curvature = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=center_of_curvature
-        )
-
         return cls(
             point_of_intersection=point_of_intersection,
             central_angle=float(central_angle),
             radius_of_curvature=float(radius_of_curvature),
             direction_of_axis_of_rotation=axis_of_rotation,
-            point_of_curvature=point_of_curvature,
-            point_of_tangency=point_of_tangency,
-            center_of_curvature=center_of_curvature,
+            point_of_curvature=tuple(point_of_curvature.tolist()),
+            point_of_tangency=tuple(point_of_tangency.tolist()),
+            center_of_curvature=tuple(center_of_curvature.tolist()),
         )
 
     @classmethod
@@ -736,18 +724,14 @@ def from_PC_and_PT_and_PI(
             + np.array(unit_vector_from_PC_to_CC) * radius_of_curvature
         )
 
-        center_of_curvature = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=center_of_curvature
-        )
-
         return cls(
             point_of_intersection=point_of_intersection,
             central_angle=float(central_angle_of_curvature),
             radius_of_curvature=float(radius_of_curvature),
             direction_of_axis_of_rotation=axis_of_rotation,
             point_of_curvature=point_of_curvature,
             point_of_tangency=point_of_tangency,
-            center_of_curvature=center_of_curvature,
+            center_of_curvature=tuple(center_of_curvature.tolist()),
         )
 
     @classmethod
@@ -801,14 +785,10 @@ def from_PC_and_PT_and_CC(
             * np.array(unit_vector_from_from_CC_to_PI)
         )
 
-        point_of_intersection = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=point_of_intersection,
-        )
-
         return cls.from_PC_and_PT_and_PI(
             point_of_curvature=point_of_curvature,
             point_of_tangency=point_of_tangency,
-            point_of_intersection=point_of_intersection,
+            point_of_intersection=tuple(point_of_intersection.tolist()),
         )
 
     @classmethod
@@ -846,13 +826,9 @@ def from_PC_and_CC_and_angle(
             rotated_vector
         )
 
-        point_of_tangency = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=point_of_tangency
-        )
-
         return cls.from_PC_and_PT_and_CC(
             point_of_curvature=point_of_curvature,
-            point_of_tangency=point_of_tangency,
+            point_of_tangency=tuple(point_of_tangency.tolist()),
             point_on_center_of_curvature_side=point_of_center_of_curvature,
             radius_of_curvature=radius_of_curvature,
         )
@@ -900,11 +876,7 @@ def rotate_vector_about_axis(
         v * cos_angle + np.cross(k, v) * sin_angle + k * np.dot(k, v) * (1 - cos_angle)
     )
 
-    rotated_vector = convert_3pt_ndarray_to_tuple_of_floats(
-        numpy_3pt_array=rotated_vector
-    )
-
-    return rotated_vector
+    return tuple(rotated_vector.tolist())
 
 
 def calculate_endpoint_coordinates_of_shortest_line_connecting_two_lines(

tests/conftest.py

@@ -28,6 +28,9 @@
 OUTPUT_DIR_FOR_DISTRIBUTION_ELEMENT = OUTPUT_DIR / "distribution_element"
 OUTPUT_DIR_FOR_DISTRIBUTION_ELEMENT.mkdir(exist_ok=True)
 
+OUTPUT_DIR_FOR_SYSTEM = OUTPUT_DIR / "system"
+OUTPUT_DIR_FOR_SYSTEM.mkdir(exist_ok=True)
+
 
 @pytest.fixture
 def empty_ifc_file() -> ifcopenshell.file: