morphopt 4.0.3__tar.gz → 4.0.4__tar.gz

{morphopt-4.0.3 → morphopt-4.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: morphopt
-Version: 4.0.3
+Version: 4.0.4
 Summary: A morphing optimization framework using PyTorch and torchfea.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -13,6 +13,7 @@ Requires-Dist: pyvista>=0.47.1
 Requires-Dist: pyvistaqt>=0.11.3
 Requires-Dist: vtk>=9.6.1
 Requires-Dist: gmsh>=4.15.0
+Requires-Dist: cadquery-ocp>=8.0.1.1.0
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: imageio>=2.37.3
 Requires-Dist: bspmap>=1.0.3

{morphopt-4.0.3 → morphopt-4.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "morphopt"
-version = "4.0.3"
+version = "4.0.4"
 description = "A morphing optimization framework using PyTorch and torchfea."
 readme = "README.md"
 requires-python = ">=3.12"
@@ -14,6 +14,7 @@ dependencies = [
     "pyvistaqt>=0.11.3",
     "vtk>=9.6.1",
     "gmsh>=4.15.0",
+    "cadquery-ocp>=8.0.1.1.0",
     "tabulate>=0.9.0",
     "imageio>=2.37.3",
     "bspmap>=1.0.3",

{morphopt-4.0.3 → morphopt-4.0.4}/src/morphopt/optcore/modelparams/baseparam.py

@@ -67,13 +67,17 @@ class BaseParams(
     def define_interface(self) -> None:
         """Declare the interfaces owned by this parameter collection."""
 
-    def initialize(self, *args, **kwargs) -> None:
-        """Initialize every registered interface."""
+    def initialize_interfaces(self, *args: object, **kwargs: object) -> None:
+        """Declare and initialize interfaces independently of analysis tasks."""
         if not self.interfaces:
             self.define_interface()
         for interface in self.interfaces.values():
             interface.initialize(*args, **kwargs)
 
+    def initialize(self, *args: object, **kwargs: object) -> None:
+        """Initialize every registered interface."""
+        self.initialize_interfaces(*args, **kwargs)
+
     def reinitialize(self, iteration: int, *args, **kwargs) -> None:
         """Re-initialize every registered interface."""
         for interface in self.interfaces.values():

{morphopt-4.0.3 → morphopt-4.0.4}/src/morphopt/optcore/modelparams/parts/cad_part.py

@@ -333,8 +333,8 @@ class CADPart(BasePart):
             face_indices=face_indices, face_map=face_map,
         )
         torchfea_cad.export_step([CADPart._Operation("shell", action)], str(path))
-        path.with_suffix(".faces.json").write_text(
-            json.dumps(face_map, indent=2), encoding="utf-8",
+        path.with_suffix(".brep.json").write_text(
+            json.dumps({"face_map": face_map}, indent=2), encoding="utf-8",
         )
 
     def to_boundary_part(

{morphopt-4.0.3 → morphopt-4.0.4}/src/morphopt/shapeopt/boundary_part.py

@@ -261,6 +261,8 @@ class BoundaryPart(CADPart, ProtocalUpdatable):
                 [(np.unique(np.concatenate(ids)), side) for side, ids in sides.items()],
             )
             part.add_node_set(name, np.unique(np.concatenate(nodes)))
+        for index, surface in enumerate(self.surfaceinterfaces):
+            surface.define_mesh_sets(part, f"surface_{index}")
         exterior = self.exterior_surface or "extern"
         if exterior not in part.surfaces:
             part.add_surface_set(exterior, part.surfaces["extern"])
@@ -273,7 +275,7 @@ class BoundaryPart(CADPart, ProtocalUpdatable):
         for name, indices in self.surfaceinterfaces[0].get_node_sets(nodes[outer_nodes]).items():
             part.add_node_set(f"surface_0_{name}", outer_nodes[indices])
         for index, surface in enumerate(self.surfaceinterfaces):
-            if not surface.num_variables:
+            if not surface.num_variables or surface.uses_facewise_binding:
                 continue
             indices = np.sort(part.set_nodes[f"surface_{index}_All"])
             surface.match_coordinates(indices, nodes[indices])
@@ -283,7 +285,10 @@ class BoundaryPart(CADPart, ProtocalUpdatable):
                 dtype=part.nodes.dtype,
             )
             part.nodes[surface.surf_node_idx] = surface.map(uv)
-        return super().postprocess_mesh(part)
+        part = super().postprocess_mesh(part)
+        for surface in self.surfaceinterfaces:
+            surface.bind_mesh(part)
+        return part
 
     def export_data(self, dirpath: str, pools: Pool | None = None) -> None:
         """Export every surface to ``__surface-<index>.stp|stl``."""
@@ -441,6 +446,7 @@ class BoundaryPart(CADPart, ProtocalUpdatable):
 
         values = torch.as_tensor(design_sensitivity_vars).reshape(-1)
         offset = 0
+        facewise: list[BaseSurface] = []
         for surface in self.surfaceinterfaces:
             size = surface.num_variables
             if not size:
@@ -450,9 +456,10 @@ class BoundaryPart(CADPart, ProtocalUpdatable):
             if not surface.is_updatable:
                 continue
             surface.set_surface_parameters(parameters)
-
-            node_update = surface.map(torch.from_numpy(surface.surf_node_uv))
-            nodes_new[surface.surf_node_idx] = node_update
+            indices, node_update = surface.map_design_nodes()
+            nodes_new[indices] = node_update
+            if surface.uses_facewise_binding:
+                facewise.append(surface)
 
         if self.mesh_order == 2:
             nodes_new[part.mid_pt_idxmap_torch[:, 2]] = (
@@ -460,6 +467,10 @@ class BoundaryPart(CADPart, ProtocalUpdatable):
                 + nodes_new[part.mid_pt_idxmap_torch[:, 1]]
             ) / 2
 
+        for surface in facewise:
+            indices, node_update = surface.map_design_nodes()
+            nodes_new[indices] = node_update
+
         part.nodes = nodes_new
 
     # ---------------------------------------------------------------- io/plot

{morphopt-4.0.3 → morphopt-4.0.4}/src/morphopt/shapeopt/surfaces/__init__.py

@@ -10,6 +10,7 @@ from .cpgeo_constraints import CPGEOSurfaceRelationConstraint
 from .bsp_surface import BspSurface
 from .cpgeo_surface import CPGEOSurface
 from .brep_surface import BREPSurface
+from .nurbs_face import NURBSFace
 from .mesh_surface import MeshSurface
 
 __all__ = [
@@ -23,4 +24,5 @@ __all__ = [
     "BspSurface",
     "CPGEOSurface",
     "BREPSurface",
+    "NURBSFace",
 ]

{morphopt-4.0.3 → morphopt-4.0.4}/src/morphopt/shapeopt/surfaces/base_surface.py

@@ -17,6 +17,7 @@ from .base_constraints import BaseSurfaceConstraints
 if TYPE_CHECKING:
     from multiprocessing.pool import Pool
 
+    import torchfea
     from torchfea.cad.builder import OCCBuilder
 
     from ...optcore.modelparams.parts.cad_part import CADPart
@@ -155,6 +156,23 @@ class BaseSurface(BaseModelComponent):
         """Return surface-specific node sets as indices into ``nodes``."""
         return {}
 
+    def define_mesh_sets(self, part: torchfea.Part, prefix: str) -> None:
+        """Add topology-owned sets after the Part's mesh has been extracted."""
+
+    def bind_mesh(self, part: torchfea.Part) -> None:
+        """Bind surface parameters after element-order processing is complete."""
+
+    @property
+    def uses_facewise_binding(self) -> bool:
+        """Whether a surface has multiple independent parameter domains."""
+        return False
+
+    def map_design_nodes(self) -> tuple[np.ndarray, torch.Tensor]:
+        """Return bound FE indices and differentiable updated coordinates."""
+        parameters = self.get_surface_parameters()
+        uv = torch.as_tensor(self.surf_node_uv, dtype=parameters.dtype, device=parameters.device)
+        return self.surf_node_idx, self.map(uv)
+
     def set_surface_parameters(self, x: torch.Tensor) -> None:
         """
         Set the design variables of the surface.