cad-to-dagmc 0.7.2__tar.gz → 0.7.4__tar.gz

{cad_to_dagmc-0.7.2 → cad_to_dagmc-0.7.4}/.github/workflows/ci_with_conda_install.yml

@@ -62,3 +62,4 @@ jobs:
           python examples/surface_mesh/from_gmsh_mesh_file.py
           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/surface_mesh/cadquery_assembly_with_scaled_geometry.py

{cad_to_dagmc-0.7.2 → cad_to_dagmc-0.7.4}/.github/workflows/ci_with_pip_install.yml

@@ -58,3 +58,4 @@ jobs:
           python examples/surface_mesh/from_gmsh_mesh_file.py
           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/surface_mesh/cadquery_assembly_with_scaled_geometry.py

{cad_to_dagmc-0.7.2 → cad_to_dagmc-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cad_to_dagmc
-Version: 0.7.2
+Version: 0.7.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

{cad_to_dagmc-0.7.2 → cad_to_dagmc-0.7.4}/examples/surface_mesh/cadquery_assembly.py

@@ -10,4 +10,4 @@ assembly.add(result2)
 
 my_model = CadToDagmc()
 my_model.add_cadquery_object(cadquery_object=assembly, material_tags=["mat1", "mat2"])
-my_model.export_dagmc_h5m_file(min_mesh_size=0.5, max_mesh_size=1.0)
+my_model.export_dagmc_h5m_file(min_mesh_size=0.5, max_mesh_size=1.0e6)

cad_to_dagmc-0.7.4/examples/surface_mesh/cadquery_assembly_with_scaled_geometry.py

@@ -0,0 +1,14 @@
+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)
+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)

{cad_to_dagmc-0.7.2 → cad_to_dagmc-0.7.4}/examples/unstrucutred_volume_mesh/curved_cadquery_object_to_dagmc_volume_mesh.py

@@ -59,4 +59,4 @@ 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.h5m", 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.7.2 → cad_to_dagmc-0.7.4}/examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py

@@ -1,4 +1,4 @@
-# script assumes that "umesh.h5m" has been created by
+# script assumes that "umesh.vtk" has been created by
 # curved_cadquery_object_to_dagmc_volume_mesh.py has been
 
 import openmc
@@ -14,7 +14,7 @@ with open("cross_sections.xml", "w") as file:
     )
 openmc.config["cross_sections"] = "cross_sections.xml"
 
-umesh = openmc.UnstructuredMesh("umesh.h5m", library="moab")
+umesh = openmc.UnstructuredMesh("umesh.vtk", library="moab")
 mesh_filter = openmc.MeshFilter(umesh)
 tally = openmc.Tally(name="unstrucutred_mesh_tally")
 tally.filters = [mesh_filter]

{cad_to_dagmc-0.7.2 → cad_to_dagmc-0.7.4}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.7.2'
-__version_tuple__ = version_tuple = (0, 7, 2)
+__version__ = version = '0.7.4'
+__version_tuple__ = version_tuple = (0, 7, 4)

{cad_to_dagmc-0.7.2 → cad_to_dagmc-0.7.4}/src/cad_to_dagmc/core.py

@@ -1,7 +1,8 @@
+from pathlib import Path
 import cadquery as cq
 import gmsh
 import numpy as np
-from cadquery import importers, exporters
+from cadquery import importers
 from pymoab import core, types
 import tempfile
 
@@ -190,16 +191,27 @@ def _vertices_to_h5m(
     return h5m_filename
 
 
-def get_volumes(gmsh, assembly, method="file"):
+def get_volumes(gmsh, assembly, method="file", scale_factor=1.0):
 
     if method == "in memory":
         volumes = gmsh.model.occ.importShapesNativePointer(assembly.wrapped._address())
-        gmsh.model.occ.synchronize()
+
     elif method == "file":
-        with tempfile.NamedTemporaryFile(suffix=".step") as temp_file:
-            exporters.export(assembly, temp_file.name)
+        with tempfile.NamedTemporaryFile(suffix=".brep") as temp_file:
+            if isinstance(assembly, cq.Assembly):
+                assembly.toCompound().exportBrep(temp_file.name)
+            else:
+                assembly.exportBrep(temp_file.name)
             volumes = gmsh.model.occ.importShapes(temp_file.name)
-            gmsh.model.occ.synchronize()
+
+    # updating the model to ensure the entities in the geometry are found
+    gmsh.model.occ.synchronize()
+
+    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)
+        # update the model to ensure the scaling factor has been applied
+        gmsh.model.occ.synchronize()
 
     return gmsh, volumes
 
@@ -239,6 +251,7 @@ def _mesh_brep(
     gmsh.option.setNumber("Mesh.Algorithm", mesh_algorithm)
     gmsh.option.setNumber("Mesh.MeshSizeMin", min_mesh_size)
     gmsh.option.setNumber("Mesh.MeshSizeMax", max_mesh_size)
+    gmsh.option.setNumber("General.NumThreads", 0)  # Use all available cores
     gmsh.model.mesh.generate(dimensions)
 
     return gmsh
@@ -472,12 +485,48 @@ class CadToDagmc:
 
     def export_unstructured_mesh_file(
         self,
-        filename: str = "umesh.h5m",
+        filename: str = "umesh.vtk",
         min_mesh_size: float = 1,
         max_mesh_size: float = 5,
         mesh_algorithm: int = 1,
         method: str = "file",
+        scale_factor: float = 1.0,
     ):
+        """
+        Exports an unstructured mesh file in VTK format for use with openmc.UnstructuredMesh.
+        Compatible with the MOAB unstructured mesh library. Example useage
+        openmc.UnstructuredMesh(filename="umesh.vtk", library="moab")
+
+        Parameters:
+        -----------
+            filename : str, optional
+                The name of the output file. Default is "umesh.vtk".
+            min_mesh_size: the minimum mesh element size to use in Gmsh. Passed
+                into gmsh.option.setNumber("Mesh.MeshSizeMin", min_mesh_size)
+            max_mesh_size: the maximum mesh element size to use in Gmsh. Passed
+                into gmsh.option.setNumber("Mesh.MeshSizeMax", max_mesh_size)
+            mesh_algorithm: The Gmsh mesh algorithm number to use. Passed into
+                gmsh.option.setNumber("Mesh.Algorithm", mesh_algorithm)
+            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
+
+        Returns:
+        --------
+            gmsh : gmsh
+                The gmsh object after finalizing the mesh.
+        """
+
+        if Path(filename).suffix != ".vtk":
+            raise ValueError("Unstructured mesh filename must have a .vtk extension")
 
         assembly = cq.Assembly()
         for part in self.parts:
@@ -487,7 +536,7 @@ class CadToDagmc:
 
         gmsh = init_gmsh()
 
-        gmsh, _ = get_volumes(gmsh, imprinted_assembly, method=method)
+        gmsh, _ = get_volumes(gmsh, imprinted_assembly, method=method, scale_factor=scale_factor)
 
         gmsh = _mesh_brep(
             gmsh=gmsh,
@@ -497,12 +546,9 @@ class CadToDagmc:
             dimensions=3,
         )
 
-        # gmesh writes out a vtk file that is converted by pymoab into a h5 file
-        gmsh.write(filename + ".vtk")
-
-        moab_core = core.Core()
-        moab_core.load_file(filename + ".vtk")
-        moab_core.write_file(filename)
+        # gmesh writes out a vtk file that is accepted by openmc.UnstructuredMesh
+        # The library argument must be set to "moab"
+        gmsh.write(filename)
 
         gmsh.finalize()
 
@@ -516,6 +562,7 @@ class CadToDagmc:
         mesh_algorithm: int = 1,
         dimensions: int = 2,
         method: str = "file",
+        scale_factor: float = 1.0,
     ):
         """Saves a GMesh msh file of the geometry in either 2D surface mesh or
         3D volume mesh.
@@ -535,6 +582,9 @@ class CadToDagmc:
                 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
         """
 
         assembly = cq.Assembly()
@@ -545,7 +595,7 @@ class CadToDagmc:
 
         gmsh = init_gmsh()
 
-        gmsh, _ = get_volumes(gmsh, imprinted_assembly, method=method)
+        gmsh, _ = get_volumes(gmsh, imprinted_assembly, method=method, scale_factor=scale_factor)
 
         gmsh = _mesh_brep(
             gmsh=gmsh,
@@ -569,6 +619,7 @@ class CadToDagmc:
         mesh_algorithm: int = 1,
         implicit_complement_material_tag: str | None = None,
         method: str = "file",
+        scale_factor: float = 1.0,
     ) -> str:
         """Saves a DAGMC h5m file of the geometry
 
@@ -589,6 +640,10 @@ class CadToDagmc:
                 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
+
         Returns:
             str: the DAGMC filename saved
         """
@@ -617,7 +672,9 @@ class CadToDagmc:
 
         gmsh = init_gmsh()
 
-        gmsh, volumes = get_volumes(gmsh, imprinted_assembly, method=method)
+        gmsh, volumes = get_volumes(
+            gmsh, imprinted_assembly, method=method, scale_factor=scale_factor
+        )
 
         gmsh = _mesh_brep(
             gmsh=gmsh,

{cad_to_dagmc-0.7.2 → cad_to_dagmc-0.7.4}/src/cad_to_dagmc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cad_to_dagmc
-Version: 0.7.2
+Version: 0.7.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

{cad_to_dagmc-0.7.2 → cad_to_dagmc-0.7.4}/src/cad_to_dagmc.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ pyproject.toml
 .github/workflows/ci_with_pip_install.yml
 .github/workflows/python-publish.yml
 examples/surface_mesh/cadquery_assembly.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
 examples/surface_mesh/cadquery_text.py