Merge pull request #12 from idaholab/feature/add-nuclear-containment-structure

Feature/add nuclear containment structure

Author: Crowder44

.github/workflows/test.yml

@@ -30,7 +30,7 @@ jobs:
     
     - name: Make IfcConvert executable
       run: |
-        chmod +x src/bim2fem/bim2glb/ifc_convert/linux/IfcConvert
+        chmod +x src/bim2glb/ifc_convert/linux/IfcConvert
     
     - name: Run tests
       run: |

CONTRIBUTING.md

@@ -389,22 +389,21 @@ If you're using VS Code, you can use our recommended settings for better Python
 3. Add the following configuration:
 ```json
 {
+    "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
-    "python.analysis.extraPaths": [
-        "./src"
-    ],
     "python.testing.pytestArgs": [
-        "."
+        "tests",  // or wherever your tests are
+        "-v",
+        "--tb=short"
     ],
-    "python.testing.unittestEnabled": false
+    "python.testing.autoTestDiscoverOnSaveEnabled": true    
 }
 ```
 
 This configuration:
 
 - Enables pytest as the test framework
-- Adds the src/ directory to Python paths (fixes import warnings)
-- Configures pytest to discover tests from the project root
+- Automates pytest configuration in VS Code
 - Disables unittest to avoid conflicts
 
 Note: The .vscode/ folder is gitignored, so these settings won't be tracked. Each developer can customize them as needed.

README.md

@@ -13,9 +13,9 @@ Convert Building Information Models (BIM) to Finite Element Models (FEM) for str
     <td align="center"><strong>IFC4 StructuralAnalysisView</strong></td>
   </tr>
   <tr>
-    <td><img src="src/bim2fem/images/Revit_original.png" alt="Original Revit model" width="300"/></td>
-    <td><img src="src/bim2fem/images/Revit_IFC4_ReferenceView.png" alt="IFC4 ReferenceView" width="300"/></td>
-    <td><img src="src/bim2fem/images/Revit_IFC4_StructuralAnalysisView.png" alt="IFC4 StructuralAnalysisView" width="300"/></td>
+    <td><img src="images/Revit_original.png" alt="Original Revit model" width="300"/></td>
+    <td><img src="images/Revit_IFC4_ReferenceView.png" alt="IFC4 ReferenceView" width="300"/></td>
+    <td><img src="images/Revit_IFC4_StructuralAnalysisView.png" alt="IFC4 StructuralAnalysisView" width="300"/></td>
   </tr>
 </table>
 

run_bim2fem.py renamed to run_web_app.py

@@ -1 +1,15 @@
 # Copyright 2025, Battelle Energy Alliance, LLC All Rights Reserved
+
+"""Welcome to BIM2FEM. Package for converting IFC4 files from the architectural
+domain to the structural analysis domain."""
+
+
+import sys
+import os
+from datetime import datetime
+
+sys.path.insert(0, os.path.dirname(__file__))
+
+
+def current_time():
+    return datetime.now().strftime("%H:%M:%S")

src/bim2fem/__init__.py

@@ -6,14 +6,14 @@
 
 import ifcopenshell
 
-from bim2fem.core.helpers.snap_frame_members import snap_frame_members
-from bim2fem.core.helpers.snap_floor_beam_systems import snap_floor_beam_systems
-from bim2fem.core.helpers.snap_beams_to_walls import snap_beams_to_walls
-from bim2fem.core.helpers.snap_walls_to_slabs import snap_walls_to_slabs
-from bim2fem.core.helpers.snap_walls_to_walls import (
+from bim2fem.helpers.snap_frame_members import snap_frame_members
+from bim2fem.helpers.snap_floor_beam_systems import snap_floor_beam_systems
+from bim2fem.helpers.snap_beams_to_walls import snap_beams_to_walls
+from bim2fem.helpers.snap_walls_to_slabs import snap_walls_to_slabs
+from bim2fem.helpers.snap_walls_to_walls import (
     snap_walls_to_perpendicular_walls,
 )
-import bim2fem.ifcplus.api.structural
+import ifcplus.api.structural
 
 
 def adjust_element_connectivity_of_ifc4_sav_file(
@@ -29,39 +29,39 @@ def adjust_element_connectivity_of_ifc4_sav_file(
         ifc4_sav_file = snap_frame_members(
             ifc4_sav_file=ifc4_sav_file,
         )
-        bim2fem.ifcplus.api.structural.merge_all_coincident_structural_point_connections(
+        ifcplus.api.structural.merge_all_coincident_structural_point_connections(
             ifc4sav_file=ifc4_sav_file
         )
 
     if execute_snap_floor_beam_systems:
         ifc4_sav_file = snap_floor_beam_systems(
             ifc4_sav_file=ifc4_sav_file,
         )
-        bim2fem.ifcplus.api.structural.merge_all_coincident_structural_point_connections(
+        ifcplus.api.structural.merge_all_coincident_structural_point_connections(
             ifc4sav_file=ifc4_sav_file
         )
 
     if execute_snap_walls_to_slabs:
         ifc4_sav_file = snap_walls_to_slabs(
             ifc4_sav_file=ifc4_sav_file,
         )
-        bim2fem.ifcplus.api.structural.merge_all_coincident_structural_point_connections(
+        ifcplus.api.structural.merge_all_coincident_structural_point_connections(
             ifc4sav_file=ifc4_sav_file
         )
 
     if execute_snap_walls_to_walls:
         ifc4_sav_file = snap_walls_to_perpendicular_walls(
             ifc4_sav_file=ifc4_sav_file,
         )
-        bim2fem.ifcplus.api.structural.merge_all_coincident_structural_point_connections(
+        ifcplus.api.structural.merge_all_coincident_structural_point_connections(
             ifc4sav_file=ifc4_sav_file
         )
 
     if execute_snap_beams_to_walls:
         ifc4_sav_file = snap_beams_to_walls(
             ifc4_sav_file=ifc4_sav_file,
         )
-        bim2fem.ifcplus.api.structural.merge_all_coincident_structural_point_connections(
+        ifcplus.api.structural.merge_all_coincident_structural_point_connections(
             ifc4sav_file=ifc4_sav_file
         )
 

src/bim2fem/core/adjust_element_connectivity_of_building_fem.py renamed to src/bim2fem/adjust_element_connectivity_of_building_fem.py

@@ -5,7 +5,7 @@
 
 
 import ifcopenshell
-import inlbim.api.file
+import ifcplus.api.project
 import ifcopenshell.util.selector
 from bim2fem.helpers.convert_linear_building_element import (
     convert_linear_beam_to_structural_curve_member,
@@ -16,12 +16,12 @@
     convert_planar_slab_to_structural_surface_members,
     convert_planar_wall_to_structural_surface_members,
 )
-from inlbim import REGION
+from ifcplus import REGION
 import ifcopenshell.util.element
-import inlbim.api.structural
+import ifcplus.api.structural
 import ifcopenshell.api.root
 import ifcopenshell.api.aggregate
-import inlbim.api.geometry
+import ifcplus.api.placement
 
 
 def convert_building_from_reference_view_to_structural_analysis_view(
@@ -35,7 +35,7 @@ def convert_building_from_reference_view_to_structural_analysis_view(
     element_selection_query = "IfcColumn, IfcSlab, IfcWall, IfcBeam, IfcMember"
 
     # Create empty IFC4 StructuralAnalysisView File
-    ifc4_destination_file = inlbim.api.file.create_ifc4_file(
+    ifc4_destination_file = ifcplus.api.project.create_ifc4_file(
         model_view_definition="StructuralAnalysisView",
         precision=1e-4,
     )
@@ -56,7 +56,7 @@ def convert_building_from_reference_view_to_structural_analysis_view(
         products=[site],
         relating_object=project,
     )
-    inlbim.api.geometry.edit_object_placement(
+    ifcplus.api.placement.edit_object_placement(
         product=site,
         place_object_relative_to_parent=True,
     )
@@ -134,7 +134,7 @@ def convert_building_from_reference_view_to_structural_analysis_view(
     print(f"IfcWalls: {len(walls_from_source_file)}")
 
     # Add StructuralAnalysisModel
-    structural_analysis_model = inlbim.api.structural.add_structural_analysis_model(
+    structural_analysis_model = ifcplus.api.structural.add_structural_analysis_model(
         ifc4_file=ifc4_destination_file,
         name=None,
     )
@@ -247,7 +247,7 @@ def convert_building_from_reference_view_to_structural_analysis_view(
         print(f"\t{key.GlobalId} {key.is_a()}: {result}")
 
     # Merge Nodes
-    inlbim.api.structural.merge_all_coincident_structural_point_connections(
+    ifcplus.api.structural.merge_all_coincident_structural_point_connections(
         ifc4sav_file=ifc4_destination_file
     )
 

src/bim2fem/core/convert_building_to_fem.py renamed to src/bim2fem/convert_building_to_fem.py

@@ -5,21 +5,21 @@
 
 
 import ifcopenshell
-import bim2fem.ifcplus.api.placement
-import bim2fem.ifcplus.api.project
+import ifcplus.api.placement
+import ifcplus.api.project
 import ifcopenshell.util.selector
-from bim2fem.core.helpers.convert_linear_building_element import (
+from bim2fem.helpers.convert_linear_building_element import (
     convert_linear_building_element_to_structural_curve_member,
 )
-from bim2fem.core.helpers.convert_planar_building_element import (
+from bim2fem.helpers.convert_planar_building_element import (
     convert_planar_building_element_to_structural_surface_members,
 )
-from bim2fem.ifcplus import REGION
+from ifcplus import REGION
 import ifcopenshell.util.element
-import bim2fem.ifcplus.api.structural
+import ifcplus.api.structural
 import ifcopenshell.api.root
 import ifcopenshell.api.aggregate
-import bim2fem.ifcplus.api.geometry
+import ifcplus.api.geometry
 
 
 def convert_ifc_to_fem(
@@ -31,7 +31,7 @@ def convert_ifc_to_fem(
     """Convert IFC to FEM"""
 
     # Create empty IFC4 StructuralAnalysisView File
-    ifc4_destination_file = bim2fem.ifcplus.api.project.create_ifc4_file(
+    ifc4_destination_file = ifcplus.api.project.create_ifc4_file(
         model_view_definition="StructuralAnalysisView",
         precision=1e-4,
     )
@@ -52,7 +52,7 @@ def convert_ifc_to_fem(
         products=[site],
         relating_object=project,
     )
-    bim2fem.ifcplus.api.placement.edit_object_placement(
+    ifcplus.api.placement.edit_object_placement(
         product=site,
         place_object_relative_to_parent=True,
     )
@@ -134,7 +134,7 @@ def convert_ifc_to_fem(
 
     # Add StructuralAnalysisModel
     structural_analysis_model = (
-        bim2fem.ifcplus.api.structural.add_structural_analysis_model(
+        ifcplus.api.structural.add_structural_analysis_model(
             ifc4_file=ifc4_destination_file,
             name=None,
         )
@@ -251,7 +251,7 @@ def convert_ifc_to_fem(
         print(f"\t{key.GlobalId} {key.is_a()}: {result}")
 
     # Merge Nodes
-    bim2fem.ifcplus.api.structural.merge_all_coincident_structural_point_connections(
+    ifcplus.api.structural.merge_all_coincident_structural_point_connections(
         ifc4sav_file=ifc4_destination_file
     )
 

src/bim2fem/core/convert_ifc_to_fem.py renamed to src/bim2fem/convert_ifc_to_fem.py

@@ -5,20 +5,20 @@
 
 
 import ifcopenshell
-import inlbim.api.file
+import ifcplus.api.project
 import ifcopenshell.util.selector
 from bim2fem.helpers.convert_pipe_segment import (
     convert_linear_pipe_segment_to_structural_curve_member,
 )
 from bim2fem.helpers.convert_pipe_fitting import (
     convert_pipe_fitting_to_structural_items,
 )
-from inlbim import REGION
+from ifcplus import REGION
 import ifcopenshell.util.element
-import inlbim.api.structural
+import ifcplus.api.structural
 import ifcopenshell.api.root
 import ifcopenshell.api.aggregate
-import inlbim.api.geometry
+import ifcplus.api.placement
 
 
 def convert_piping_from_reference_view_to_structural_analysis_view(
@@ -32,7 +32,7 @@ def convert_piping_from_reference_view_to_structural_analysis_view(
     element_selection_query = "IfcPipeSegment, IfcPipeFitting"
 
     # Create empty IFC4 StructuralAnalysisView File
-    ifc4_destination_file = inlbim.api.file.create_ifc4_file(
+    ifc4_destination_file = ifcplus.api.project.create_ifc4_file(
         model_view_definition="StructuralAnalysisView",
         precision=1e-4,
     )
@@ -53,7 +53,7 @@ def convert_piping_from_reference_view_to_structural_analysis_view(
         products=[site],
         relating_object=project,
     )
-    inlbim.api.geometry.edit_object_placement(
+    ifcplus.api.placement.edit_object_placement(
         product=site,
         place_object_relative_to_parent=True,
     )
@@ -108,7 +108,7 @@ def convert_piping_from_reference_view_to_structural_analysis_view(
     print(f"IfcPipeFittings: {len(pipe_fittings_from_source_file)}")
 
     # Add StructuralAnalysisModel
-    structural_analysis_model = inlbim.api.structural.add_structural_analysis_model(
+    structural_analysis_model = ifcplus.api.structural.add_structural_analysis_model(
         ifc4_file=ifc4_destination_file,
         name=None,
     )
@@ -194,7 +194,7 @@ def convert_piping_from_reference_view_to_structural_analysis_view(
         print(f"\t{key.GlobalId} {key.is_a()}: {result}")
 
     # Merge Nodes
-    inlbim.api.structural.merge_all_coincident_structural_point_connections(
+    ifcplus.api.structural.merge_all_coincident_structural_point_connections(
         ifc4sav_file=ifc4_destination_file
     )