ifctrano 0.8.0__tar.gz → 0.10.0__tar.gz

{ifctrano-0.8.0 → ifctrano-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ifctrano
-Version: 0.8.0
+Version: 0.10.0
 Summary: Package for generating building energy simulation model from IFC
 License: GPL V3
 License-File: LICENSE
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: ifcopenshell (>=0.8.1.post1,<0.9.0)
 Requires-Dist: open3d (>=0.19.0,<0.20.0)
 Requires-Dist: shapely (>=2.0.7,<3.0.0)
-Requires-Dist: trano (>=0.10.0,<0.11.0)
+Requires-Dist: trano (>=0.12.0,<0.13.0)
 Requires-Dist: typer (>=0.12.5,<0.13.0)
 Requires-Dist: vedo (>=2025.5.3,<2026.0.0)
 Project-URL: Repository, https://github.com/andoludo/ifctrano

{ifctrano-0.8.0 → ifctrano-0.10.0}/ifctrano/building.py

@@ -8,6 +8,7 @@ import yaml
 from ifcopenshell import file, entity_instance
 from pydantic import validate_call, Field, model_validator, field_validator
 from trano.elements import InternalElement  # type: ignore
+from trano.elements.envelope import SpaceTilt  # type: ignore
 from trano.elements.library.library import Library  # type: ignore
 from trano.elements.types import Tilt  # type: ignore
 from trano.topology import Network  # type: ignore
@@ -234,10 +235,21 @@ class Building(BaseShow):
             )
             for space_boundary in self.space_boundaries
         ]
+        spaces = [sp for sp in spaces if sp is not None]
         internal_walls = []
+
         for internal_element in self.internal_elements.elements:
             space_1 = internal_element.spaces[0]
             space_2 = internal_element.spaces[1]
+            if any(
+                name not in [sp["id"] for sp in spaces]  # type: ignore
+                for name in [
+                    space_1.space_unique_name(),
+                    space_2.space_unique_name(),
+                ]
+            ):
+                continue
+
             construction = self.constructions.get_construction(
                 internal_element.element, default_internal_construction
             )
@@ -253,7 +265,8 @@ class Building(BaseShow):
                     else Tilt.ceiling.value
                 )
                 if space_1_tilt == space_2_tilt:
-                    raise ValueError("Space tilts are not compatible.")
+                    logger.error("Space tilts are not compatible.")
+                    continue
                 internal_walls.append(
                     {
                         "space_1": space_1.space_unique_name(),
@@ -306,6 +319,30 @@ class Building(BaseShow):
         for internal_element in self.internal_elements.elements:
             space_1 = internal_element.spaces[0]
             space_2 = internal_element.spaces[1]
+            if any(
+                global_id not in spaces
+                for global_id in [space_1.entity.GlobalId, space_2.entity.GlobalId]
+            ):
+                continue
+            space_tilts = []
+            if internal_element.element.is_a() in ["IfcSlab"]:
+                space_1_tilt = (
+                    Tilt.floor
+                    if space_1.bounding_box.centroid.z > space_2.bounding_box.centroid.z
+                    else Tilt.ceiling
+                )
+                space_2_tilt = (
+                    Tilt.floor
+                    if space_2.bounding_box.centroid.z > space_1.bounding_box.centroid.z
+                    else Tilt.ceiling
+                )
+                if space_1_tilt == space_2_tilt:
+                    logger.error("Space tilts are not compatible.")
+                    continue
+                space_tilts = [
+                    SpaceTilt(space_name=space_1.name, tilt=space_1_tilt),
+                    SpaceTilt(space_name=space_2.name, tilt=space_2_tilt),
+                ]
             network.connect_spaces(
                 spaces[space_1.global_id],
                 spaces[space_2.global_id],
@@ -314,6 +351,7 @@ class Building(BaseShow):
                     construction=default_construction,
                     surface=internal_element.area,
                     tilt=Tilt.wall,
+                    space_tilts=space_tilts,
                 ),
             )
         return network

{ifctrano-0.8.0 → ifctrano-0.10.0}/ifctrano/construction.py

@@ -235,7 +235,12 @@ class Constructions(BaseModel):
             return None
 
     def to_config(self) -> Dict[str, Any]:
-        constructions_all = [*self.constructions, default_construction, glass]
+        constructions_all = [
+            *self.constructions,
+            default_construction,
+            glass,
+            default_internal_construction,
+        ]
         constructions = [
             {
                 "id": construction.name,
@@ -304,8 +309,7 @@ class Constructions(BaseModel):
 
 def _convert_glass(glass_: Material) -> Dict[str, Any]:
     return {
-        key: (
-            value if not isinstance(value, list) else f"{{{','.join(map(str, value))}}}"
-        )
+        key: (value if not isinstance(value, list) else value)
         for key, value in glass_.model_dump().items()
+        if key not in ["name"]
     }

{ifctrano-0.8.0 → ifctrano-0.10.0}/ifctrano/space_boundary.py

@@ -25,8 +25,7 @@ from ifctrano.base import (
     BaseShow,
 )
 from ifctrano.bounding_box import OrientedBoundingBox
-from ifctrano.construction import glass, Constructions
-from ifctrano.exceptions import HasWindowsWithoutWallsError
+from ifctrano.construction import glass, Constructions, default_construction
 from ifctrano.utils import (
     remove_non_alphanumeric,
     _round,
@@ -121,11 +120,57 @@ class ExternalSpaceBoundaryGroup(BaseModelConfig):
             for construction in self.constructions
         )
 
+    def _merge(
+        self,
+        constructions: List[Window | ExternalWall],
+        construction_type: type[Window | ExternalWall],
+    ) -> List[Window | ExternalWall]:
+        construction_types = [
+            c for c in self.constructions if isinstance(c, construction_type)
+        ]
+        reference = next(iter(construction_types), None)
+        if not reference:
+            return []
+        surface = sum([construction.surface for construction in construction_types])
+        azimuth = reference.azimuth
+        tilt = reference.tilt
+        return [
+            construction_type(
+                surface=surface,
+                azimuth=azimuth,
+                tilt=tilt,
+                construction=reference.construction,
+            )
+        ]
+
+    def merge(self) -> None:
+        self.constructions = [
+            *self._merge(self.constructions, Window),
+            *self._merge(self.constructions, ExternalWall),
+        ]
+
+    def add_external_wall(self) -> None:
+        reference = next(iter(self.constructions))
+        surface = sum([construction.surface for construction in self.constructions]) * (
+            0.7 / 0.3
+        )
+        azimuth = reference.azimuth
+        tilt = reference.tilt
+        self.constructions.append(
+            ExternalWall(
+                surface=surface,
+                azimuth=azimuth,
+                tilt=tilt,
+                construction=default_construction,
+            )
+        )
+
 
 class ExternalSpaceBoundaryGroups(BaseModelConfig):
     space_boundary_groups: List[ExternalSpaceBoundaryGroup] = Field(
         default_factory=list
     )
+    remaining_constructions: List[BaseWall]
 
     @classmethod
     def from_external_boundaries(
@@ -136,6 +181,11 @@ class ExternalSpaceBoundaryGroups(BaseModelConfig):
             for ex in external_boundaries
             if isinstance(ex, (ExternalWall, Window)) and ex.tilt == Tilt.wall
         ]
+        remaining_constructions = [
+            ex
+            for ex in external_boundaries
+            if not (isinstance(ex, (ExternalWall, Window)) and ex.tilt == Tilt.wall)
+        ]
         space_boundary_groups = list(
             {
                 ExternalSpaceBoundaryGroup(
@@ -150,7 +200,12 @@ class ExternalSpaceBoundaryGroups(BaseModelConfig):
                 for ex in boundary_walls
             }
         )
-        return cls(space_boundary_groups=space_boundary_groups)
+        groups = cls(
+            space_boundary_groups=space_boundary_groups,
+            remaining_constructions=remaining_constructions,
+        )
+        groups.merge()
+        return groups
 
     def has_windows_without_wall(self) -> bool:
         return all(
@@ -158,9 +213,23 @@ class ExternalSpaceBoundaryGroups(BaseModelConfig):
             for group in self.space_boundary_groups
         )
 
+    def add_external_walls(self) -> None:
+        for group in self.space_boundary_groups:
+            group.add_external_wall()
+
+    def get_constructions(self) -> List[ExternalWall | Window]:
+        return [
+            *[c for group in self.space_boundary_groups for c in group.constructions],
+            *self.remaining_constructions,
+        ]
+
+    def merge(self) -> None:
+        for g in self.space_boundary_groups:
+            g.merge()
+
 
 def deg_to_rad(deg: float) -> float:
-    return deg * math.pi / 180.0
+    return round(deg * math.pi / 180.0, 2)
 
 
 class Azimuths(BaseModel):
@@ -299,7 +368,7 @@ class SpaceBoundaries(BaseShow):
         exclude_entities: List[str],
         north_axis: Vector,
         constructions: Constructions,
-    ) -> Dict[str, Any]:
+    ) -> Optional[Dict[str, Any]]:
         external_boundaries: Dict[str, Any] = {
             "external_walls": [],
             "floor_on_grounds": [],
@@ -312,38 +381,45 @@ class SpaceBoundaries(BaseShow):
             )
             if boundary_model:
                 external_boundaries_check.append(boundary_model)
-                element = {
-                    "surface": boundary_model.surface,
-                    "azimuth": deg_to_rad(boundary_model.azimuth),
-                    "tilt": boundary_model.tilt.value,
-                    "construction": boundary_model.construction.name,
-                }
-                if isinstance(
-                    boundary_model, (ExternalWall, ExternalDoor)
-                ) and boundary_model.tilt in [Tilt.wall, Tilt.ceiling]:
-                    external_boundaries["external_walls"].append(element)
-                elif isinstance(boundary_model, (Window)):
-                    external_boundaries["windows"].append(element)
-                elif isinstance(
-                    boundary_model, (ExternalWall)
-                ) and boundary_model.tilt in [Tilt.floor]:
-                    external_boundaries["floor_on_grounds"].append(element)
-                else:
-                    raise ValueError("Unknown boundary type")
+        if not external_boundaries_check:
+            return None
         external_space_boundaries_group = (
             ExternalSpaceBoundaryGroups.from_external_boundaries(
                 external_boundaries_check
             )
         )
         if not external_space_boundaries_group.has_windows_without_wall():
+            external_space_boundaries_group.add_external_walls()
             logger.error(
                 f"Space {self.space.global_id} has a boundary that has a windows but without walls."
             )
+        for boundary_model in external_space_boundaries_group.get_constructions():
+            element = {
+                "surface": boundary_model.surface,
+                "azimuth": deg_to_rad(boundary_model.azimuth),
+                "tilt": boundary_model.tilt.value,
+                "construction": boundary_model.construction.name,
+            }
+            if isinstance(
+                boundary_model, (ExternalWall, ExternalDoor)
+            ) and boundary_model.tilt in [Tilt.wall, Tilt.ceiling]:
+                external_boundaries["external_walls"].append(element)
+            elif isinstance(boundary_model, (Window)):
+                external_boundaries["windows"].append(element)
+            elif isinstance(boundary_model, (ExternalWall)) and boundary_model.tilt in [
+                Tilt.floor
+            ]:
+                element.pop("azimuth")
+                element.pop("tilt")
+                external_boundaries["floor_on_grounds"].append(element)
+            else:
+                raise ValueError("Unknown boundary type")
+
         occupancy_parameters = Occupancy().parameters.model_dump(mode="json")
         space_parameters = SpaceParameter(
             floor_area=self.space.floor_area,
             average_room_height=self.space.average_room_height,
-        ).model_dump(mode="json")
+        ).model_dump(mode="json", exclude={"linearize_emissive_power", "volume"})
         return {
             "id": self.space.space_unique_name(),
             "occupancy": {"parameters": occupancy_parameters},
@@ -364,12 +440,15 @@ class SpaceBoundaries(BaseShow):
             )
             if boundary_model:
                 external_boundaries.append(boundary_model)
+        if not external_boundaries:
+            return None
 
         external_space_boundaries_group = (
             ExternalSpaceBoundaryGroups.from_external_boundaries(external_boundaries)
         )
         if not external_space_boundaries_group.has_windows_without_wall():
-            raise HasWindowsWithoutWallsError(
+            external_space_boundaries_group.add_external_walls()
+            logger.error(
                 f"Space {self.space.global_id} has a boundary that has a windows but without walls."
             )
         return TranoSpace(

{ifctrano-0.8.0 → ifctrano-0.10.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ifctrano"
-version = "0.8.0"
+version = "0.10.0"
 description = "Package for generating building energy simulation model from IFC"
 authors = ["Ando Andriamamonjy <andoludovic.andriamamonjy@gmail.com>"]
 license = "GPL V3"
@@ -11,7 +11,7 @@ keywords = ["BIM","IFC","energy simulation", "modelica", "building energy simula
 [tool.poetry.dependencies]
 python = ">=3.10,<3.13"
 ifcopenshell = "^0.8.1.post1"
-trano = "^0.10.0"
+trano = "^0.12.0"
 shapely = "^2.0.7"
 typer = "^0.12.5"
 vedo = "^2025.5.3"