877 add minor modificaitons to handle complex files

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "test/resources"]
 	path = test/resources
 	url = https://github.com/BIM2SIM/bim2sim-test-resources.git
-    branch = main
+    branch = 19-update-test-resources-for-minor-mods-for-complex-files
 [submodule "butterfly"]
 	path = butterfly
 	url = https://github.com/BIM2SIM/butterfly.git

bim2sim/elements/base_elements.py

@@ -352,7 +352,8 @@ def filter_for_text_fragments(cls, ifc_element, ifc_units: dict,
         results = []
 
         # Check name matches
-        name_hits = [p.search(ifc_element.Name) for p in cls.pattern_ifc_type]
+        name_hits = [p.search(ifc_element.Name) for p in (
+                cls.pattern_ifc_type) if ifc_element.Name]
         name_hits = [hit for hit in name_hits if hit is not None]
         if name_hits:
             quality_logger.info(

bim2sim/elements/bps_elements.py

@@ -1031,6 +1031,19 @@ def _get_bound_shape(self, name):
         unify.Initialize(shape)
         unify.Build()
         shape = unify.Shape()
+        # apply removal of coincident and collinear points to all new faces
+        # to avoid errors lateron for mismatched vertex numbers
+        faces = PyOCCTools.get_faces_from_shape(shape)
+        if len(faces) > 1:
+            unify = ShapeUpgrade_UnifySameDomain()
+            unify.Initialize(shape)
+            unify.Build()
+            shape = unify.Shape()
+            faces = PyOCCTools.get_faces_from_shape(shape)
+        face = faces[0]
+        face = PyOCCTools.remove_coincident_and_collinear_points_from_face(
+            face)
+        shape = face
 
         if self.bound_element is not None:
             bi = self.bound_element
@@ -1740,6 +1753,11 @@ class InnerFloor(Slab):
         "IfcSlab": ['FLOOR']
     }
 
+    pattern_ifc_type = [
+        re.compile('Geschossdecke', flags=re.IGNORECASE),
+        re.compile('Ceiling', flags=re.IGNORECASE)
+    ]
+
     def calc_cost_group(self) -> int:
         """Calc cost group for Floors
 
@@ -1979,6 +1997,146 @@ def __init__(self, *args, **kwargs):
     )
 
 
+class Plate(BPSProductWithLayers):
+    ifc_types = {"IfcPlate": ['*', 'CURTAIN_PANEL', 'SHEET']}
+    def calc_cost_group(self) -> int:
+        """Calc cost group for Plates
+        External: 337
+        Internal: 346
+        """
+        if self.is_external:
+            return 337
+        elif not self.is_external:
+            return 346
+        else:
+            return 300
+    width = attribute.Attribute(
+        default_ps=("Qto_PlateBaseQuantities", "Width"),
+        functions=[BPSProductWithLayers.get_thickness_by_layers],
+        unit=ureg.m
+    )
+    net_volume = attribute.Attribute(
+        default_ps=("Qto_PlateBaseQuantities", "NetVolume"),
+        unit=ureg.m **3
+    )
+    gross_volume = attribute.Attribute(
+        default_ps=("Qto_PlateBaseQuantities", "GrossVolume"),
+        unit=ureg.m **3
+    )
+    net_area = attribute.Attribute(
+        default_ps=("Qto_PlateBaseQuantities", "NetArea"),
+        unit=ureg.m **3
+    )
+    gross_area = attribute.Attribute(
+        default_ps=("Qto_PlateBaseQuantities", "GrossArea"),
+        unit=ureg.m **3
+    )
+    net_weight = attribute.Attribute(
+        default_ps=("Qto_PlateBaseQuantities", "NetWeight"),
+        unit=ureg.m **3
+    )
+    gross_weight = attribute.Attribute(
+        default_ps=("Qto_PlateBaseQuantities", "GrossWeight"),
+        unit=ureg.m **3
+    )
+    is_load_bearing = attribute.Attribute(
+        default_ps=("Pset_PlateCommon", "LoadBearing"),
+    )
+    u_value = attribute.Attribute(
+        default_ps=("Pset_PlateCommon", "ThermalTransmittance"),
+        unit=ureg.W / ureg.K / ureg.meter ** 2,
+        functions=[BPSProductWithLayers.get_u_value],
+    )
+
+
+class Covering(BPSProductWithLayers):
+    # todo connect covering with element via CoversElements and CoversSpaces
+    ifc_types = {'IfcCovering': [
+        'CEILING',
+        'FLOORING',
+        'CLADDING',
+        'ROOFING',
+        'MODLING',
+        'SKIRTINGBOARD'
+    ]
+    }
+    def __init__(self, *args, **kwargs):
+        """Covering __init__ function"""
+        super().__init__(*args, **kwargs)
+    def calc_cost_group(self) -> int:
+        """Calc cost group for Coverings
+        """
+        if self.predefined_type == "CEILING":
+            return 354
+        elif self.predefined_type == "ROOFING":
+            return 364
+        elif self.predefined_type == "FLOORING":
+            return 353
+        elif self.predefined_type == "CLADDING" and self.is_external:
+            return 335
+        elif self.predefined_type == "ROOFING" and not self.is_external:
+            return 336
+        elif self.predefined_type == "MOLDING" and self.is_external:
+            return 339
+        elif self.predefined_type == "MOLDING" and not self.is_external:
+            return 349
+        elif self.predefined_type == "SKIRTINGBOARD" and not self.is_external:
+            return 349
+        elif self.is_external:
+            return 330
+        elif not self.is_external:
+            return 340
+        else:
+            return 300
+    width = attribute.Attribute(
+        default_ps=("Qto_CoveringBaseQuantities", "Width"),
+        unit=ureg.m
+     )
+    gross_area = attribute.Attribute(
+        default_ps=("Qto_CoveringBaseQuantities", "GrossArea"),
+        unit=ureg.meter ** 2
+    )
+    net_area = attribute.Attribute(
+        default_ps=("Qto_CoveringBaseQuantities", "NetArea"),
+        unit=ureg.meter ** 2
+    )
+
+
+class Insulation(Covering):
+    ifc_types = {'IfcCovering': ['INSULATION']}
+    pattern_ifc_type = [
+        re.compile('Dämmung', flags=re.IGNORECASE),
+        re.compile('Isolierung', flags=re.IGNORECASE),
+        re.compile('Isolation', flags=re.IGNORECASE),
+        re.compile('Insulation', flags=re.IGNORECASE),
+    ]
+    def __init__(self, *args, **kwargs):
+        """Insulation __init__ function"""
+        super().__init__(*args, **kwargs)
+    def calc_cost_group(self) -> int:
+        """Calc cost group for Insulations
+        External: 330
+        Internal: 340
+        """
+        if self.is_external:
+            return 330
+        elif not self.is_external:
+            return 340
+        else:
+            return 300
+
+class SpaceBoundaryRepresentation(BPSProduct):
+    """describes the geometric representation of space boundaries which are
+    created by the webtool to allow the """
+    ifc_types = {
+        "IFCBUILDINGELEMENTPROXY":
+            ['USERDEFINED']
+    }
+    pattern_ifc_type = [
+        re.compile('ProxyBound', flags=re.IGNORECASE)
+    ]
+
+
 # collect all domain classes
 items: Set[BPSProduct] = set()
 for name, cls in inspect.getmembers(

bim2sim/elements/mapping/ifc2python.py

@@ -406,6 +406,8 @@ def get_guid(ifcElement):
 def get_predefined_type(ifcElement) -> Union[str, None]:
     """Returns the predefined type of the IFC element"""
     try:
+        if not hasattr(ifcElement, 'PredefinedType'):
+            return None
         predefined_type = getattr(ifcElement, 'PredefinedType')
         # todo cache "USERDEFINED" and check where information is stored
         if predefined_type == "NOTDEFINED":

bim2sim/plugins/PluginComfort/bim2sim_comfort/task/plot_comfort_results.py

@@ -693,6 +693,14 @@ def rename_zone_usage(self, zone_dict, zone_dict_ifc_names, rename_keys,
                 storey_name = \
                     zone_dict_ifc_names[key]['StoreyName'].split(
                         '_')[0]
+            elif ' / ' in zone_dict_ifc_names[key]['StoreyName']:
+                storey_name = \
+                    zone_dict_ifc_names[key]['StoreyName'].split(
+                        ' / ')[0]
+            elif '/' in zone_dict_ifc_names[key]['StoreyName']:
+                storey_name = \
+                    zone_dict_ifc_names[key]['StoreyName'].split(
+                        '/')[0]
             else:
                 storey_name = zone_dict_ifc_names[key]['StoreyName']
                 if storey_name.upper() == 'Erdgeschoss'.upper():

bim2sim/plugins/PluginComfort/test/regression/test_comfort.py

@@ -189,6 +189,7 @@ def test_regression_AC20_FZK_Haus(self):
         project.sim_settings.add_shadings = True
         project.sim_settings.split_shadings = True
         project.sim_settings.run_full_simulation = True
+        project.sim_settings.serialize_elements = False
         # project.sim_settings.ep_install_path = 'C://EnergyPlusV9-4-0/'
         answers = ()
         handler = DebugDecisionHandler(answers)

bim2sim/plugins/PluginEnergyPlus/bim2sim_energyplus/sim_settings.py

@@ -92,9 +92,9 @@ class EnergyPlusSimSettings(BuildingSimSettings):
                               'SummerTypical days are available in weather '
                               'file.'},
         description='Choose whether to perform the system sizing for '
-                     'DesignDays, extreme weather periods, typical weather '
-                     'periods. value=Typical (i.e., apply system sizing for '
-                     'typical summer/winter days). '
+                    'DesignDays, extreme weather periods, typical weather '
+                    'periods. value=Typical (i.e., apply system sizing for '
+                    'typical summer/winter days). '
     )
     weather_file_for_sizing = PathSetting(
         value=None,
@@ -115,7 +115,8 @@ class EnergyPlusSimSettings(BuildingSimSettings):
         choices={
             'FullExterior': 'Full exterior solar distribution',
             'FullInteriorAndExterior': 'Full interior and exterior solar '
-                                       'distribution'
+                                       'distribution',
+            'FullInteriorAndExteriorWithReflections': 'Add reflections'
         },
         description='Choose solar distribution.',
         for_frontend=True
@@ -161,7 +162,7 @@ class EnergyPlusSimSettings(BuildingSimSettings):
     )
     output_keys = ChoiceSetting(
         value=['output_outdoor_conditions', 'output_zone_temperature',
-                 'output_zone', 'output_infiltration', 'output_meters'],
+               'output_zone', 'output_infiltration', 'output_meters'],
         choices={
             'output_outdoor_conditions': 'Add outputs for outdoor conditions.',
             'output_internal_gains': 'Add output for internal gains.',
@@ -196,11 +197,11 @@ class EnergyPlusSimSettings(BuildingSimSettings):
     )
     hvac_off_at_night = BooleanSetting(
         value=False, description='Disable all HVAC systems at night from '
-                                   '10pm to 6am.'
+                                 '10pm to 6am.'
     )
     control_operative_temperature = BooleanSetting(
         value=False, description='Use operative temperature instead of air '
-                                   'temperature for zonal temperature control.'
+                                 'temperature for zonal temperature control.'
     )
     ventilation_demand_control = ChoiceSetting(
         value=None,
@@ -217,8 +218,8 @@ class EnergyPlusSimSettings(BuildingSimSettings):
                                         'applied based on the differential '
                                         'dry bulb temperature.',
                  'DifferentialEnthalpy': 'The outdoor air economizer is '
-                                        'applied based on the differential '
-                                        'enthalpy.'},
+                                         'applied based on the differential '
+                                         'enthalpy.'},
         description='Choose which type of outdoor air economizer should be '
                     'applied to reduce cooling loads by an increased outdoor '
                     'air flow if cooling loads can be reduced. Default is '
@@ -256,8 +257,8 @@ class EnergyPlusSimSettings(BuildingSimSettings):
     )
     residential = BooleanSetting(
         value=False, description='Choose True to use residential settings '
-                                   'for natural ventilation (DIN4108-2), '
-                                   'False for non-residential houses.'
+                                 'for natural ventilation (DIN4108-2), '
+                                 'False for non-residential houses.'
     )
     natural_ventilation_approach = ChoiceSetting(
         value="Simple",
@@ -267,3 +268,46 @@ class EnergyPlusSimSettings(BuildingSimSettings):
             "DIN4108": "use DIN4108-2 for natural ventilation."
         }
     )
+    add_occupant_co2 = BooleanSetting(
+        value=False,
+        description='Choose if the CO2 generation by occupants should be '
+                    'considered.',
+    )
+    shading_calc_method = ChoiceSetting(
+        value="PolygonClipping",
+        choices={
+            "PixelCounting": "Use PixelCounting approach. If the "
+                             "computational resources are not "
+                             "sufficient for PixelCounting, EnergyPlus "
+                             "uses PolygonClipping instead.",
+            "PolygonClipping": "Use PolygonClipping. "}
+    )
+    window_shading_solar_transmittance = NumberSetting(
+        value=0.3, min_value=0, max_value=0.999,
+        description="Solar transmittance of window shading material")
+    window_shading_solar_reflectance = NumberSetting(
+        value=0.5, min_value=0, max_value=0.999,
+        description="Solar reflectance of window shading material")
+    window_shading_visible_transmittance = NumberSetting(
+        value=0.3, min_value=0, max_value=0.999,
+        description="Visible transmittance of window shading material")
+    window_shading_visible_reflectance = NumberSetting(
+        value=0.5, min_value=0, max_value=0.999,
+        description="Visible reflectance of window shading material")
+    window_shading_infr_hemisph_emissivity = NumberSetting(
+        value=0.9, min_value=0.00001, max_value=0.999,
+        description="Infrared Hemispherical Emissivity of window shading "
+                    "material")
+    window_shading_infr_transmittance = NumberSetting(
+        value=0.05, min_value=0, max_value=0.999,
+        description="Infrared transmittance of window shading material")
+    window_shading_thickness = NumberSetting(
+        value=0.003, min_value=0.00001, max_value=1000,
+        description="Thickness of window shading material")
+    window_shading_conductivity = NumberSetting(
+        value=0.1, min_value=0.00001, max_value=10000,
+        description="Conductivity of window shading material")
+    window_shading_airflow_permeability = NumberSetting(
+        value=0.0, min_value=0.0, max_value=0.8,
+        description="Airflow Permeability of window shading material")
+