cad-to-dagmc 0.9.1__py3-none-any.whl → 0.9.2__py3-none-any.whl

_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/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.dist-info → cad_to_dagmc-0.9.2.dist-info}/METADATA

@@ -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.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+_version.py,sha256=eeYYTSIkrgfRwSQ7LKo_py3xs3DvzgfWiAtK4K1JM4A,511
+cad_to_dagmc/__init__.py,sha256=fskHUTyCunSpnpJUvBfAYjx4uwDKXHTTiMP6GqnFRf0,494
+cad_to_dagmc/core.py,sha256=dGj5LRRzboQ8CL8VS5dkvIkGLyj5MJWcbkTPtrFk0QQ,36947
+cad_to_dagmc-0.9.2.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
+cad_to_dagmc-0.9.2.dist-info/METADATA,sha256=8vLnV93ycmV216LiNj38YI4z445pWtdpBKpcESFLLH0,8990
+cad_to_dagmc-0.9.2.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+cad_to_dagmc-0.9.2.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
+cad_to_dagmc-0.9.2.dist-info/RECORD,,

cad_to_dagmc-0.9.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-_version.py,sha256=QG_t-w_CzDn2UjPaW-Svt-wTU1NXK2QkudawUihJfHA,511
-cad_to_dagmc/__init__.py,sha256=fskHUTyCunSpnpJUvBfAYjx4uwDKXHTTiMP6GqnFRf0,494
-cad_to_dagmc/core.py,sha256=ej1wk_-q-eXJ5F7jfjBwPII4qWHnMQWeMT_XZG_A0xI,35713
-cad_to_dagmc-0.9.1.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
-cad_to_dagmc-0.9.1.dist-info/METADATA,sha256=S15I2B5N_eEUC7XqFB6sNyiuFwSLrHj8--1CraXkaMo,8947
-cad_to_dagmc-0.9.1.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-cad_to_dagmc-0.9.1.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
-cad_to_dagmc-0.9.1.dist-info/RECORD,,