cad-to-dagmc 0.9.2__py3-none-any.whl → 0.9.4__py3-none-any.whl

_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.9.2'
-__version_tuple__ = version_tuple = (0, 9, 2)
+__version__ = version = '0.9.4'
+__version_tuple__ = version_tuple = (0, 9, 4)
+
+__commit_id__ = commit_id = None

cad_to_dagmc/__init__.py

@@ -13,4 +13,5 @@ except PackageNotFoundError:
 
 __all__ = ["__version__"]
 
+from .direct_mesh_plugin import *
 from .core import *

cad_to_dagmc/core.py

@@ -9,6 +9,7 @@ import tempfile
 import warnings
 from typing import Iterable
 from cad_to_dagmc import __version__
+from .direct_mesh_plugin import to_mesh
 
 
 def define_moab_core_and_tags() -> tuple[core.Core, dict]:
@@ -811,53 +812,112 @@ class CadToDagmc:
     def export_dagmc_h5m_file(
         self,
         filename: str = "dagmc.h5m",
-        min_mesh_size: float | None = None,
-        max_mesh_size: float | None = None,
-        mesh_algorithm: int = 1,
+        meshing_backend: str = "cadquery",
         implicit_complement_material_tag: str | None = None,
-        method: str = "file",
         scale_factor: float = 1.0,
         imprint: bool = True,
-        set_size: dict[int, float] | None = None,
-        unstructured_volumes: Iterable[int] | None = None,
-        umesh_filename: str = "umesh.vtk",
+        **kwargs,
     ) -> str:
         """Saves a DAGMC h5m file of the geometry
 
         Args:
-            filename (str, optional): the filename to use for the saved DAGMC file. Defaults to "dagmc.h5m".
-            min_mesh_size (float, optional): the minimum size of mesh elements to use. Defaults to 1.
-            max_mesh_size (float, optional): the maximum size of mesh elements to use. Defaults to 5.
-            mesh_algorithm (int, optional): the GMSH mesh algorithm to use.. Defaults to 1.
-            implicit_complement_material_tag (str | None, optional):
-                the name of the material tag to use for the implicit complement
-                (void space). Defaults to None which is a vacuum. Defaults to None.
-           method: the method to use to import the geometry into gmsh. Options
-                are 'file' or 'in memory'. 'file' is the default and will write
-                the geometry to a temporary file before importing it into gmsh.
-                'in memory' will import the geometry directly into gmsh but
-                requires the version of OpenCASCADE used to build gmsh to be
-                the same as the version used by CadQuery. This is possible to
-                ensure when installing the package with Conda but harder when
-                installing from PyPI.
-            scale_factor: a scaling factor to apply to the geometry that can be
-                used to enlarge or shrink the geometry. Useful when converting
-                Useful when converting the geometry to cm for use in neutronics
-            imprint: whether to imprint the geometry or not. Defaults to True as this is
-                normally needed to ensure the geometry is meshed correctly. However if
-                you know your geometry does not need imprinting you can set this to False
-                and this can save time.
-            set_size: a dictionary of volume ids (int) and target mesh sizes
-                (floats) to set for each volume, passed to gmsh.model.mesh.setSize.
-            unstructured_volumes: a list of volume ids to be saved in as an
-                unstructured mesh file.
-            umesh_filename: the filename to use for the optional unstructured
-                mesh file. Only used if unstructured_volumes is not empty.
+            filename: the filename to use for the saved DAGMC file.
+            meshing_backend: determines whether gmsh or cadquery's direct mesh method
+                is used for meshing. Options are 'gmsh' or 'cadquery'.
+            implicit_complement_material_tag: the name of the material tag to use
+                for the implicit complement (void space).
+            scale_factor: a scaling factor to apply to the geometry.
+            imprint: whether to imprint the geometry or not.
+
+            **kwargs: Backend-specific parameters:
+
+                For GMSH backend:
+                - min_mesh_size (float): minimum mesh element size
+                - max_mesh_size (float): maximum mesh element size
+                - mesh_algorithm (int): GMSH mesh algorithm (default: 1)
+                - method (str): import method 'file' or 'in memory' (default: 'file')
+                - set_size (dict[int, float]): volume ids and target mesh sizes
+                - unstructured_volumes (Iterable[int]): volume ids for unstructured mesh
+                - umesh_filename (str): filename for unstructured mesh (default: 'umesh.vtk')
+
+                For CadQuery backend:
+                - tolerance (float): meshing tolerance (default: 0.1)
+                - angular_tolerance (float): angular tolerance (default: 0.1)
 
         Returns:
-            str: the filenames(s) for the files created.
+            str: the filename(s) for the files created.
+
+        Raises:
+            ValueError: If invalid parameter combinations are used.
         """
 
+        # Validate meshing backend
+        if meshing_backend not in ["gmsh", "cadquery"]:
+            raise ValueError(
+                f'meshing_backend "{meshing_backend}" not supported. '
+                'Available options are "gmsh" or "cadquery"'
+            )
+
+        # Initialize variables to avoid unbound errors
+        tolerance = 0.1
+        angular_tolerance = 0.1
+        min_mesh_size = None
+        max_mesh_size = None
+        mesh_algorithm = 1
+        method = "file"
+        set_size = None
+        unstructured_volumes = None
+        umesh_filename = "umesh.vtk"
+
+        # Extract backend-specific parameters with defaults
+        if meshing_backend == "cadquery":
+            # CadQuery parameters
+            tolerance = kwargs.get("tolerance", 0.1)
+            angular_tolerance = kwargs.get("angular_tolerance", 0.1)
+
+            # Check for invalid parameters
+            unstructured_volumes = kwargs.get("unstructured_volumes")
+            if unstructured_volumes is not None:
+                raise ValueError(
+                    "CadQuery backend cannot be used for volume meshing. "
+                    "unstructured_volumes must be None when using 'cadquery' backend."
+                )
+
+            # Warn about unused GMSH parameters
+            gmsh_params = [
+                "min_mesh_size",
+                "max_mesh_size",
+                "mesh_algorithm",
+                "set_size",
+                "umesh_filename",
+                "method",
+            ]
+            unused_params = [param for param in gmsh_params if param in kwargs]
+            if unused_params:
+                warnings.warn(
+                    f"The following parameters are ignored when using CadQuery backend: "
+                    f"{', '.join(unused_params)}"
+                )
+
+        elif meshing_backend == "gmsh":
+            # GMSH parameters
+            min_mesh_size = kwargs.get("min_mesh_size")
+            max_mesh_size = kwargs.get("max_mesh_size")
+            mesh_algorithm = kwargs.get("mesh_algorithm", 1)
+            method = kwargs.get("method", "file")
+            set_size = kwargs.get("set_size")
+            unstructured_volumes = kwargs.get("unstructured_volumes")
+            umesh_filename = kwargs.get("umesh_filename", "umesh.vtk")
+
+            # Warn about unused CadQuery parameters
+            cq_params = ["tolerance", "angular_tolerance"]
+            unused_params = [param for param in cq_params if param in kwargs]
+            if unused_params:
+                warnings.warn(
+                    f"The following parameters are ignored when using GMSH backend: "
+                    f"{', '.join(unused_params)}"
+                )
+
         assembly = cq.Assembly()
         for part in self.parts:
             assembly.add(part)
@@ -870,41 +930,80 @@ class CadToDagmc:
             msg = f"Number of volumes {len(original_ids)} is not equal to number of material tags {len(self.material_tags)}"
             raise ValueError(msg)
 
-        if imprint:
-            imprinted_assembly, imprinted_solids_with_org_id = cq.occ_impl.assembly.imprint(
-                assembly
+        # Use the CadQuery direct mesh plugin
+        if meshing_backend == "cadquery":
+
+            # Mesh the assembly using CadQuery's direct-mesh plugin
+            cq_mesh = to_mesh(
+                assembly,
+                imprint=imprint,
+                tolerance=tolerance,
+                angular_tolerance=angular_tolerance,
+                scale_factor=scale_factor,
             )
 
-            scrambled_ids = get_ids_from_imprinted_assembly(imprinted_solids_with_org_id)
+            # Fix the material tag order for imprinted assemblies
+            if cq_mesh["imprinted_assembly"] is not None:
+                imprinted_solids_with_org_id = cq_mesh["imprinted_solids_with_orginal_ids"]
 
-            material_tags_in_brep_order = order_material_ids_by_brep_order(
-                original_ids, scrambled_ids, self.material_tags
-            )
-        else:
-            material_tags_in_brep_order = self.material_tags
-            imprinted_assembly = assembly
+                scrambled_ids = get_ids_from_imprinted_assembly(imprinted_solids_with_org_id)
 
-        check_material_tags(material_tags_in_brep_order, self.parts)
+                material_tags_in_brep_order = order_material_ids_by_brep_order(
+                    original_ids, scrambled_ids, self.material_tags
+                )
+            else:
+                material_tags_in_brep_order = self.material_tags
+
+            check_material_tags(material_tags_in_brep_order, self.parts)
+
+            # Extract the mesh information to allow export to h5m from the direct-mesh result
+            vertices = cq_mesh["vertices"]
+            triangles_by_solid_by_face = cq_mesh["solid_face_triangle_vertex_map"]
+        # Use gmsh
+        elif meshing_backend == "gmsh":
+            # If assembly is not to be imprinted, pass through the assembly as-is
+            if imprint:
+                imprinted_assembly, imprinted_solids_with_org_id = cq.occ_impl.assembly.imprint(
+                    assembly
+                )
 
-        gmsh = init_gmsh()
+                scrambled_ids = get_ids_from_imprinted_assembly(imprinted_solids_with_org_id)
 
-        gmsh, volumes = get_volumes(
-            gmsh, imprinted_assembly, method=method, scale_factor=scale_factor
-        )
+                material_tags_in_brep_order = order_material_ids_by_brep_order(
+                    original_ids, scrambled_ids, self.material_tags
+                )
 
-        gmsh = set_sizes_for_mesh(
-            gmsh=gmsh,
-            min_mesh_size=min_mesh_size,
-            max_mesh_size=max_mesh_size,
-            mesh_algorithm=mesh_algorithm,
-            set_size=set_size,
-        )
+            else:
+                material_tags_in_brep_order = self.material_tags
+                imprinted_assembly = assembly
 
-        gmsh.model.mesh.generate(2)
+            check_material_tags(material_tags_in_brep_order, self.parts)
 
-        vertices, triangles_by_solid_by_face = mesh_to_vertices_and_triangles(
-            dims_and_vol_ids=volumes
-        )
+            # Start generating the mesh
+            gmsh = init_gmsh()
+
+            gmsh, volumes = get_volumes(
+                gmsh, imprinted_assembly, method=method, scale_factor=scale_factor
+            )
+
+            gmsh = set_sizes_for_mesh(
+                gmsh=gmsh,
+                min_mesh_size=min_mesh_size,
+                max_mesh_size=max_mesh_size,
+                mesh_algorithm=mesh_algorithm,
+                set_size=set_size,
+            )
+
+            gmsh.model.mesh.generate(2)
+
+            vertices, triangles_by_solid_by_face = mesh_to_vertices_and_triangles(
+                dims_and_vol_ids=volumes
+            )
+
+        else:
+            raise ValueError(
+                f'meshing_backend {meshing_backend} not supported. Available options are "cadquery" or "gmsh"'
+            )
 
         dagmc_filename = vertices_to_h5m(
             vertices=vertices,

cad_to_dagmc/direct_mesh_plugin.py

@@ -0,0 +1,508 @@
+# This is a temporary solution until we have to_mesh like functionality in a
+# PYPI distributed version of CadQuery.
+# This code is adapted from the cadquery-direct-mesh-plugin repository:
+# https://github.com/jmwright/cadquery-direct-mesh-plugin
+
+#                                  Apache License
+#                            Version 2.0, January 2004
+#                         http://www.apache.org/licenses/
+
+#    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+#    1. Definitions.
+
+#       "License" shall mean the terms and conditions for use, reproduction,
+#       and distribution as defined by Sections 1 through 9 of this document.
+
+#       "Licensor" shall mean the copyright owner or entity authorized by
+#       the copyright owner that is granting the License.
+
+#       "Legal Entity" shall mean the union of the acting entity and all
+#       other entities that control, are controlled by, or are under common
+#       control with that entity. For the purposes of this definition,
+#       "control" means (i) the power, direct or indirect, to cause the
+#       direction or management of such entity, whether by contract or
+#       otherwise, or (ii) ownership of fifty percent (50%) or more of the
+#       outstanding shares, or (iii) beneficial ownership of such entity.
+
+#       "You" (or "Your") shall mean an individual or Legal Entity
+#       exercising permissions granted by this License.
+
+#       "Source" form shall mean the preferred form for making modifications,
+#       including but not limited to software source code, documentation
+#       source, and configuration files.
+
+#       "Object" form shall mean any form resulting from mechanical
+#       transformation or translation of a Source form, including but
+#       not limited to compiled object code, generated documentation,
+#       and conversions to other media types.
+
+#       "Work" shall mean the work of authorship, whether in Source or
+#       Object form, made available under the License, as indicated by a
+#       copyright notice that is included in or attached to the work
+#       (an example is provided in the Appendix below).
+
+#       "Derivative Works" shall mean any work, whether in Source or Object
+#       form, that is based on (or derived from) the Work and for which the
+#       editorial revisions, annotations, elaborations, or other modifications
+#       represent, as a whole, an original work of authorship. For the purposes
+#       of this License, Derivative Works shall not include works that remain
+#       separable from, or merely link (or bind by name) to the interfaces of,
+#       the Work and Derivative Works thereof.
+
+#       "Contribution" shall mean any work of authorship, including
+#       the original version of the Work and any modifications or additions
+#       to that Work or Derivative Works thereof, that is intentionally
+#       submitted to Licensor for inclusion in the Work by the copyright owner
+#       or by an individual or Legal Entity authorized to submit on behalf of
+#       the copyright owner. For the purposes of this definition, "submitted"
+#       means any form of electronic, verbal, or written communication sent
+#       to the Licensor or its representatives, including but not limited to
+#       communication on electronic mailing lists, source code control systems,
+#       and issue tracking systems that are managed by, or on behalf of, the
+#       Licensor for the purpose of discussing and improving the Work, but
+#       excluding communication that is conspicuously marked or otherwise
+#       designated in writing by the copyright owner as "Not a Contribution."
+
+#       "Contributor" shall mean Licensor and any individual or Legal Entity
+#       on behalf of whom a Contribution has been received by Licensor and
+#       subsequently incorporated within the Work.
+
+#    2. Grant of Copyright License. Subject to the terms and conditions of
+#       this License, each Contributor hereby grants to You a perpetual,
+#       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+#       copyright license to reproduce, prepare Derivative Works of,
+#       publicly display, publicly perform, sublicense, and distribute the
+#       Work and such Derivative Works in Source or Object form.
+
+#    3. Grant of Patent License. Subject to the terms and conditions of
+#       this License, each Contributor hereby grants to You a perpetual,
+#       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+#       (except as stated in this section) patent license to make, have made,
+#       use, offer to sell, sell, import, and otherwise transfer the Work,
+#       where such license applies only to those patent claims licensable
+#       by such Contributor that are necessarily infringed by their
+#       Contribution(s) alone or by combination of their Contribution(s)
+#       with the Work to which such Contribution(s) was submitted. If You
+#       institute patent litigation against any entity (including a
+#       cross-claim or counterclaim in a lawsuit) alleging that the Work
+#       or a Contribution incorporated within the Work constitutes direct
+#       or contributory patent infringement, then any patent licenses
+#       granted to You under this License for that Work shall terminate
+#       as of the date such litigation is filed.
+
+#    4. Redistribution. You may reproduce and distribute copies of the
+#       Work or Derivative Works thereof in any medium, with or without
+#       modifications, and in Source or Object form, provided that You
+#       meet the following conditions:
+
+#       (a) You must give any other recipients of the Work or
+#           Derivative Works a copy of this License; and
+
+#       (b) You must cause any modified files to carry prominent notices
+#           stating that You changed the files; and
+
+#       (c) You must retain, in the Source form of any Derivative Works
+#           that You distribute, all copyright, patent, trademark, and
+#           attribution notices from the Source form of the Work,
+#           excluding those notices that do not pertain to any part of
+#           the Derivative Works; and
+
+#       (d) If the Work includes a "NOTICE" text file as part of its
+#           distribution, then any Derivative Works that You distribute must
+#           include a readable copy of the attribution notices contained
+#           within such NOTICE file, excluding those notices that do not
+#           pertain to any part of the Derivative Works, in at least one
+#           of the following places: within a NOTICE text file distributed
+#           as part of the Derivative Works; within the Source form or
+#           documentation, if provided along with the Derivative Works; or,
+#           within a display generated by the Derivative Works, if and
+#           wherever such third-party notices normally appear. The contents
+#           of the NOTICE file are for informational purposes only and
+#           do not modify the License. You may add Your own attribution
+#           notices within Derivative Works that You distribute, alongside
+#           or as an addendum to the NOTICE text from the Work, provided
+#           that such additional attribution notices cannot be construed
+#           as modifying the License.
+
+#       You may add Your own copyright statement to Your modifications and
+#       may provide additional or different license terms and conditions
+#       for use, reproduction, or distribution of Your modifications, or
+#       for any such Derivative Works as a whole, provided Your use,
+#       reproduction, and distribution of the Work otherwise complies with
+#       the conditions stated in this License.
+
+#    5. Submission of Contributions. Unless You explicitly state otherwise,
+#       any Contribution intentionally submitted for inclusion in the Work
+#       by You to the Licensor shall be under the terms and conditions of
+#       this License, without any additional terms or conditions.
+#       Notwithstanding the above, nothing herein shall supersede or modify
+#       the terms of any separate license agreement you may have executed
+#       with Licensor regarding such Contributions.
+
+#    6. Trademarks. This License does not grant permission to use the trade
+#       names, trademarks, service marks, or product names of the Licensor,
+#       except as required for reasonable and customary use in describing the
+#       origin of the Work and reproducing the content of the NOTICE file.
+
+#    7. Disclaimer of Warranty. Unless required by applicable law or
+#       agreed to in writing, Licensor provides the Work (and each
+#       Contributor provides its Contributions) on an "AS IS" BASIS,
+#       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+#       implied, including, without limitation, any warranties or conditions
+#       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+#       PARTICULAR PURPOSE. You are solely responsible for determining the
+#       appropriateness of using or redistributing the Work and assume any
+#       risks associated with Your exercise of permissions under this License.
+
+#    8. Limitation of Liability. In no event and under no legal theory,
+#       whether in tort (including negligence), contract, or otherwise,
+#       unless required by applicable law (such as deliberate and grossly
+#       negligent acts) or agreed to in writing, shall any Contributor be
+#       liable to You for damages, including any direct, indirect, special,
+#       incidental, or consequential damages of any character arising as a
+#       result of this License or out of the use or inability to use the
+#       Work (including but not limited to damages for loss of goodwill,
+#       work stoppage, computer failure or malfunction, or any and all
+#       other commercial damages or losses), even if such Contributor
+#       has been advised of the possibility of such damages.
+
+#    9. Accepting Warranty or Additional Liability. While redistributing
+#       the Work or Derivative Works thereof, You may choose to offer,
+#       and charge a fee for, acceptance of support, warranty, indemnity,
+#       or other liability obligations and/or rights consistent with this
+#       License. However, in accepting such obligations, You may act only
+#       on Your own behalf and on Your sole responsibility, not on behalf
+#       of any other Contributor, and only if You agree to indemnify,
+#       defend, and hold each Contributor harmless for any liability
+#       incurred by, or claims asserted against, such Contributor by reason
+#       of your accepting any such warranty or additional liability.
+
+#    END OF TERMS AND CONDITIONS
+
+#    APPENDIX: How to apply the Apache License to your work.
+
+#       To apply the Apache License to your work, attach the following
+#       boilerplate notice, with the fields enclosed by brackets "[]"
+#       replaced with your own identifying information. (Don't include
+#       the brackets!)  The text should be enclosed in the appropriate
+#       comment syntax for the file format. We also recommend that a
+#       file or class name and description of purpose be included on the
+#       same "printed page" as the copyright notice for easier
+#       identification within third-party archives.
+
+#    Copyright [yyyy] [name of copyright owner]
+
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+
+from OCP.TopLoc import TopLoc_Location
+from OCP.BRep import BRep_Tool
+from OCP.BRepMesh import BRepMesh_IncrementalMesh
+from OCP import GCPnts, BRepAdaptor
+from OCP.TopAbs import TopAbs_REVERSED, TopAbs_IN
+from OCP.gp import gp_Pnt, gp_Vec
+import cadquery as cq
+
+
+def _is_interior_face(face, solid, tolerance=0.01):
+    """
+    Determine if a face is interior to a solid (like a cavity wall).
+
+    This is more robust than just checking face orientation, as it considers
+    the geometric relationship between the face and the solid.
+    """
+    # Get geometric surface and parameter bounds
+    surf = BRep_Tool.Surface_s(face.wrapped)
+    u_min, u_max, v_min, v_max = face._uvBounds()
+
+    # # Take center point in UV space on the face
+    u = (u_min + u_max) * 0.5
+    v = (v_min + v_max) * 0.5
+    face_pnt = surf.Value(u, v)
+
+    # Determine if the face is most likely inside the solid
+    is_inside = solid.isInside((face_pnt.X(), face_pnt.Y(), face_pnt.Z()))
+
+    # Determine if the normal of the face points generally towards to the center of the solid
+    is_pointing_inward = False
+    face_normal = face.normalAt((face_pnt.X(), face_pnt.Y(), face_pnt.Z()))
+    solid_center = solid.Center()
+
+    to_center = gp_Vec(face_pnt, gp_Pnt(solid_center.x, solid_center.y, solid_center.z))
+
+    # Dot product: negative = toward, positive = away
+    dot = face_normal.dot(cq.Vector(to_center.Normalized()))
+
+    if dot < 0:
+        is_pointing_inward = False
+    else:
+        is_pointing_inward = True
+
+    # If the face seems to be inside the solid and its normal points inwards, it should be an internal face
+    is_internal_face = False
+    if is_inside and is_pointing_inward:
+        is_internal_face = True
+
+    return is_internal_face
+
+
+def to_mesh(
+    assembly,
+    imprint=True,
+    tolerance=0.1,
+    angular_tolerance=0.1,
+    scale_factor=1.0,
+    include_brep_edges=False,
+    include_brep_vertices=False,
+):
+    """
+    Converts an assembly to a custom mesh format defined by the CadQuery team.
+
+    :param imprint: Whether or not the assembly should be imprinted
+    :param tolerance: Tessellation tolerance for mesh generation
+    :param angular_tolerance: Angular tolerance for tessellation
+    :param include_brep_edges: Whether to include BRep edge segments
+    :param include_brep_vertices: Whether to include BRep vertices
+    """
+
+    # To keep track of the vertices and triangles in the mesh
+    vertices = []
+    vertex_map = {}
+    solids = []
+    solid_face_triangle = {}
+    imprinted_assembly = None
+    imprinted_solids_with_orginal_ids = None
+    solid_colors = []
+    solid_locs = []
+    solid_brep_edge_segments = []
+    solid_brep_vertices = []
+
+    # Imprinted assemblies end up being compounds, whereas you have to step through each of the
+    # parts in an assembly and extract the solids.
+    if imprint:
+        # Imprint the assembly and process it as a compound
+        (
+            imprinted_assembly,
+            imprinted_solids_with_orginal_ids,
+        ) = cq.occ_impl.assembly.imprint(assembly)
+
+        # Extract the solids from the imprinted assembly because we should not mesh the compound
+        for solid in imprinted_assembly.Solids():
+            solids.append(solid)
+
+        # Keep track of the colors and location of each of the solids
+        solid_colors.append((0.5, 0.5, 0.5, 1.0))
+        solid_locs.append(cq.Location())
+    else:
+        # Step through every child in the assembly and save their solids
+        for child in assembly.children:
+            # Make sure we end up with a base shape
+            obj = child.obj
+            if type(child.obj).__name__ == "Workplane":
+                solids.append(obj.val())
+            else:
+                solids.append(obj)
+
+            # Use the color set for the assembly component, or use a default color
+            if child.color:
+                solid_colors.append(child.color.toTuple())
+            else:
+                solid_colors.append((0.5, 0.5, 0.5, 1.0))
+
+            # Keep track of the location of each of the solids
+            solid_locs.append(child.loc)
+
+    # Solid and face IDs need to be unique unless they are a shared face
+    solid_idx = 1  # We start at 1 to mimic gmsh
+    face_idx = 1  # We start at id of 1 to mimic gmsh
+
+    # Step through all of the collected solids and their respective faces to get the vertices
+    for solid in solids:
+        # Reset this each time so that we get the correct number of faces per solid
+        face_triangles = {}
+
+        # Order the faces in order of area, largest first
+        sorted_faces = []
+        face_areas = []
+        for face in solid.Faces():
+            area = face.Area()
+            sorted_faces.append((face, area))
+            face_areas.append(area)
+
+        # Sort by area (largest first)
+        sorted_faces.sort(key=lambda x: x[1], reverse=False)
+
+        # Extract just the sorted faces if you need them separately
+        sorted_face_list = [face_info[0] for face_info in sorted_faces]
+
+        # Walk through all the faces
+        for face in sorted_face_list:
+            # Figure out if the face has a reversed orientation so we can handle the triangles accordingly
+            is_reversed = False
+            if face.wrapped.Orientation() == TopAbs_REVERSED:
+                is_reversed = True
+
+            # Location information of the face to place the vertices and edges correctly
+            loc = TopLoc_Location()
+
+            # Perform the tessellation
+            BRepMesh_IncrementalMesh(face.wrapped, tolerance, False, angular_tolerance)
+            face_mesh = BRep_Tool.Triangulation_s(face.wrapped, loc)
+
+            # If this is not an imprinted assembly, override the location of the triangulation
+            if not imprint:
+                loc = solid_locs[solid_idx - 1].wrapped
+
+            # Save the transformation so that we can place vertices in the correct locations later
+            Trsf = loc.Transformation()
+
+            # Pre-process all vertices from the face mesh for better performance
+            face_vertices = {}  # Map from face mesh node index to global vertex index
+            for node_idx in range(1, face_mesh.NbNodes() + 1):
+                node = face_mesh.Node(node_idx)
+                v_trsf = node.Transformed(Trsf)
+                vertex_coords = (
+                    v_trsf.X() * scale_factor,
+                    v_trsf.Y() * scale_factor,
+                    v_trsf.Z() * scale_factor,
+                )
+
+                # Use dictionary for O(1) lookup instead of O(n) list operations
+                if vertex_coords in vertex_map:
+                    face_vertices[node_idx] = vertex_map[vertex_coords]
+                else:
+                    global_vertex_idx = len(vertices)
+                    vertices.append(vertex_coords)
+                    vertex_map[vertex_coords] = global_vertex_idx
+                    face_vertices[node_idx] = global_vertex_idx
+
+            # Step through the triangles of the face
+            cur_triangles = []
+            for i in range(1, face_mesh.NbTriangles() + 1):
+                # Get the current triangle and its index vertices
+                cur_tri = face_mesh.Triangle(i)
+                idx_1, idx_2, idx_3 = cur_tri.Get()
+
+                # Look up pre-processed vertex indices - O(1) operation
+                if is_reversed:
+                    triangle_vertex_indices = [
+                        face_vertices[idx_1],
+                        face_vertices[idx_3],
+                        face_vertices[idx_2],
+                    ]
+                else:
+                    triangle_vertex_indices = [
+                        face_vertices[idx_1],
+                        face_vertices[idx_2],
+                        face_vertices[idx_3],
+                    ]
+
+                cur_triangles.append(triangle_vertex_indices)
+
+            # Save this triangle for the current face
+            face_triangles[face_idx] = cur_triangles
+
+            # Move to the next face
+            face_idx += 1
+
+        solid_face_triangle[solid_idx] = face_triangles
+
+        # If the caller wants to track edges, include them
+        if include_brep_edges:
+            # If this is not an imprinted assembly, override the location of the edges
+            loc = TopLoc_Location()
+            if not imprint:
+                loc = solid_locs[solid_idx - 1].wrapped
+
+            # Save the transformation so that we can place vertices in the correct locations later
+            Trsf = loc.Transformation()
+
+            # Add CadQuery-reported edges
+            current_segments = []
+            for edge in solid.edges():
+                # We need to handle different kinds of edges differently
+                gt = edge.geomType()
+
+                # Line edges are just point to point
+                if gt == "LINE":
+                    start = edge.startPoint().toPnt()
+                    end = edge.endPoint().toPnt()
+
+                    # Apply the assembly location transformation to each vertex
+                    start_trsf = start.Transformed(Trsf)
+                    located_start = (start_trsf.X(), start_trsf.Y(), start_trsf.Z())
+                    end_trsf = end.Transformed(Trsf)
+                    located_end = (end_trsf.X(), end_trsf.Y(), end_trsf.Z())
+
+                    # Save the start and end points for the edge
+                    current_segments.append([located_start, located_end])
+                # If dealing with some sort of arc, discretize it into individual lines
+                elif gt in ("CIRCLE", "ARC", "SPLINE", "BSPLINE", "ELLIPSE"):
+                    # Discretize the curve
+                    disc = GCPnts.GCPnts_TangentialDeflection(
+                        BRepAdaptor.BRepAdaptor_Curve(edge.wrapped),
+                        tolerance,
+                        angular_tolerance,
+                    )
+
+                    # Add each of the discretized sections to the edge list
+                    if disc.NbPoints() > 1:
+                        for i in range(2, disc.NbPoints() + 1):
+                            p_0 = disc.Value(i - 1)
+                            p_1 = disc.Value(i)
+
+                            # Apply the assembly location transformation to each vertex
+                            p_0_trsf = p_0.Transformed(Trsf)
+                            located_p_0 = (p_0_trsf.X(), p_0_trsf.Y(), p_0_trsf.Z())
+                            p_1_trsf = p_1.Transformed(Trsf)
+                            located_p_1 = (p_1_trsf.X(), p_1_trsf.Y(), p_1_trsf.Z())
+
+                            # Save the start and end points for the edge
+                            current_segments.append([located_p_0, located_p_1])
+
+            solid_brep_edge_segments.append(current_segments)
+
+        # Add CadQuery-reported vertices, if requested
+        if include_brep_vertices:
+            # If this is not an imprinted assembly, override the location of the edges
+            loc = TopLoc_Location()
+            if not imprint:
+                loc = solid_locs[solid_idx - 1].wrapped
+
+            # Save the transformation so that we can place vertices in the correct locations later
+            Trsf = loc.Transformation()
+
+            current_vertices = []
+            for vertex in solid.vertices():
+                p = BRep_Tool.Pnt_s(vertex.wrapped)
+
+                # Apply the assembly location transformation to each vertex
+                p_trsf = p.Transformed(Trsf)
+                located_p = (p_trsf.X(), p_trsf.Y(), p_trsf.Z())
+                current_vertices.append(located_p)
+
+            solid_brep_vertices.append(current_vertices)
+
+        # Move to the next solid
+        solid_idx += 1
+
+    return {
+        "vertices": vertices,
+        "solid_face_triangle_vertex_map": solid_face_triangle,
+        "solid_colors": solid_colors,
+        "solid_brep_edge_segments": solid_brep_edge_segments,
+        "solid_brep_vertices": solid_brep_vertices,
+        "imprinted_assembly": imprinted_assembly,
+        "imprinted_solids_with_orginal_ids": imprinted_solids_with_orginal_ids,
+    }

{cad_to_dagmc-0.9.2.dist-info → cad_to_dagmc-0.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.2
+Version: 0.9.4
 Summary: Converts CAD files to a DAGMC h5m file
 Author-email: Jonathan Shimwell <mail@jshimwell.com>
 Project-URL: Homepage, https://github.com/fusion-energy/cad_to_dagmc
@@ -49,11 +49,9 @@ cad-to-dagmc can convert the following in to DAGMC compatible meshes:
 - Gmsh meshes (optionally use physical groups as material tags)
 
 Cad-to-dagmc offers a wide range of features including.
-- Compatibly with [assembly-mesh-plugin](https://github.com/CadQuery/assembly-mesh-plugin) (see examples)
-- Access to the Gmsh mesh to allow user to define full set of mesh parameters
-- Option to use Gmsh physical groups as material tags
 - Geometry scaling with ```scale_factor``` argument
-- Model wide mesh size parameters with ```min_mesh_size``` and ```max_mesh_size``` arguments
+- Ddirect surface meshing of CadQuery geometry with ```tolerance``` and ```angular_tolerance``` arguments (avoids using Gmsh)
+- Model wide mesh Gmsh size parameters with ```min_mesh_size``` and ```max_mesh_size``` arguments
 - Volume specific mesh sizing parameters with the ```set_size``` argument
 - Unstructured mesh that share the same coordinates as the surface mesh.
 - Volume mesh allows selecting individual volumes in the geometry.
@@ -65,6 +63,9 @@ Cad-to-dagmc offers a wide range of features including.
 - Pass CadQuery objects in memory for fast transfer of geometry using the ```method``` argument
 - Easy to install with [pip](https://pypi.org/project/cad-to-dagmc/) and [Conda/Mamba](https://anaconda.org/conda-forge/cad_to_dagmc)
 - Well tested both with [CI unit tests](https://github.com/fusion-energy/cad_to_dagmc/tree/main/tests), integration tests and the CSG [Model Benchmark Zoo](https://github.com/fusion-energy/model_benchmark_zoo).
+- Access to the Gmsh mesh to allow user to define full set of mesh parameters
+- Option to use Gmsh physical groups as material tags
+- Compatibly with [assembly-mesh-plugin](https://github.com/CadQuery/assembly-mesh-plugin) (see examples)
 - Compatible with [Paramak](https://github.com/fusion-energy/paramak) geometry for fusion simulations.
 
 

cad_to_dagmc-0.9.4.dist-info/RECORD

@@ -0,0 +1,9 @@
+_version.py,sha256=neCU47g_h2UhyiDH9FD_S8jzk8iEdw9LEgRY7JImMPs,704
+cad_to_dagmc/__init__.py,sha256=oCr1P0QnBsf6AH0RZujX7T7tdrb75NazdF70HtqXSfc,528
+cad_to_dagmc/core.py,sha256=xYDP7OQ8D-FtPhjfcbZ2Gs5oX4pZisd72zyk3lSkpJg,40352
+cad_to_dagmc/direct_mesh_plugin.py,sha256=5jG5ILafjbDacaAvBRWD_ilMZLepcM6H1Tjze85vAxE,24013
+cad_to_dagmc-0.9.4.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
+cad_to_dagmc-0.9.4.dist-info/METADATA,sha256=7EeDiEXc-NKoTwMSiTPs2bo2uLPKSQqB2n1cgGyudFM,9121
+cad_to_dagmc-0.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cad_to_dagmc-0.9.4.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
+cad_to_dagmc-0.9.4.dist-info/RECORD,,

{cad_to_dagmc-0.9.2.dist-info → cad_to_dagmc-0.9.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

cad_to_dagmc-0.9.2.dist-info/RECORD

@@ -1,8 +0,0 @@
-_version.py,sha256=eeYYTSIkrgfRwSQ7LKo_py3xs3DvzgfWiAtK4K1JM4A,511
-cad_to_dagmc/__init__.py,sha256=fskHUTyCunSpnpJUvBfAYjx4uwDKXHTTiMP6GqnFRf0,494
-cad_to_dagmc/core.py,sha256=dGj5LRRzboQ8CL8VS5dkvIkGLyj5MJWcbkTPtrFk0QQ,36947
-cad_to_dagmc-0.9.2.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
-cad_to_dagmc-0.9.2.dist-info/METADATA,sha256=8vLnV93ycmV216LiNj38YI4z445pWtdpBKpcESFLLH0,8990
-cad_to_dagmc-0.9.2.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-cad_to_dagmc-0.9.2.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
-cad_to_dagmc-0.9.2.dist-info/RECORD,,