cad-to-dagmc 0.9.1__tar.gz → 0.9.2__tar.gz

{cad_to_dagmc-0.9.1 → cad_to_dagmc-0.9.2}/.github/workflows/ci_with_conda_install.yml

@@ -87,3 +87,4 @@ jobs:
           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.1 → cad_to_dagmc-0.9.2}/.github/workflows/ci_with_pip_install.yml

@@ -63,4 +63,5 @@ jobs:
           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_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.1 → cad_to_dagmc-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.1
+Version: 0.9.2
 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
@@ -55,7 +55,8 @@ 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
-- Volume mesh selected volumes in the geometry (helps ensure conformal volume and surface mesh).
+- Unstructured mesh that share the same coordinates as the surface mesh.
+- Volume mesh allows selecting individual volumes in the geometry.
 - 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)

{cad_to_dagmc-0.9.1 → cad_to_dagmc-0.9.2}/README.md

@@ -30,7 +30,8 @@ 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
-- Volume mesh selected volumes in the geometry (helps ensure conformal volume and surface mesh).
+- Unstructured mesh that share the same coordinates as the surface mesh.
+- Volume mesh allows selecting individual volumes in the geometry.
 - 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)

{cad_to_dagmc-0.9.1 → cad_to_dagmc-0.9.2}/examples/surface_and_unstructured_mesh/unstructured_mesh_with_conformal_surface_mesh.py

@@ -5,9 +5,10 @@
 # mesh as the same mesh parameters were used in both the surface and volume mesh.
 # Additionally only volume 2 is volume meshed, while all three volumes are surface meshed
 
-
 import cadquery as cq
 from cad_to_dagmc import CadToDagmc
+import openmc
+
 
 box_cutter = cq.Workplane("XY").moveTo(0, 5).box(20, 10, 20)
 inner_sphere = cq.Workplane("XY").sphere(6).cut(box_cutter)
@@ -23,20 +24,17 @@ assembly.add(outer_sphere, name="outer_sphere")
 model = CadToDagmc()
 model.add_cadquery_object(assembly, material_tags=["mat1", "mat2", "mat3"])
 
-
-h5m_file = model.export_dagmc_h5m_file(
-    filename="different_resolution_meshes.h5m",
-    set_size={1: 0.9, 2: 0.1, 3: 0.9},
+dagmc_filename, umesh_filename = model.export_dagmc_h5m_file(
+    filename="surface_mesh_conformal.h5m",
+    set_size={
+        1: 0.9,
+        2: 0.1,
+        3: 0.9,
+    },
+    unstructured_volumes=[2],
+    umesh_filename="volume_mesh_conformal.vtk",  #
 )
 
-vtk_file = model.export_unstructured_mesh_file(
-    filename="umesh.vtk",
-    set_size={1: 0.9, 2: 0.1, 3: 0.9},
-    volumes=[2],  # only mesh volume 2 out of the three volumes
-)
-
-
-import openmc
 
 with open("cross_sections.xml", "w") as file:
     file.write(
@@ -49,7 +47,7 @@ with open("cross_sections.xml", "w") as file:
     )
 openmc.config["cross_sections"] = "cross_sections.xml"
 
-umesh = openmc.UnstructuredMesh(vtk_file, library="moab")
+umesh = openmc.UnstructuredMesh(umesh_filename, library="moab")
 mesh_filter = openmc.MeshFilter(umesh)
 tally = openmc.Tally(name="unstructured_mesh_tally")
 tally.filters = [mesh_filter]
@@ -68,11 +66,10 @@ mat3.add_nuclide("H1", 1, percent_type="ao")
 mat3.set_density("g/cm3", 0.003)
 my_materials = openmc.Materials([mat1, mat2, mat3])
 
-dag_univ = openmc.DAGMCUniverse(filename=h5m_file)
+dag_univ = openmc.DAGMCUniverse(filename=dagmc_filename)
 bound_dag_univ = dag_univ.bounded_universe()
 my_geometry = openmc.Geometry(root=bound_dag_univ)
 
-
 my_settings = openmc.Settings()
 my_settings.batches = 10
 my_settings.particles = 5000

{cad_to_dagmc-0.9.1 → cad_to_dagmc-0.9.2}/src/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.9.1'
-__version_tuple__ = version_tuple = (0, 9, 1)
+__version__ = version = '0.9.2'
+__version_tuple__ = version_tuple = (0, 9, 2)

{cad_to_dagmc-0.9.1 → cad_to_dagmc-0.9.2}/src/cad_to_dagmc/core.py

@@ -7,6 +7,7 @@ from cadquery import importers
 from pymoab import core, types
 import tempfile
 import warnings
+from typing import Iterable
 from cad_to_dagmc import __version__
 
 
@@ -818,6 +819,8 @@ class CadToDagmc:
         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",
     ) -> str:
         """Saves a DAGMC h5m file of the geometry
 
@@ -846,9 +849,13 @@ class CadToDagmc:
                 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.
 
         Returns:
-            str: the DAGMC filename saved
+            str: the filenames(s) for the files created.
         """
 
         assembly = cq.Assembly()
@@ -895,19 +902,37 @@ class CadToDagmc:
 
         gmsh.model.mesh.generate(2)
 
-        dims_and_vol_ids = volumes
-
         vertices, triangles_by_solid_by_face = mesh_to_vertices_and_triangles(
-            dims_and_vol_ids=dims_and_vol_ids
+            dims_and_vol_ids=volumes
         )
 
-        gmsh.finalize()
-
-        # checks and fixes triangle fix_normals within vertices_to_h5m
-        return vertices_to_h5m(
+        dagmc_filename = vertices_to_h5m(
             vertices=vertices,
             triangles_by_solid_by_face=triangles_by_solid_by_face,
             material_tags=material_tags_in_brep_order,
             h5m_filename=filename,
             implicit_complement_material_tag=implicit_complement_material_tag,
         )
+
+        if unstructured_volumes:
+            # remove all the unused occ volumes, this prevents them being meshed
+            for volume_dim, volume_id in volumes:
+                if volume_id not in unstructured_volumes:
+                    gmsh.model.occ.remove([(volume_dim, volume_id)], recursive=True)
+            gmsh.option.setNumber("Mesh.SaveAll", 1)
+            gmsh.model.occ.synchronize()
+
+            # removes all the 2D groups so that 2D faces are not included in the vtk file
+            all_2d_groups = gmsh.model.getPhysicalGroups(2)
+            for entry in all_2d_groups:
+                gmsh.model.removePhysicalGroups([entry])
+
+            gmsh.model.mesh.generate(3)
+            gmsh.option.setNumber("Mesh.SaveElementTagType", 3)  # Save only volume elements
+            gmsh.write(umesh_filename)
+
+            gmsh.finalize()
+
+            return dagmc_filename, umesh_filename
+        else:
+            return dagmc_filename

{cad_to_dagmc-0.9.1 → cad_to_dagmc-0.9.2}/src/cad_to_dagmc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.1
+Version: 0.9.2
 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
@@ -55,7 +55,8 @@ 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
-- Volume mesh selected volumes in the geometry (helps ensure conformal volume and surface mesh).
+- Unstructured mesh that share the same coordinates as the surface mesh.
+- Volume mesh allows selecting individual volumes in the geometry.
 - 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)

{cad_to_dagmc-0.9.1 → cad_to_dagmc-0.9.2}/tests/test_python_api.py

@@ -335,6 +335,39 @@ def test_two_box_scaling_factor_when_adding_cq_object(
     assert width_z == expected_z_width
 
 
+def test_unstructured_mesh_export_with_surface_mesh():
+
+    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))
+
+    model = CadToDagmc()
+    model.add_cadquery_object(assembly, material_tags=["mat1", "mat2", "mat3"])
+
+    dag_filename, umesh_filename = model.export_dagmc_h5m_file(
+        filename="conformal-surface-mesh2.h5m",
+        min_mesh_size=0.01,
+        max_mesh_size=10,
+        set_size={
+            1: 0.5,
+            2: 0.4,
+            3: 0.4,
+        },
+        unstructured_volumes=[2],
+        umesh_filename="conformal-volume-mesh2.vtk",
+    )
+    assert Path("conformal-surface-mesh2.h5m").is_file()
+    assert Path("conformal-volume-mesh2.vtk").is_file()
+    assert Path(dag_filename).is_file()
+    assert Path(umesh_filename).is_file()
+    # TODO check the volume mesh outer surface is the same as the surface mesh volume 2 surface
+
+
 def test_unstructured_mesh_with_volumes():
 
     box_cutter = cq.Workplane("XY").moveTo(0, 5).box(20, 10, 20)