update new ifcopenshell 0.7.10

bim2sim/elements/base_elements.py

@@ -21,8 +21,10 @@
 
 logger = logging.getLogger(__name__)
 quality_logger = logging.getLogger('bim2sim.QualityReport')
-settings_products = ifcopenshell.geom.main.settings()
+settings_products = ifcopenshell.geom.settings()
 settings_products.set(settings_products.USE_PYTHON_OPENCASCADE, True)
+settings_products.set(settings_products.USE_WORLD_COORDS, True)
+settings_products.set(settings_products.PRECISION, 1e-6)
 
 
 class ElementError(Exception):

bim2sim/elements/bps_elements.py

@@ -233,11 +233,15 @@ def _get_space_neighbors(self, name) -> list:
 
     def _get_space_shape(self, name):
         """returns topods shape of the IfcSpace"""
-        settings = ifcopenshell.geom.main.settings()
+        settings = ifcopenshell.geom.settings()
         settings.set(settings.USE_PYTHON_OPENCASCADE, True)
         settings.set(settings.USE_WORLD_COORDS, True)
-        settings.set(settings.EXCLUDE_SOLIDS_AND_SURFACES, False)
-        settings.set(settings.INCLUDE_CURVES, True)
+        settings.set(settings.PRECISION, 1e-6)
+        settings.set(
+            "dimensionality",
+            ifcopenshell.ifcopenshell_wrapper.CURVES_SURFACES_AND_SOLIDS)  # 2
+        # settings.set(settings.EXCLUDE_SOLIDS_AND_SURFACES, False)
+        # settings.set(settings.INCLUDE_CURVES, True)
         return ifcopenshell.geom.create_shape(settings, self.ifc).geometry
 
     def _get_space_center(self, name) -> float:
@@ -910,8 +914,12 @@ def _get_bound_shape(self, name):
         settings = ifcopenshell.geom.settings()
         settings.set(settings.USE_PYTHON_OPENCASCADE, True)
         settings.set(settings.USE_WORLD_COORDS, True)
-        settings.set(settings.EXCLUDE_SOLIDS_AND_SURFACES, False)
-        settings.set(settings.INCLUDE_CURVES, True)
+        settings.set(settings.PRECISION, 1e-6)
+        settings.set(
+            "dimensionality",
+            ifcopenshell.ifcopenshell_wrapper.CURVES_SURFACES_AND_SOLIDS)  # 2
+        # settings.set(settings.EXCLUDE_SOLIDS_AND_SURFACES, False)
+        # settings.set(settings.INCLUDE_CURVES, True)
 
         # check if the space boundary shapes need a unit conversion (i.e.,
         # an additional transformation to the correct size and position)
@@ -921,8 +929,9 @@ def _get_bound_shape(self, name):
         try:
             sore = self.ifc.ConnectionGeometry.SurfaceOnRelatingElement
             # if sore.get_info()["InnerBoundaries"] is None:
+            if sore.InnerBoundaries is None:
+                sore.InnerBoundaries = ()
             shape = ifcopenshell.geom.create_shape(settings, sore)
-
             if sore.InnerBoundaries:
                 # shape = remove_inner_loops(shape)  # todo: return None if not horizontal shape
                 # if not shape:
@@ -935,6 +944,31 @@ def _get_bound_shape(self, name):
                     temp_sore.InnerBoundaries = ()
                     shape = ifcopenshell.geom.create_shape(settings, temp_sore)
                 else:
+                    # hotfix: ifcopenshell 0.8.4 does not sufficiently produce
+                    # faces with inner holes (as opposed to ifcopenshell
+                    # 0.7.0). This workaround "manually" performs a boolean
+                    # operation to generate a TopoDS_Shape with inner holes
+                    # before removing the inner loops with the dedicated
+                    # inner_loop_remover function
+                    ### START OF HOTFIX #####
+                    inners = []
+                    for inn in sore.InnerBoundaries:
+                        ifc_new = ifcopenshell.file()
+                        temp_sore = ifc_new.create_entity(
+                            'IfcCurveBoundedPlane',
+                            OuterBoundary=inn,
+                            BasisSurface=sore.BasisSurface)
+                        temp_sore.InnerBoundaries = ()
+                        compound = ifcopenshell.geom.create_shape(settings,
+                                                                  temp_sore)
+                        faces = PyOCCTools.get_face_from_shape(compound)
+                        inners.append(faces)
+                    sore.InnerBoundaries = ()
+                    outer_shape_data = ifcopenshell.geom.create_shape(settings,
+                                                                      sore)
+                    shape = PyOCCTools.triangulate_bound_shape(
+                        outer_shape_data, inners)
+                    #### END OF HOTFIX ####
                     shape = remove_inner_loops(shape)
             if not (sore.InnerBoundaries and not self.bound_element.ifc.is_a(
                     'IfcWall')):

bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/examples/e1_simple_project_energyplus.py

@@ -38,7 +38,7 @@ def run_example_1():
             'test/resources/weather_files/DEU_NW_Aachen.105010_TMYx.epw')
     # Set the install path to your EnergyPlus installation according to your
     # system requirements
-    # project.sim_settings.ep_install_path = 'C://EnergyPlusV9-4-0/'
+    project.sim_settings.ep_install_path = 'C://EnergyPlusV9-4-0/'
 
     # run annual simulation for EnergyPlus
     project.sim_settings.run_full_simulation = True

bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/examples/e2_complex_project_energyplus.py

@@ -34,7 +34,7 @@ def run_example_complex_building_energyplus():
 
     # Set the install path to your EnergyPlus installation according to your
     # system requirements
-    # project.sim_settings.ep_install_path = 'C://EnergyPlusV9-4-0/'
+    project.sim_settings.ep_install_path = Path('C://EnergyPlusV9-4-0/')
 
     # combine spaces to thermal zones based on their usage
     # use cooling

bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/sim_settings.py

@@ -56,7 +56,9 @@ class EnergyPlusSimSettings(BuildingSimSettings):
         for_frontend=True,
         any_string=True
     )
-    ep_install_path = PathSetting(
+    # ep_install_path is instantiated without validation using BaseModel.model_construct
+    # to enable linux path as default value for CI pipeline
+    ep_install_path = PathSetting.model_construct(
         value=Path('/usr/local/EnergyPlus-9-4-0/'),
         description='Choose EnergyPlus Installation Path',
         for_frontend=False,

bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/task/ep_create_idf.py

@@ -200,7 +200,7 @@ def init_idf(sim_settings: EnergyPlusSimSettings, paths: FolderStructure,
         """
         logger.info("Initialize the idf ...")
         # set the installation path for the EnergyPlus installation
-        ep_install_path = sim_settings.ep_install_path
+        ep_install_path = Path(sim_settings.ep_install_path)
         # set the plugin path of the PluginEnergyPlus within the BIM2SIM Tool
         plugin_ep_path = str(Path(__file__).parent.parent.parent)
         # set Energy+.idd as base for new idf

bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/utils/utils_visualization.py

@@ -224,8 +224,12 @@ def visualize_zones(zone_dict, export_path, paths):
         settings = ifcopenshell.geom.settings()
         settings.set(settings.USE_PYTHON_OPENCASCADE, True)
         settings.set(settings.USE_WORLD_COORDS, True)
-        settings.set(settings.EXCLUDE_SOLIDS_AND_SURFACES, False)
-        settings.set(settings.INCLUDE_CURVES, True)
+        settings.set(settings.PRECISION, 1e-6)
+        settings.set(
+            "dimensionality",
+            ifcopenshell.ifcopenshell_wrapper.CURVES_SURFACES_AND_SOLIDS)  # 2
+        # settings.set(settings.EXCLUDE_SOLIDS_AND_SURFACES, False)
+        # settings.set(settings.INCLUDE_CURVES, True)
 
         display, start_display, add_menu, add_function_to_menu = init_display(
             display_triedron=False, background_gradient_color1=3 * [255],