cad-to-dagmc 0.9.8__tar.gz → 0.10.0__tar.gz

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/.github/workflows/ci_with_conda_install.yml

@@ -69,11 +69,14 @@ jobs:
           source "${HOME}/miniforge/etc/profile.d/conda.sh"
           conda activate ci-env
           python examples/surface_mesh/cadquery_assembly.py
+          python examples/surface_mesh/cadquery_assembly_with_materials.py
+          python examples/surface_mesh/cadquery_assembly_with_names.py
           python examples/surface_mesh/cadquery_assembly_with_scaled_geometry.py
           python examples/surface_mesh/cadquery_compound.py
           python examples/surface_mesh/cadquery_object_and_stp_file.py
           python examples/surface_mesh/cadquery_text.py
           python examples/surface_mesh/curved_cadquery_object_to_dagmc_surface_mesh.py
+          python examples/surface_mesh/different_resolution_meshes.py
           python examples/surface_mesh/from_gmsh_mesh_file.py
           python examples/surface_mesh/from_gmsh_mesh_file_with_tags.py
           python examples/surface_mesh/from_gmsh_object_with_tag.py
@@ -85,6 +88,4 @@ jobs:
           python examples/unstrucutred_volume_mesh/curved_cadquery_object_to_dagmc_volume_mesh.py
           python examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py
           python examples/unstrucutred_volume_mesh/different_resolution_meshes.py
-          python examples/surface_mesh/different_resolution_meshes.py
-          python examples/surface_mesh/cadquery_assembly_with_scaled_geometry.py
           python examples/surface_and_unstructured_mesh/unstructured_mesh_with_conformal_surface_mesh.py

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/.github/workflows/ci_with_pip_install.yml

@@ -40,17 +40,22 @@ jobs:
           sudo apt-get install -y libblas-dev liblapack-dev libgl1 libglx-mesa0 libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0 libxcursor-dev libxft2 libxinerama-dev make cmake libeigen3-dev
           # Python3 and pip are pre-installed on GitHub Actions runners
           python -m pip install --extra-index-url https://shimwell.github.io/wheels moab openmc
+          # install the latest cadquery master branch as it has PR https://github.com/CadQuery/cadquery/pull/1923 merged in
+          python -m pip install git+https://github.com/CadQuery/cadquery
           python -c "import pymoab"
           python -m pip install .[tests]
           python -m pip install git+https://github.com/svalinn/pydagmc
           python -c "import cad_to_dagmc"
           pytest -v tests
           python examples/surface_mesh/cadquery_assembly.py
+          python examples/surface_mesh/cadquery_assembly_with_materials.py
+          python examples/surface_mesh/cadquery_assembly_with_names.py
           python examples/surface_mesh/cadquery_assembly_with_scaled_geometry.py
           python examples/surface_mesh/cadquery_compound.py
           python examples/surface_mesh/cadquery_object_and_stp_file.py
           python examples/surface_mesh/cadquery_text.py
           python examples/surface_mesh/curved_cadquery_object_to_dagmc_surface_mesh.py
+          python examples/surface_mesh/different_resolution_meshes.py
           python examples/surface_mesh/from_gmsh_mesh_file.py
           python examples/surface_mesh/from_gmsh_mesh_file_with_tags.py
           python examples/surface_mesh/from_gmsh_object_with_tag.py
@@ -62,6 +67,4 @@ jobs:
           python examples/unstrucutred_volume_mesh/curved_cadquery_object_to_dagmc_volume_mesh.py
           python examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py
           python examples/unstrucutred_volume_mesh/different_resolution_meshes.py
-          python examples/surface_mesh/different_resolution_meshes.py
-          python examples/surface_mesh/cadquery_assembly_with_scaled_geometry.py
           python examples/surface_and_unstructured_mesh/unstructured_mesh_with_conformal_surface_mesh.py

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.8
+Version: 0.10.0
 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
@@ -14,9 +14,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: trimesh
 Requires-Dist: networkx
-Requires-Dist: cadquery>=2.5.2
+Requires-Dist: cadquery>=2.6.0
 Requires-Dist: numpy
 Requires-Dist: gmsh
+Requires-Dist: cadquery_direct_mesh_plugin>=0.1.0
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: vtk; extra == "tests"

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/examples/surface_and_unstructured_mesh/unstructured_mesh_with_conformal_surface_mesh.py

@@ -13,7 +13,9 @@ import openmc
 box_cutter = cq.Workplane("XY").moveTo(0, 5).box(20, 10, 20)
 inner_sphere = cq.Workplane("XY").sphere(6).cut(box_cutter)
 middle_sphere = cq.Workplane("XY").sphere(6.1).cut(box_cutter).cut(inner_sphere)
-outer_sphere = cq.Workplane("XY").sphere(10).cut(box_cutter).cut(inner_sphere).cut(middle_sphere)
+outer_sphere = (
+    cq.Workplane("XY").sphere(10).cut(box_cutter).cut(inner_sphere).cut(middle_sphere)
+)
 
 assembly = cq.Assembly()
 assembly.add(inner_sphere, name="inner_sphere")
@@ -101,5 +103,7 @@ umesh_from_sp = sp.meshes[1]
 centroids = umesh_from_sp.centroids
 mesh_vols = umesh_from_sp.volumes
 
-flux_mean = tally_result.get_values(scores=["flux"], value="mean").reshape(umesh_from_sp.dimension)
+flux_mean = tally_result.get_values(scores=["flux"], value="mean").reshape(
+    umesh_from_sp.dimension
+)
 umesh_from_sp.write_data_to_vtk(filename="tally.vtk", datasets={"mean": flux_mean})

cad_to_dagmc-0.10.0/examples/surface_mesh/cadquery_assembly_with_materials.py

@@ -0,0 +1,25 @@
+# This example makes a CadQuery assembly and assigns materials to the parts
+# These part materials are then used when exporting to a DAGMC H5M file
+# This avoids needing to specify material tags separately when adding the CadQuery object
+
+
+import cadquery as cq
+from cad_to_dagmc import CadToDagmc
+
+result = cq.Workplane().sphere(5)
+result2 = cq.Workplane().moveTo(10, 0).sphere(2)
+
+assembly = cq.Assembly()
+assembly.add(
+    result, name="result", material=cq.Material("mat1")
+)  # note material assigned here
+assembly.add(
+    result2, name="result2", material=cq.Material("mat2")
+)  # note material assigned here
+
+my_model = CadToDagmc()
+my_model.add_cadquery_object(
+    cadquery_object=assembly,
+    material_tags="assembly_materials",
+)
+my_model.export_dagmc_h5m_file(min_mesh_size=0.5, max_mesh_size=1.0e6)

cad_to_dagmc-0.10.0/examples/surface_mesh/cadquery_assembly_with_names.py

@@ -0,0 +1,18 @@
+# This example makes a CadQuery assembly and assigns names to the parts
+# These part names are then used when exporting to a DAGMC H5M file
+# This avoids needing to specify material tags separately when adding the CadQuery object
+
+
+import cadquery as cq
+from cad_to_dagmc import CadToDagmc
+
+result = cq.Workplane().sphere(5)
+result2 = cq.Workplane().moveTo(10, 0).sphere(2)
+
+assembly = cq.Assembly()
+assembly.add(result, name="result")
+assembly.add(result2, name="result2")
+
+my_model = CadToDagmc()
+my_model.add_cadquery_object(cadquery_object=assembly, material_tags="assembly_names")
+my_model.export_dagmc_h5m_file(min_mesh_size=0.5, max_mesh_size=1.0e6)

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/examples/surface_mesh/cadquery_assembly_with_scaled_geometry.py

@@ -11,4 +11,6 @@ assembly.add(result2)
 my_model = CadToDagmc()
 my_model.add_cadquery_object(cadquery_object=assembly, material_tags=["mat1", "mat2"])
 # scales geometry to makie it 10 times bigger
-my_model.export_dagmc_h5m_file(min_mesh_size=0.5, max_mesh_size=1.0e6, scale_factor=10.0)
+my_model.export_dagmc_h5m_file(
+    min_mesh_size=0.5, max_mesh_size=1.0e6, scale_factor=10.0
+)

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/examples/surface_mesh/cadquery_compound.py

@@ -17,12 +17,19 @@ r = s.lineTo(3.0, 0).lineTo(3.0, 1.0).spline(spline_points, includeCurrent=True)
 cq_shape_1 = r.extrude(-1)
 
 s2 = cq.Workplane("XY")
-r2 = s2.lineTo(3.0, 0).lineTo(3.0, 1.0).spline(spline_points, includeCurrent=True).close()
+r2 = (
+    s2.lineTo(3.0, 0)
+    .lineTo(3.0, 1.0)
+    .spline(spline_points, includeCurrent=True)
+    .close()
+)
 cq_shape_2 = r2.extrude(1)
 
 
 compound_of_shapes = cq.Compound.makeCompound([cq_shape_1.val(), cq_shape_2.val()])
 
 my_model = CadToDagmc()
-my_model.add_cadquery_object(cadquery_object=compound_of_shapes, material_tags=["mat1", "mat2"])
+my_model.add_cadquery_object(
+    cadquery_object=compound_of_shapes, material_tags=["mat1", "mat2"]
+)
 my_model.export_dagmc_h5m_file(max_mesh_size=0.2, min_mesh_size=0.1)

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/examples/surface_mesh/multiple_cadquery_objects.py

@@ -8,5 +8,7 @@ box_with_round_corners = cq.Workplane("XY").box(2, 1, 1)
 
 my_model = CadToDagmc()
 my_model.add_cadquery_object(cadquery_object=box, material_tags=["mat1"])
-my_model.add_cadquery_object(cadquery_object=box_with_round_corners, material_tags=["mat2"])
+my_model.add_cadquery_object(
+    cadquery_object=box_with_round_corners, material_tags=["mat2"]
+)
 my_model.export_dagmc_h5m_file()

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/examples/surface_mesh/single_stp_file.py

@@ -12,7 +12,12 @@ spline_points = [
     (0.5, 1.0),
     (0, 1.0),
 ]
-r = result.lineTo(3.0, 0).lineTo(3.0, 1.0).spline(spline_points, includeCurrent=True).close()
+r = (
+    result.lineTo(3.0, 0)
+    .lineTo(3.0, 1.0)
+    .spline(spline_points, includeCurrent=True)
+    .close()
+)
 result = r.extrude(1.5)
 assembly = cq.Assembly()
 assembly.add(result)

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/examples/unstrucutred_volume_mesh/curved_cadquery_object_to_dagmc_volume_mesh.py

@@ -59,4 +59,6 @@ my_model = CadToDagmc()
 my_model.add_cadquery_object(result, material_tags=["mat1"])
 my_model.add_cadquery_object(result2, material_tags=["mat2"])
 
-my_model.export_unstructured_mesh_file(filename="umesh.vtk", max_mesh_size=1, min_mesh_size=0.1)
+my_model.export_unstructured_mesh_file(
+    filename="umesh.vtk", max_mesh_size=1, min_mesh_size=0.1
+)

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py

@@ -65,5 +65,7 @@ umesh_from_sp = sp.meshes[1]
 centroids = umesh_from_sp.centroids
 mesh_vols = umesh_from_sp.volumes
 
-flux_mean = tally_result.get_values(scores=["flux"], value="mean").reshape(umesh_from_sp.dimension)
+flux_mean = tally_result.get_values(scores=["flux"], value="mean").reshape(
+    umesh_from_sp.dimension
+)
 umesh_from_sp.write_data_to_vtk(filename="tally.vtk", datasets={"mean": flux_mean})

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/pyproject.toml

@@ -20,9 +20,10 @@ classifiers = [
 dependencies = [
     "trimesh",
     "networkx",
-    "cadquery>=2.5.2",
+    "cadquery>=2.6.0",
     "numpy",
     "gmsh",
+    "cadquery_direct_mesh_plugin>=0.1.0"
 # TODO once on pypi include moab here and remove from CI
 # python -m pip install --extra-index-url https://shimwell.github.io/wheels moab
 ]

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/src/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.9.8'
-__version_tuple__ = version_tuple = (0, 9, 8)
+__version__ = version = '0.10.0'
+__version_tuple__ = version_tuple = (0, 10, 0)
 
-__commit_id__ = commit_id = 'g00e5e76df'
+__commit_id__ = commit_id = 'g9c4662166'

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/src/cad_to_dagmc/__init__.py

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

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/src/cad_to_dagmc/core.py

@@ -9,7 +9,7 @@ import tempfile
 import warnings
 from typing import Iterable
 from cad_to_dagmc import __version__
-from .direct_mesh_plugin import to_mesh
+import cadquery_direct_mesh_plugin
 
 
 def define_moab_core_and_tags() -> tuple[core.Core, dict]:
@@ -89,7 +89,11 @@ def vertices_to_h5m(
         raise ValueError(msg)
 
     # limited attribute checking to see if user passed in a list of CadQuery vectors
-    if hasattr(vertices[0], "x") and hasattr(vertices[0], "y") and hasattr(vertices[0], "z"):
+    if (
+        hasattr(vertices[0], "x")
+        and hasattr(vertices[0], "y")
+        and hasattr(vertices[0], "z")
+    ):
         vertices_floats = []
         for vert in vertices:
             vertices_floats.append((vert.x, vert.y, vert.z))
@@ -142,7 +146,9 @@ def vertices_to_h5m(
                 if len(face_ids_with_solid_ids[face_id]) == 2:
                     other_solid_id = face_ids_with_solid_ids[face_id][1]
                     other_volume_set = volume_sets_by_solid_id[other_solid_id]
-                    sense_data = np.array([other_volume_set, volume_set], dtype="uint64")
+                    sense_data = np.array(
+                        [other_volume_set, volume_set], dtype="uint64"
+                    )
                 else:
                     sense_data = np.array([volume_set, 0], dtype="uint64")
 
@@ -233,7 +239,9 @@ def get_volumes(gmsh, assembly, method="file", scale_factor=1.0):
 
     if scale_factor != 1.0:
         dim_tags = gmsh.model.getEntities(3)
-        gmsh.model.occ.dilate(dim_tags, 0.0, 0.0, 0.0, scale_factor, scale_factor, scale_factor)
+        gmsh.model.occ.dilate(
+            dim_tags, 0.0, 0.0, 0.0, scale_factor, scale_factor, scale_factor
+        )
         # update the model to ensure the scaling factor has been applied
         gmsh.model.occ.synchronize()
 
@@ -298,7 +306,9 @@ def set_sizes_for_mesh(
                 )
 
         # Step 1: Preprocess boundaries to find shared surfaces and decide mesh sizes
-        boundary_sizes = {}  # Dictionary to store the mesh size and count for each boundary
+        boundary_sizes = (
+            {}
+        )  # Dictionary to store the mesh size and count for each boundary
         for volume_id, size in set_size.items():
             boundaries = gmsh.model.getBoundary(
                 [(3, volume_id)], recursive=True
@@ -373,7 +383,8 @@ def mesh_to_vertices_and_triangles(
             for nodeTag in nodeTags:
                 shifted_node_tags.append(nodeTag - 1)
             grouped_node_tags = [
-                shifted_node_tags[i : i + n] for i in range(0, len(shifted_node_tags), n)
+                shifted_node_tags[i : i + n]
+                for i in range(0, len(shifted_node_tags), n)
             ]
             nodes_in_each_surface[surface] = grouped_node_tags
         triangles_by_solid_by_face[vol_id] = nodes_in_each_surface
@@ -583,14 +594,18 @@ class CadToDagmc:
             scaled_part = part
         else:
             scaled_part = part.scale(scale_factor)
-        return self.add_cadquery_object(cadquery_object=scaled_part, material_tags=material_tags)
+        return self.add_cadquery_object(
+            cadquery_object=scaled_part, material_tags=material_tags
+        )
 
     def add_cadquery_object(
         self,
         cadquery_object: (
-            cq.assembly.Assembly | cq.occ_impl.shapes.Compound | cq.occ_impl.shapes.Solid
+            cq.assembly.Assembly
+            | cq.occ_impl.shapes.Compound
+            | cq.occ_impl.shapes.Solid
         ),
-        material_tags: list[str] | None,
+        material_tags: list[str] | str,
         scale_factor: float = 1.0,
     ) -> int:
         """Loads the parts from CadQuery object into the model.
@@ -612,18 +627,53 @@ class CadToDagmc:
             int: number of volumes in the stp file.
         """
 
+        if isinstance(material_tags, str) and material_tags not in [
+            "assembly_materials",
+            "assembly_names",
+        ]:
+            raise ValueError(
+                f"If material_tags is a string it must be 'assembly_materials' or 'assembly_names' but got {material_tags}"
+            )
+
         if isinstance(cadquery_object, cq.assembly.Assembly):
-            cadquery_object = cadquery_object.toCompound()
+            # look for materials in each part of the assembly
+            if material_tags == "assembly_materials":
+                material_tags = []
+                for child in _get_all_leaf_children(cadquery_object):
+                    if child.material is not None and child.material.name is not None:
+                        material_tags.append(str(child.material.name))
+                    else:
+                        raise ValueError(
+                            f"Not all parts in the assembly have materials assigned.\n"
+                            f"When adding to an assembly include material=cadquery.Material('material_name')\n"
+                            f"Missing material tag for child: {child}.\n"
+                            "Please assign material tags to all parts or provide material_tags argument when adding the assembly.\n"
+                        )
+                print("material_tags found from assembly materials:", material_tags)
+            elif material_tags == "assembly_names":
+                material_tags = []
+                for child in _get_all_leaf_children(cadquery_object):
+                    # parts always have a name as cq will auto assign one
+                    material_tags.append(child.name)
+                print("material_tags found from assembly names:", material_tags)
+
+            cadquery_compound = cadquery_object.toCompound()
+        else:
+            cadquery_compound = cadquery_object
 
-        if isinstance(cadquery_object, (cq.occ_impl.shapes.Compound, cq.occ_impl.shapes.Solid)):
-            iterable_solids = cadquery_object.Solids()
+        if isinstance(
+            cadquery_compound, (cq.occ_impl.shapes.Compound, cq.occ_impl.shapes.Solid)
+        ):
+            iterable_solids = cadquery_compound.Solids()
         else:
-            iterable_solids = cadquery_object.val().Solids()
+            iterable_solids = cadquery_compound.val().Solids()
 
         if scale_factor == 1.0:
             scaled_iterable_solids = iterable_solids
         else:
-            scaled_iterable_solids = [part.scale(scale_factor) for part in iterable_solids]
+            scaled_iterable_solids = [
+                part.scale(scale_factor) for part in iterable_solids
+            ]
 
         check_material_tags(material_tags, scaled_iterable_solids)
         if material_tags:
@@ -724,7 +774,9 @@ class CadToDagmc:
             gmsh.model.occ.synchronize()
             # Clear the mesh
             gmsh.model.mesh.clear()
-            gmsh.option.setNumber("Mesh.SaveElementTagType", 3)  # Save only volume elements
+            gmsh.option.setNumber(
+                "Mesh.SaveElementTagType", 3
+            )  # Save only volume elements
 
         gmsh.model.mesh.generate(3)
 
@@ -795,7 +847,9 @@ class CadToDagmc:
 
         gmsh = init_gmsh()
 
-        gmsh, _ = get_volumes(gmsh, imprinted_assembly, method=method, scale_factor=scale_factor)
+        gmsh, _ = get_volumes(
+            gmsh, imprinted_assembly, method=method, scale_factor=scale_factor
+        )
 
         gmsh = set_sizes_for_mesh(
             gmsh=gmsh,
@@ -996,8 +1050,7 @@ class CadToDagmc:
         if meshing_backend == "cadquery":
 
             # Mesh the assembly using CadQuery's direct-mesh plugin
-            cq_mesh = to_mesh(
-                assembly,
+            cq_mesh = assembly.toMesh(
                 imprint=imprint,
                 tolerance=tolerance,
                 angular_tolerance=angular_tolerance,
@@ -1006,9 +1059,13 @@ class CadToDagmc:
 
             # 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"]
+                imprinted_solids_with_org_id = cq_mesh[
+                    "imprinted_solids_with_orginal_ids"
+                ]
 
-                scrambled_ids = get_ids_from_imprinted_assembly(imprinted_solids_with_org_id)
+                scrambled_ids = get_ids_from_imprinted_assembly(
+                    imprinted_solids_with_org_id
+                )
 
                 material_tags_in_brep_order = order_material_ids_by_brep_order(
                     original_ids, scrambled_ids, self.material_tags
@@ -1026,11 +1083,13 @@ class CadToDagmc:
             # If assembly is not to be imprinted, pass through the assembly as-is
             if imprint:
                 print("Imprinting assembly for mesh generation")
-                imprinted_assembly, imprinted_solids_with_org_id = cq.occ_impl.assembly.imprint(
-                    assembly
+                imprinted_assembly, imprinted_solids_with_org_id = (
+                    cq.occ_impl.assembly.imprint(assembly)
                 )
 
-                scrambled_ids = get_ids_from_imprinted_assembly(imprinted_solids_with_org_id)
+                scrambled_ids = get_ids_from_imprinted_assembly(
+                    imprinted_solids_with_org_id
+                )
 
                 material_tags_in_brep_order = order_material_ids_by_brep_order(
                     original_ids, scrambled_ids, self.material_tags
@@ -1090,7 +1149,9 @@ class CadToDagmc:
                 gmsh.model.removePhysicalGroups([entry])
 
             gmsh.model.mesh.generate(3)
-            gmsh.option.setNumber("Mesh.SaveElementTagType", 3)  # Save only volume elements
+            gmsh.option.setNumber(
+                "Mesh.SaveElementTagType", 3
+            )  # Save only volume elements
             gmsh.write(umesh_filename)
 
             gmsh.finalize()
@@ -1098,3 +1159,13 @@ class CadToDagmc:
             return dagmc_filename, umesh_filename
         else:
             return dagmc_filename
+
+
+def _get_all_leaf_children(assembly):
+    """Recursively yield all leaf children (parts, not assemblies) from a CadQuery assembly."""
+    for child in assembly.children:
+        # If the child is itself an assembly, recurse
+        if hasattr(child, "children") and len(child.children) > 0:
+            yield from _get_all_leaf_children(child)
+        else:
+            yield child

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/src/cad_to_dagmc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.8
+Version: 0.10.0
 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
@@ -14,9 +14,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: trimesh
 Requires-Dist: networkx
-Requires-Dist: cadquery>=2.5.2
+Requires-Dist: cadquery>=2.6.0
 Requires-Dist: numpy
 Requires-Dist: gmsh
+Requires-Dist: cadquery_direct_mesh_plugin>=0.1.0
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: vtk; extra == "tests"

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/src/cad_to_dagmc.egg-info/SOURCES.txt

@@ -3,13 +3,14 @@ CITATION.cff
 LICENSE
 README.md
 pyproject.toml
-.github/workflows/black.yml
 .github/workflows/ci_with_benchmarks.yml
 .github/workflows/ci_with_conda_install.yml
 .github/workflows/ci_with_pip_install.yml
 .github/workflows/python-publish.yml
 examples/surface_and_unstructured_mesh/unstructured_mesh_with_conformal_surface_mesh.py
 examples/surface_mesh/cadquery_assembly.py
+examples/surface_mesh/cadquery_assembly_with_materials.py
+examples/surface_mesh/cadquery_assembly_with_names.py
 examples/surface_mesh/cadquery_assembly_with_scaled_geometry.py
 examples/surface_mesh/cadquery_compound.py
 examples/surface_mesh/cadquery_object_and_stp_file.py
@@ -31,7 +32,6 @@ examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.
 src/_version.py
 src/cad_to_dagmc/__init__.py
 src/cad_to_dagmc/core.py
-src/cad_to_dagmc/direct_mesh_plugin.py
 src/cad_to_dagmc.egg-info/PKG-INFO
 src/cad_to_dagmc.egg-info/SOURCES.txt
 src/cad_to_dagmc.egg-info/dependency_links.txt
@@ -47,10 +47,13 @@ tests/single_cube.stp
 tests/single_volume_thin.stp
 tests/single_volume_thin.vtk
 tests/tagged_mesh.msh
+tests/test_assembly_with_materials.py
+tests/test_assembly_with_names.py
 tests/test_brep_file.brep
 tests/test_file_creation.py
 tests/test_get_volumes.py
 tests/test_h5m_in_transport.py
+tests/test_invalid_material_tags_string.py
 tests/test_kwarg_args.py
 tests/test_loading_from_file_vs_shape_object.py
 tests/test_mesh_to_dagmc.py

{cad_to_dagmc-0.9.8 → cad_to_dagmc-0.10.0}/src/cad_to_dagmc.egg-info/requires.txt

@@ -1,8 +1,9 @@
 trimesh
 networkx
-cadquery>=2.5.2
+cadquery>=2.6.0
 numpy
 gmsh
+cadquery_direct_mesh_plugin>=0.1.0
 
 [tests]
 pytest

cad_to_dagmc-0.10.0/tests/test_assembly_with_materials.py

@@ -0,0 +1,91 @@
+import tempfile
+import cadquery as cq
+from cad_to_dagmc import CadToDagmc
+from pathlib import Path
+import pytest
+from test_python_api import get_volumes_and_materials_from_h5m
+
+
+def test_cadquery_assembly_with_materials():
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+
+        result = cq.Workplane().sphere(5)
+        result2 = cq.Workplane().moveTo(10, 0).sphere(2)
+
+        assembly = cq.Assembly()
+        assembly.add(
+            result, name="result", material=cq.Material("diamond")
+        )  # note material assigned here
+        assembly.add(
+            result2, name="result2", material=cq.Material("gold")
+        )  # note material assigned here
+
+        my_model = CadToDagmc()
+        # note that material tags are not needed here
+        my_model.add_cadquery_object(
+            cadquery_object=assembly, material_tags="assembly_materials"
+        )
+        test_h5m_filename = my_model.export_dagmc_h5m_file(
+            min_mesh_size=0.5, max_mesh_size=1.0e6
+        )
+
+        assert Path(test_h5m_filename).is_file()
+
+        assert get_volumes_and_materials_from_h5m(test_h5m_filename) == {
+            1: "mat:diamond",
+            2: "mat:gold",
+        }
+
+
+def test_assembly_missing_material_tag_raises():
+    # Create two parts, only one with a material
+    result = cq.Workplane().sphere(5)
+    result2 = cq.Workplane().moveTo(10, 0).sphere(2)
+
+    assembly = cq.Assembly()
+    assembly.add(result, name="result", material=cq.Material("diamond"))
+    assembly.add(result2, name="result2")  # No material assigned
+
+    my_model = CadToDagmc()
+    # Should raise ValueError when adding the assembly
+    with pytest.raises(ValueError) as excinfo:
+        my_model.add_cadquery_object(
+            cadquery_object=assembly, material_tags="assembly_materials"
+        )
+    # Check error message is informative
+    assert "Not all parts in the assembly have materials assigned" in str(excinfo.value)
+
+
+def test_cadquery_assembly_with_nested_assembly():
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+
+        result = cq.Workplane().sphere(5)
+        result2 = cq.Workplane().moveTo(10, 0).sphere(2)
+        result3 = cq.Workplane().moveTo(-10, 0).sphere(2)
+
+        assembly = cq.Assembly()
+        assembly.add(result, name="result", material=cq.Material("diamond"))
+        assembly.add(result2, name="result2", material=cq.Material("gold"))
+
+        assembly2 = cq.Assembly()
+        assembly2.add(assembly, name="assembly1")
+        assembly2.add(result3, name="result3", material=cq.Material("silver"))
+
+        my_model = CadToDagmc()
+        # note that material tags are not needed here
+        my_model.add_cadquery_object(
+            cadquery_object=assembly2, material_tags="assembly_materials"
+        )
+        test_h5m_filename = my_model.export_dagmc_h5m_file(
+            min_mesh_size=0.5, max_mesh_size=1.0e6
+        )
+
+        assert Path(test_h5m_filename).is_file()
+
+        assert get_volumes_and_materials_from_h5m(test_h5m_filename) == {
+            1: "mat:diamond",
+            2: "mat:gold",
+            3: "mat:silver",
+        }