cad-to-dagmc 0.9.7__tar.gz → 0.9.9__tar.gz

{cad_to_dagmc-0.9.7 → cad_to_dagmc-0.9.9}/.github/workflows/ci_with_conda_install.yml

@@ -74,6 +74,7 @@ jobs:
           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 +86,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.7 → cad_to_dagmc-0.9.9}/.github/workflows/ci_with_pip_install.yml

@@ -40,17 +40,21 @@ 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_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 +66,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.7 → cad_to_dagmc-0.9.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.7
+Version: 0.9.9
 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

cad_to_dagmc-0.9.9/examples/surface_mesh/cadquery_assembly_with_materials.py

@@ -0,0 +1,20 @@
+# 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
+)  # note that material tags are not needed here
+my_model.export_dagmc_h5m_file(min_mesh_size=0.5, max_mesh_size=1.0e6)

{cad_to_dagmc-0.9.7 → cad_to_dagmc-0.9.9}/src/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.9.7'
-__version_tuple__ = version_tuple = (0, 9, 7)
+__version__ = version = '0.9.9'
+__version_tuple__ = version_tuple = (0, 9, 9)
 
-__commit_id__ = commit_id = 'g7b0ab5bff'
+__commit_id__ = commit_id = 'g72b88f255'

{cad_to_dagmc-0.9.7 → cad_to_dagmc-0.9.9}/src/cad_to_dagmc/core.py

@@ -106,6 +106,9 @@ def vertices_to_h5m(
 
     moab_core, tags = define_moab_core_and_tags()
 
+    # Add the vertices once at the start
+    all_moab_verts = moab_core.create_vertices(vertices)
+
     volume_sets_by_solid_id = {}
     for material_tag, (solid_id, triangles_on_each_face) in zip(
         material_tags, triangles_by_solid_by_face.items()
@@ -145,14 +148,21 @@ def vertices_to_h5m(
 
                 moab_core.tag_set_data(tags["surf_sense"], face_set, sense_data)
 
-                moab_verts = moab_core.create_vertices(vertices)
+                # Collect only the vertices that lie on triangles on this face
+                face_vertices_set = set()
+                for triangle in triangles_on_face:
+                    face_vertices_set.update(triangle)
+                face_vertices_list = sorted(face_vertices_set)
+
+                # Only add these to the MOAB face
+                moab_verts = [all_moab_verts[ii] for ii in face_vertices_list]
                 moab_core.add_entity(face_set, moab_verts)
 
                 for triangle in triangles_on_face:
                     tri = (
-                        moab_verts[int(triangle[0])],
-                        moab_verts[int(triangle[1])],
-                        moab_verts[int(triangle[2])],
+                        all_moab_verts[int(triangle[0])],
+                        all_moab_verts[int(triangle[1])],
+                        all_moab_verts[int(triangle[2])],
                     )
 
                     moab_triangle = moab_core.create_element(types.MBTRI, tri)
@@ -580,7 +590,7 @@ class CadToDagmc:
         cadquery_object: (
             cq.assembly.Assembly | cq.occ_impl.shapes.Compound | cq.occ_impl.shapes.Solid
         ),
-        material_tags: list[str] | None,
+        material_tags: list[str] | None = None,
         scale_factor: float = 1.0,
     ) -> int:
         """Loads the parts from CadQuery object into the model.
@@ -603,18 +613,36 @@ class CadToDagmc:
         """
 
         if isinstance(cadquery_object, cq.assembly.Assembly):
-            cadquery_object = cadquery_object.toCompound()
+            # look for materials in each part of the assembly
+            if material_tags is None:
+                material_tags = []
+                for child in cadquery_object.children:
+                    if child.material is not None and child.material.name is not None:
+                        material_tags.append(child.material.name)
+                    else:
+                        raise ValueError(
+                            f"Not all parts in the assembly have material tags assigned. "
+                            f"Missing material tag for child: {child}. "
+                            "Please assign material tags to all parts or provide material_tags argument when adding the assembly."
+                        )
+
+            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]
 
+        # look for materials in the
+        # if material_tags is None:
+
         check_material_tags(material_tags, scaled_iterable_solids)
         if material_tags:
             self.material_tags = self.material_tags + material_tags

{cad_to_dagmc-0.9.7 → cad_to_dagmc-0.9.9}/src/cad_to_dagmc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.7
+Version: 0.9.9
 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

{cad_to_dagmc-0.9.7 → cad_to_dagmc-0.9.9}/src/cad_to_dagmc.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ pyproject.toml
 .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_scaled_geometry.py
 examples/surface_mesh/cadquery_compound.py
 examples/surface_mesh/cadquery_object_and_stp_file.py
@@ -47,6 +48,7 @@ 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_brep_file.brep
 tests/test_file_creation.py
 tests/test_get_volumes.py

cad_to_dagmc-0.9.9/tests/test_assembly_with_materials.py

@@ -0,0 +1,52 @@
+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()
+        my_model.add_cadquery_object(
+            cadquery_object=assembly
+        )  # note that material tags are not needed here
+        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)
+    # Check error message is informative
+    assert "material tags" in str(excinfo.value)