cad-to-dagmc 0.7.6__tar.gz → 0.8.0__tar.gz

{cad_to_dagmc-0.7.6 → cad_to_dagmc-0.8.0}/.github/workflows/ci_with_conda_install.yml

@@ -21,45 +21,57 @@ on:
 jobs:
   testing:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: install non pypi dependencies
-        shell: bash
+      - name: Install system packages
         run: |
-          wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
-          bash Miniforge3.sh -b -p "${HOME}/conda"
-          source "${HOME}/conda/etc/profile.d/conda.sh"
-          source "${HOME}/conda/etc/profile.d/mamba.sh"
-          sudo apt-get --allow-releaseinfo-change update
           sudo apt-get update -y
           sudo apt-get upgrade -y
           sudo apt-get install -y libgl1 libglx-mesa0 libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0
-          mamba activate
-          mamba create -y --name cad_to_dagmc python=${{ matrix.python-version }}
-          mamba activate cad_to_dagmc
-          mamba install -y -c conda-forge "openmc=0.15.0=dagmc*nompi*" trimesh networkx cadquery gmsh python-gmsh
-          python -m ensurepip --upgrade
-          python -m pip install . --no-deps
+
+      - name: Set up Conda
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: ci-env
+          miniforge-version: latest
+          channels: conda-forge
+
+      - name: install dependencies
+        shell: bash -l {0}
+        run: |
+          conda install -y -c conda-forge "openmc=0.15.0=dagmc*nompi*" trimesh networkx cadquery gmsh python-gmsh vtk
+          python -m pip install .[tests]
+
+      - name: Test import
+        shell: bash -l {0}
+        run: |
           python -c "import cad_to_dagmc"
-          mamba install -y -c conda-forge pytest vtk
-          python -m pip install .[tests] --no-deps
+
+      - name: Run tests
+        shell: bash -l {0}
+        run: |
           pytest -v tests
+
+      - name: Run examples
+        shell: bash -l {0}
+        run: |
           python examples/surface_mesh/cadquery_assembly.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/from_gmsh_mesh_file.py
           python examples/surface_mesh/multiple_cadquery_objects.py
           python examples/surface_mesh/multiple_stp_files.py
-          python examples/surface_mesh/single_stp_file_multiple_volumes.py
           python examples/surface_mesh/single_cadquery_object.py
+          python examples/surface_mesh/single_stp_file_multiple_volumes.py
           python examples/surface_mesh/single_stp_file.py
-          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/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

{cad_to_dagmc-0.7.6 → cad_to_dagmc-0.8.0}/.github/workflows/ci_with_pip_install.yml

@@ -58,4 +58,6 @@ 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/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

{cad_to_dagmc-0.7.6 → cad_to_dagmc-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: cad_to_dagmc
-Version: 0.7.6
+Version: 0.8.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,8 +14,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: trimesh
 Requires-Dist: networkx
-Requires-Dist: cadquery>=2.4.0
-Requires-Dist: numpy<=1.26.4
+Requires-Dist: cadquery>=2.5.2
+Requires-Dist: numpy
 Requires-Dist: gmsh
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
@@ -35,23 +35,31 @@ Requires-Dist: vtk; extra == "tests"
 [![PyPI](https://img.shields.io/pypi/v/cad_to_dagmc?color=brightgreen&label=pypi&logo=grebrightgreenen&logoColor=green)](https://pypi.org/project/cad_to_dagmc/)
 
 
-A minimal package that converts CAD geometry to [DAGMC](https://github.com/svalinn/DAGMC/) h5m files
+A minimal package that converts CAD geometry to [DAGMC](https://github.com/svalinn/DAGMC/) (h5m) files, [unstructured mesh](https://docs.openmc.org/en/latest/pythonapi/generated/openmc.UnstructuredMesh.html) files (vtk) and Gmsh (msh) files ready for use in neutronics simulations.
 
-cad-to-dagmc can create:
+cad-to-dagmc can create DAGMC compatible:
 - surface meshes / faceted geometry / triangular meshes
 - unstructured mesh / tetrahedral meshes / volume meshes
 
-cad-to-dagmc can convert:
+cad-to-dagmc can convert the following in to DAGMC compatible meshes:
 - STEP files
 - CadQuery objects (in memory)
+- Gmsh meshes
+
+Cad-to-dagmc offers a wide range of features including.
+- Geometry scaling with ```scale_factor``` argument
+- Model wide mesh size parameters with ```min_mesh_size``` and ```max_mesh_size``` arguments
+- Volume specific mesh sizing parameters with the ```set_size``` argument
+- Parallel meshing to quickly mesh the geometry using multiple CPU cores
+- Imprint and merging of CAD geometry, or disable with the ```imprint``` argument
+- Add geometry from multiple sources ([STEP](http://www.steptools.com/stds/step/) files, [CadQuery](https://cadquery.readthedocs.io) objects and [Gmsh](https://gmsh.info/) meshes)
+- Ability to tag the DAGMC implicit complement material using the ```implicit_complement_material_tag``` argument
+- Selected different Gmesh mesh algorithms (defaults to 1) using the ```mesh_algorithm``` argument
+- 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).
+- Compatible with [Paramak](https://github.com/fusion-energy/paramak) geometry for fusion simulations.
 
-cad-to-dagmc aims to produce DAGMC compatible h5m files from CAD geometry is intended to convert [STEP](http://www.steptools.com/stds/step/) files or [CadQuery](https://cadquery.readthedocs.io) objects to a [DAGMC](https://github.com/svalinn/DAGMC/) compatible h5m file.
-
-The resulting DAGMC geometry can then be used for simulations in [OpenMC](https://github.com/openmc-dev/openmc/) or [other supported codes](https://svalinn.github.io/DAGMC/).
-
-This package is tested with [pytest tests](https://github.com/fusion-energy/cad_to_dagmc/tree/main/tests) and also the DAGMC geometry made with this package is compared to simulation carried out with native constructive solid geometry, see [Model Benchmark Zoo](https://github.com/fusion-energy/model_benchmark_zoo) for more details.
-
-Also checkout these other software projects that also create DAGMC geometry [CAD-to-OpenMC](https://github.com/openmsr/CAD_to_OpenMC), [Stellarmesh](https://github.com/Thea-Energy/stellarmesh) and [Coreform Cubit](https://coreform.com/products/coreform-cubit/)
 
 # Installation options
 
@@ -146,7 +154,7 @@ You may also want to install OpenMC with DAGMC to make use of the h5m geometry f
 
 To install OpenMC you can run ```mamba install -c conda-forge openmc``` however this more specific command makes sure the latest version of OpenMC which contains DAGMC is chosen by conda / mamba
 ```bash
-mamba install -c conda-forge -y "openmc=0.14.0=dagmc*nompi*"
+mamba install -c conda-forge -y "openmc=0.15.0=dagmc*nompi*"
 ```
 
 It might not be possible to install OpenMC and cad-to-dagmc in the same conda/mamba python environment so you may have to create a new conda/mamba environment and install OpenMC there.
@@ -160,15 +168,15 @@ The package requires newer versions of Linux. For example the package does not w
 
 The package requires newer versions of pip. It is recommended to ensure that your version of pip is up to date. This can be done with ```python -m pip install --upgrade pip```
 
-Installing one of the package dependancies (gmsh) with pip appears to result in errors when passing cad objects in memory between cadquery / ocp and gmsh. The default method of passing cad objects is via file so this should not impact most users. The conda install gmsh appears to work fine with in memory passing of cad objects as the version of OCP matches between Gmsh and CadQuery.
+Installing one of the package dependancies (Gmsh) with pip appears to result in errors when passing cad objects in memory between cadquery / ocp and gmsh. The default method of passing cad objects is via file so this should not impact most users. The conda install gmsh appears to work fine with in memory passing of cad objects as the version of OCP matches between Gmsh and CadQuery.
 
 
-# Usage - creation of DAGMC h5m files
+# Usage
 
-For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
+For examples showing creation of DAGMC h5m files, vtk files and usage within OpenMC transport code see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
 
-# Usage - simulation with transport code
+For more examples see the CAD tasks in the [neutronics-workshop](https://github.com/fusion-energy/neutronics-workshop) and [model benchmark zoo](https://github.com/fusion-energy/model_benchmark_zoo)
 
-For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
+# Related software
 
-For more examples see the CAD tasks in the [neutronics-workshop](https://github.com/fusion-energy/neutronics-workshop) and [model benchmark zoo](https://github.com/fusion-energy/model_benchmark_zoo)
+Also checkout these other software projects that also create DAGMC geometry [CAD-to-OpenMC](https://github.com/openmsr/CAD_to_OpenMC), [Stellarmesh](https://github.com/Thea-Energy/stellarmesh) and [Coreform Cubit](https://coreform.com/products/coreform-cubit/).

{cad_to_dagmc-0.7.6 → cad_to_dagmc-0.8.0}/README.md

@@ -12,23 +12,31 @@
 [![PyPI](https://img.shields.io/pypi/v/cad_to_dagmc?color=brightgreen&label=pypi&logo=grebrightgreenen&logoColor=green)](https://pypi.org/project/cad_to_dagmc/)
 
 
-A minimal package that converts CAD geometry to [DAGMC](https://github.com/svalinn/DAGMC/) h5m files
+A minimal package that converts CAD geometry to [DAGMC](https://github.com/svalinn/DAGMC/) (h5m) files, [unstructured mesh](https://docs.openmc.org/en/latest/pythonapi/generated/openmc.UnstructuredMesh.html) files (vtk) and Gmsh (msh) files ready for use in neutronics simulations.
 
-cad-to-dagmc can create:
+cad-to-dagmc can create DAGMC compatible:
 - surface meshes / faceted geometry / triangular meshes
 - unstructured mesh / tetrahedral meshes / volume meshes
 
-cad-to-dagmc can convert:
+cad-to-dagmc can convert the following in to DAGMC compatible meshes:
 - STEP files
 - CadQuery objects (in memory)
+- Gmsh meshes
+
+Cad-to-dagmc offers a wide range of features including.
+- Geometry scaling with ```scale_factor``` argument
+- Model wide mesh size parameters with ```min_mesh_size``` and ```max_mesh_size``` arguments
+- Volume specific mesh sizing parameters with the ```set_size``` argument
+- Parallel meshing to quickly mesh the geometry using multiple CPU cores
+- Imprint and merging of CAD geometry, or disable with the ```imprint``` argument
+- Add geometry from multiple sources ([STEP](http://www.steptools.com/stds/step/) files, [CadQuery](https://cadquery.readthedocs.io) objects and [Gmsh](https://gmsh.info/) meshes)
+- Ability to tag the DAGMC implicit complement material using the ```implicit_complement_material_tag``` argument
+- Selected different Gmesh mesh algorithms (defaults to 1) using the ```mesh_algorithm``` argument
+- 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).
+- Compatible with [Paramak](https://github.com/fusion-energy/paramak) geometry for fusion simulations.
 
-cad-to-dagmc aims to produce DAGMC compatible h5m files from CAD geometry is intended to convert [STEP](http://www.steptools.com/stds/step/) files or [CadQuery](https://cadquery.readthedocs.io) objects to a [DAGMC](https://github.com/svalinn/DAGMC/) compatible h5m file.
-
-The resulting DAGMC geometry can then be used for simulations in [OpenMC](https://github.com/openmc-dev/openmc/) or [other supported codes](https://svalinn.github.io/DAGMC/).
-
-This package is tested with [pytest tests](https://github.com/fusion-energy/cad_to_dagmc/tree/main/tests) and also the DAGMC geometry made with this package is compared to simulation carried out with native constructive solid geometry, see [Model Benchmark Zoo](https://github.com/fusion-energy/model_benchmark_zoo) for more details.
-
-Also checkout these other software projects that also create DAGMC geometry [CAD-to-OpenMC](https://github.com/openmsr/CAD_to_OpenMC), [Stellarmesh](https://github.com/Thea-Energy/stellarmesh) and [Coreform Cubit](https://coreform.com/products/coreform-cubit/)
 
 # Installation options
 
@@ -123,7 +131,7 @@ You may also want to install OpenMC with DAGMC to make use of the h5m geometry f
 
 To install OpenMC you can run ```mamba install -c conda-forge openmc``` however this more specific command makes sure the latest version of OpenMC which contains DAGMC is chosen by conda / mamba
 ```bash
-mamba install -c conda-forge -y "openmc=0.14.0=dagmc*nompi*"
+mamba install -c conda-forge -y "openmc=0.15.0=dagmc*nompi*"
 ```
 
 It might not be possible to install OpenMC and cad-to-dagmc in the same conda/mamba python environment so you may have to create a new conda/mamba environment and install OpenMC there.
@@ -137,15 +145,15 @@ The package requires newer versions of Linux. For example the package does not w
 
 The package requires newer versions of pip. It is recommended to ensure that your version of pip is up to date. This can be done with ```python -m pip install --upgrade pip```
 
-Installing one of the package dependancies (gmsh) with pip appears to result in errors when passing cad objects in memory between cadquery / ocp and gmsh. The default method of passing cad objects is via file so this should not impact most users. The conda install gmsh appears to work fine with in memory passing of cad objects as the version of OCP matches between Gmsh and CadQuery.
+Installing one of the package dependancies (Gmsh) with pip appears to result in errors when passing cad objects in memory between cadquery / ocp and gmsh. The default method of passing cad objects is via file so this should not impact most users. The conda install gmsh appears to work fine with in memory passing of cad objects as the version of OCP matches between Gmsh and CadQuery.
 
 
-# Usage - creation of DAGMC h5m files
+# Usage
 
-For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
+For examples showing creation of DAGMC h5m files, vtk files and usage within OpenMC transport code see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
 
-# Usage - simulation with transport code
+For more examples see the CAD tasks in the [neutronics-workshop](https://github.com/fusion-energy/neutronics-workshop) and [model benchmark zoo](https://github.com/fusion-energy/model_benchmark_zoo)
 
-For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
+# Related software
 
-For more examples see the CAD tasks in the [neutronics-workshop](https://github.com/fusion-energy/neutronics-workshop) and [model benchmark zoo](https://github.com/fusion-energy/model_benchmark_zoo)
+Also checkout these other software projects that also create DAGMC geometry [CAD-to-OpenMC](https://github.com/openmsr/CAD_to_OpenMC), [Stellarmesh](https://github.com/Thea-Energy/stellarmesh) and [Coreform Cubit](https://coreform.com/products/coreform-cubit/).

cad_to_dagmc-0.8.0/examples/surface_mesh/different_resolution_meshes.py

@@ -0,0 +1,44 @@
+# This example makes 3 CAD boxes
+# Meshes the 3 volumes with different resolutions
+# exports the mesh to a DAGMC h5m file and GMsh msh file
+import cadquery as cq
+from cad_to_dagmc import CadToDagmc
+
+box_set_size_course_mesh = cq.Workplane().box(1, 1, 2)
+box_set_size_fine_mesh = cq.Workplane().moveTo(1, 0.5).box(1, 1, 1.5)
+box_set_global_mesh = cq.Workplane().moveTo(2, 1).box(1, 1, 1)
+
+assembly = cq.Assembly()
+assembly.add(box_set_size_course_mesh, color=cq.Color(0, 0, 1))
+assembly.add(box_set_size_fine_mesh, color=cq.Color(0, 1, 0))
+assembly.add(box_set_global_mesh, color=cq.Color(1, 0, 0))
+
+assembly.export("different_resolution_meshes.step")
+
+# uncomment to see the assembly in a pop up vtk viewer
+# from cadquery import vis
+# vis.show(assembly)
+
+model = CadToDagmc()
+model.add_cadquery_object(assembly, material_tags=["mat1", "mat2", "mat3"])
+
+model.export_dagmc_h5m_file(
+    filename="different_resolution_meshes.h5m",
+    min_mesh_size=0.01,
+    max_mesh_size=10,
+    set_size={
+        1: 0.9,
+        2: 0.1,
+    },  # not volume 3 is not specified in the set_size so it uses only the min max mesh sizes
+)
+
+model.export_gmsh_mesh_file(
+    filename="different_resolution_meshes.msh",
+    dimensions=2,
+    min_mesh_size=0.01,
+    max_mesh_size=10,
+    set_size={
+        1: 0.9,
+        2: 0.1,
+    },  # not volume 3 is not specified in the set_size so it uses only the min max mesh sizes
+)

cad_to_dagmc-0.8.0/examples/unstrucutred_volume_mesh/different_resolution_meshes.py

@@ -0,0 +1,44 @@
+# This example makes 3 CAD boxes
+# Meshes the 3 volumes with different resolutions
+# exports the mesh to a DAGMC unstructured VTK file and Gmsh msh file
+import cadquery as cq
+from cad_to_dagmc import CadToDagmc
+
+box_set_size_course_mesh = cq.Workplane().box(1, 1, 2)
+box_set_size_fine_mesh = cq.Workplane().moveTo(1, 0.5).box(1, 1, 1.5)
+box_set_global_mesh = cq.Workplane().moveTo(2, 1).box(1, 1, 1)
+
+assembly = cq.Assembly()
+assembly.add(box_set_size_course_mesh, color=cq.Color(0, 0, 1))
+assembly.add(box_set_size_fine_mesh, color=cq.Color(0, 1, 0))
+assembly.add(box_set_global_mesh, color=cq.Color(1, 0, 0))
+
+assembly.export("different_resolution_meshes.step")
+
+# uncomment to see the assembly in a pop up vtk viewer
+# from cadquery import vis
+# vis.show(assembly)
+
+model = CadToDagmc()
+model.add_cadquery_object(assembly, material_tags=["mat1", "mat2", "mat3"])
+
+model.export_gmsh_mesh_file(
+    filename="different_resolution_meshes.msh",
+    dimensions=3,
+    min_mesh_size=0.01,
+    max_mesh_size=10,
+    set_size={
+        1: 0.9,
+        2: 0.1,
+    },  # not volume 3 is not specified in the set_size so it uses only the min max mesh sizes
+)
+
+model.export_unstructured_mesh_file(
+    filename="different_resolution_meshes.vtk",
+    min_mesh_size=0.01,
+    max_mesh_size=10,
+    set_size={
+        1: 0.9,
+        2: 0.1,
+    },  # not volume 3 is not specified in the set_size so it uses only the min max mesh sizes
+)

{cad_to_dagmc-0.7.6 → cad_to_dagmc-0.8.0}/pyproject.toml

@@ -20,8 +20,8 @@ classifiers = [
 dependencies = [
     "trimesh",
     "networkx",
-    "cadquery>=2.4.0",
-    "numpy<=1.26.4",
+    "cadquery>=2.5.2",
+    "numpy",
     "gmsh"
 ]
 dynamic = ["version"]

{cad_to_dagmc-0.7.6 → cad_to_dagmc-0.8.0}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.7.6'
-__version_tuple__ = version_tuple = (0, 7, 6)
+__version__ = version = '0.8.0'
+__version_tuple__ = version_tuple = (0, 8, 0)

{cad_to_dagmc-0.7.6 → cad_to_dagmc-0.8.0}/src/cad_to_dagmc/core.py

@@ -235,10 +235,11 @@ def init_gmsh():
 
 def _mesh_brep(
     gmsh,
-    min_mesh_size: float = 1,
-    max_mesh_size: float = 10,
+    min_mesh_size: float | None = None,
+    max_mesh_size: float | None = None,
     mesh_algorithm: int = 1,
     dimensions: int = 2,
+    set_size: dict[int, float] | None = None,
 ):
     """Creates a conformal surface meshes of the volumes in a Brep file using Gmsh.
 
@@ -252,15 +253,49 @@ def _mesh_brep(
             gmsh.option.setNumber("Mesh.Algorithm", mesh_algorithm)
         dimensions: The number of dimensions, 2 for a surface mesh 3 for a
             volume mesh. Passed to gmsh.model.mesh.generate()
+        set_size: a dictionary of volume ids (int) and target mesh sizes
+            (floats) to set for each volume, passed to gmsh.model.mesh.setSize.
 
     Returns:
         The resulting gmsh object and volumes
     """
+    if min_mesh_size and max_mesh_size:
+        if min_mesh_size > max_mesh_size:
+            raise ValueError(
+                f"min_mesh_size must be less than or equal to max_mesh_size. Currently min_mesh_size is set to {min_mesh_size} and max_mesh_size is set to {max_mesh_size}"
+            )
+
+    if min_mesh_size:
+        gmsh.option.setNumber("Mesh.MeshSizeMin", min_mesh_size)
+
+    if max_mesh_size:
+        gmsh.option.setNumber("Mesh.MeshSizeMax", max_mesh_size)
 
     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
+
+    if set_size:
+        volumes = gmsh.model.getEntities(3)
+        available_volumes = [volume[1] for volume in volumes]
+        print("volumes", volumes)
+        for volume_id, size in set_size.items():
+            if volume_id in available_volumes:
+                size = set_size[volume_id]
+                if isinstance(size, dict):
+                    # TODO face specific mesh sizes
+                    pass
+                else:
+                    boundaries = gmsh.model.getBoundary(
+                        [(3, volume_id)], recursive=True
+                    )  # dim must be set to 3
+                    print("boundaries", boundaries)
+                    gmsh.model.mesh.setSize(boundaries, size)
+                    print(f"Set size of {size} for volume {volume_id}")
+            else:
+                raise ValueError(
+                    f"volume ID of {volume_id} set in set_sizes but not found in available volumes {volumes}"
+                )
+
     gmsh.model.mesh.generate(dimensions)
 
     return gmsh
@@ -508,6 +543,7 @@ class CadToDagmc:
         method: str = "file",
         scale_factor: float = 1.0,
         imprint: bool = True,
+        set_size: dict[int, float] | None = None,
     ):
         """
         Exports an unstructured mesh file in VTK format for use with openmc.UnstructuredMesh.
@@ -539,6 +575,9 @@ class CadToDagmc:
                 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.
+
 
         Returns:
         --------
@@ -570,6 +609,7 @@ class CadToDagmc:
             max_mesh_size=max_mesh_size,
             mesh_algorithm=mesh_algorithm,
             dimensions=3,
+            set_size=set_size,
         )
 
         # makes the folder if it does not exist
@@ -589,13 +629,14 @@ class CadToDagmc:
     def export_gmsh_mesh_file(
         self,
         filename: str = "mesh.msh",
-        min_mesh_size: float = 1,
-        max_mesh_size: float = 5,
+        min_mesh_size: float | None = None,
+        max_mesh_size: float | None = None,
         mesh_algorithm: int = 1,
         dimensions: int = 2,
         method: str = "file",
         scale_factor: float = 1.0,
         imprint: bool = True,
+        set_size: dict[int, float] | None = None,
     ):
         """Saves a GMesh msh file of the geometry in either 2D surface mesh or
         3D volume mesh.
@@ -622,6 +663,8 @@ class CadToDagmc:
                 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.
         """
 
         assembly = cq.Assembly()
@@ -643,6 +686,7 @@ class CadToDagmc:
             max_mesh_size=max_mesh_size,
             mesh_algorithm=mesh_algorithm,
             dimensions=dimensions,
+            set_size=set_size,
         )
 
         # makes the folder if it does not exist
@@ -662,13 +706,14 @@ class CadToDagmc:
     def export_dagmc_h5m_file(
         self,
         filename: str = "dagmc.h5m",
-        min_mesh_size: float = 1,
-        max_mesh_size: float = 5,
+        min_mesh_size: float | None = None,
+        max_mesh_size: float | None = None,
         mesh_algorithm: int = 1,
         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,
     ) -> str:
         """Saves a DAGMC h5m file of the geometry
 
@@ -695,6 +740,8 @@ class CadToDagmc:
                 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.
 
         Returns:
             str: the DAGMC filename saved
@@ -739,6 +786,7 @@ class CadToDagmc:
             min_mesh_size=min_mesh_size,
             max_mesh_size=max_mesh_size,
             mesh_algorithm=mesh_algorithm,
+            set_size=set_size,
         )
 
         dims_and_vol_ids = volumes

{cad_to_dagmc-0.7.6 → cad_to_dagmc-0.8.0}/src/cad_to_dagmc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: cad_to_dagmc
-Version: 0.7.6
+Version: 0.8.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,8 +14,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: trimesh
 Requires-Dist: networkx
-Requires-Dist: cadquery>=2.4.0
-Requires-Dist: numpy<=1.26.4
+Requires-Dist: cadquery>=2.5.2
+Requires-Dist: numpy
 Requires-Dist: gmsh
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
@@ -35,23 +35,31 @@ Requires-Dist: vtk; extra == "tests"
 [![PyPI](https://img.shields.io/pypi/v/cad_to_dagmc?color=brightgreen&label=pypi&logo=grebrightgreenen&logoColor=green)](https://pypi.org/project/cad_to_dagmc/)
 
 
-A minimal package that converts CAD geometry to [DAGMC](https://github.com/svalinn/DAGMC/) h5m files
+A minimal package that converts CAD geometry to [DAGMC](https://github.com/svalinn/DAGMC/) (h5m) files, [unstructured mesh](https://docs.openmc.org/en/latest/pythonapi/generated/openmc.UnstructuredMesh.html) files (vtk) and Gmsh (msh) files ready for use in neutronics simulations.
 
-cad-to-dagmc can create:
+cad-to-dagmc can create DAGMC compatible:
 - surface meshes / faceted geometry / triangular meshes
 - unstructured mesh / tetrahedral meshes / volume meshes
 
-cad-to-dagmc can convert:
+cad-to-dagmc can convert the following in to DAGMC compatible meshes:
 - STEP files
 - CadQuery objects (in memory)
+- Gmsh meshes
+
+Cad-to-dagmc offers a wide range of features including.
+- Geometry scaling with ```scale_factor``` argument
+- Model wide mesh size parameters with ```min_mesh_size``` and ```max_mesh_size``` arguments
+- Volume specific mesh sizing parameters with the ```set_size``` argument
+- Parallel meshing to quickly mesh the geometry using multiple CPU cores
+- Imprint and merging of CAD geometry, or disable with the ```imprint``` argument
+- Add geometry from multiple sources ([STEP](http://www.steptools.com/stds/step/) files, [CadQuery](https://cadquery.readthedocs.io) objects and [Gmsh](https://gmsh.info/) meshes)
+- Ability to tag the DAGMC implicit complement material using the ```implicit_complement_material_tag``` argument
+- Selected different Gmesh mesh algorithms (defaults to 1) using the ```mesh_algorithm``` argument
+- 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).
+- Compatible with [Paramak](https://github.com/fusion-energy/paramak) geometry for fusion simulations.
 
-cad-to-dagmc aims to produce DAGMC compatible h5m files from CAD geometry is intended to convert [STEP](http://www.steptools.com/stds/step/) files or [CadQuery](https://cadquery.readthedocs.io) objects to a [DAGMC](https://github.com/svalinn/DAGMC/) compatible h5m file.
-
-The resulting DAGMC geometry can then be used for simulations in [OpenMC](https://github.com/openmc-dev/openmc/) or [other supported codes](https://svalinn.github.io/DAGMC/).
-
-This package is tested with [pytest tests](https://github.com/fusion-energy/cad_to_dagmc/tree/main/tests) and also the DAGMC geometry made with this package is compared to simulation carried out with native constructive solid geometry, see [Model Benchmark Zoo](https://github.com/fusion-energy/model_benchmark_zoo) for more details.
-
-Also checkout these other software projects that also create DAGMC geometry [CAD-to-OpenMC](https://github.com/openmsr/CAD_to_OpenMC), [Stellarmesh](https://github.com/Thea-Energy/stellarmesh) and [Coreform Cubit](https://coreform.com/products/coreform-cubit/)
 
 # Installation options
 
@@ -146,7 +154,7 @@ You may also want to install OpenMC with DAGMC to make use of the h5m geometry f
 
 To install OpenMC you can run ```mamba install -c conda-forge openmc``` however this more specific command makes sure the latest version of OpenMC which contains DAGMC is chosen by conda / mamba
 ```bash
-mamba install -c conda-forge -y "openmc=0.14.0=dagmc*nompi*"
+mamba install -c conda-forge -y "openmc=0.15.0=dagmc*nompi*"
 ```
 
 It might not be possible to install OpenMC and cad-to-dagmc in the same conda/mamba python environment so you may have to create a new conda/mamba environment and install OpenMC there.
@@ -160,15 +168,15 @@ The package requires newer versions of Linux. For example the package does not w
 
 The package requires newer versions of pip. It is recommended to ensure that your version of pip is up to date. This can be done with ```python -m pip install --upgrade pip```
 
-Installing one of the package dependancies (gmsh) with pip appears to result in errors when passing cad objects in memory between cadquery / ocp and gmsh. The default method of passing cad objects is via file so this should not impact most users. The conda install gmsh appears to work fine with in memory passing of cad objects as the version of OCP matches between Gmsh and CadQuery.
+Installing one of the package dependancies (Gmsh) with pip appears to result in errors when passing cad objects in memory between cadquery / ocp and gmsh. The default method of passing cad objects is via file so this should not impact most users. The conda install gmsh appears to work fine with in memory passing of cad objects as the version of OCP matches between Gmsh and CadQuery.
 
 
-# Usage - creation of DAGMC h5m files
+# Usage
 
-For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
+For examples showing creation of DAGMC h5m files, vtk files and usage within OpenMC transport code see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
 
-# Usage - simulation with transport code
+For more examples see the CAD tasks in the [neutronics-workshop](https://github.com/fusion-energy/neutronics-workshop) and [model benchmark zoo](https://github.com/fusion-energy/model_benchmark_zoo)
 
-For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
+# Related software
 
-For more examples see the CAD tasks in the [neutronics-workshop](https://github.com/fusion-energy/neutronics-workshop) and [model benchmark zoo](https://github.com/fusion-energy/model_benchmark_zoo)
+Also checkout these other software projects that also create DAGMC geometry [CAD-to-OpenMC](https://github.com/openmsr/CAD_to_OpenMC), [Stellarmesh](https://github.com/Thea-Energy/stellarmesh) and [Coreform Cubit](https://coreform.com/products/coreform-cubit/).

{cad_to_dagmc-0.7.6 → cad_to_dagmc-0.8.0}/src/cad_to_dagmc.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ examples/surface_mesh/cadquery_compound.py
 examples/surface_mesh/cadquery_object_and_stp_file.py
 examples/surface_mesh/cadquery_text.py
 examples/surface_mesh/curved_cadquery_object_to_dagmc_surface_mesh.py
+examples/surface_mesh/different_resolution_meshes.py
 examples/surface_mesh/from_gmsh_mesh_file.py
 examples/surface_mesh/multiple_cadquery_objects.py
 examples/surface_mesh/multiple_stp_files.py
@@ -21,6 +22,7 @@ examples/surface_mesh/single_cadquery_object.py
 examples/surface_mesh/single_stp_file.py
 examples/surface_mesh/single_stp_file_multiple_volumes.py
 examples/unstrucutred_volume_mesh/curved_cadquery_object_to_dagmc_volume_mesh.py
+examples/unstrucutred_volume_mesh/different_resolution_meshes.py
 examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py
 src/_version.py
 src/cad_to_dagmc/__init__.py

{cad_to_dagmc-0.7.6 → cad_to_dagmc-0.8.0}/src/cad_to_dagmc.egg-info/requires.txt

@@ -1,7 +1,7 @@
 trimesh
 networkx
-cadquery>=2.4.0
-numpy<=1.26.4
+cadquery>=2.5.2
+numpy
 gmsh
 
 [tests]