cad-to-dagmc 0.7.1__py3-none-any.whl → 0.7.3__py3-none-any.whl

_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.7.1'
-__version_tuple__ = version_tuple = (0, 7, 1)
+__version__ = version = '0.7.3'
+__version_tuple__ = version_tuple = (0, 7, 3)

cad_to_dagmc/core.py

@@ -190,16 +190,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 +250,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
@@ -477,6 +489,7 @@ class CadToDagmc:
         max_mesh_size: float = 5,
         mesh_algorithm: int = 1,
         method: str = "file",
+        scale_factor: float = 1.0,
     ):
 
         assembly = cq.Assembly()
@@ -487,7 +500,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,
@@ -516,6 +529,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 +549,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 +562,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 +586,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 +607,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 +639,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.1.dist-info → cad_to_dagmc-0.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cad_to_dagmc
-Version: 0.7.1
+Version: 0.7.3
 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
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: trimesh
 Requires-Dist: networkx
 Requires-Dist: cadquery >=2.4.0
-Requires-Dist: numpy <=1.23.5
+Requires-Dist: numpy <=1.26.4
 Requires-Dist: gmsh
 Provides-Extra: tests
 Requires-Dist: pytest ; extra == 'tests'
@@ -24,7 +24,9 @@ Requires-Dist: vtk ; extra == 'tests'
 
 [![N|Python](https://www.python.org/static/community_logos/python-powered-w-100x40.png)](https://www.python.org)
 
-[![CI with install](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_install.yml/badge.svg?branch=main)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_install.yml) Testing package and running examples
+[![CI with Conda install](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_conda_install.yml/badge.svg)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_conda_install.yml) Testing package and running examples with dependencies installed via Conda
+
+[![CI with pip install](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_pip_install.yml/badge.svg)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_pip_install.yml) Testing package and running examples with dependencies installed vua PIP
 
 [![CI with model benchmark zoo](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_benchmarks.yml/badge.svg?branch=main)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_benchmarks.yml) Testing with [Model Benchmark Zoo](https://github.com/fusion-energy/model_benchmark_zoo)
 

cad_to_dagmc-0.7.3.dist-info/RECORD

@@ -0,0 +1,8 @@
+_version.py,sha256=9Y_dpdWykJt40jFoLa3Q4GkYvOMvJ1Y09SkdBJZvTM4,411
+cad_to_dagmc/__init__.py,sha256=fskHUTyCunSpnpJUvBfAYjx4uwDKXHTTiMP6GqnFRf0,494
+cad_to_dagmc/core.py,sha256=_5q_nL_I95JlR1EOAGrG38jMN5SPPZYR86Icg-5At2s,24522
+cad_to_dagmc-0.7.3.dist-info/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
+cad_to_dagmc-0.7.3.dist-info/METADATA,sha256=L5xUGum0Sz5YlvxleYPlOpbLIRrMtuX5Gnas6diRRTM,7941
+cad_to_dagmc-0.7.3.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+cad_to_dagmc-0.7.3.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
+cad_to_dagmc-0.7.3.dist-info/RECORD,,

{cad_to_dagmc-0.7.1.dist-info → cad_to_dagmc-0.7.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

cad_to_dagmc-0.7.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-_version.py,sha256=5-skCoU2Vu44uYeNEApDjjGE2Q26ndIh5lKJuVOeL88,411
-cad_to_dagmc/__init__.py,sha256=fskHUTyCunSpnpJUvBfAYjx4uwDKXHTTiMP6GqnFRf0,494
-cad_to_dagmc/core.py,sha256=aGBPoxZMWmoo-qf28AFkoSsdO59EtLtRJ_87QKUaFgU,23297
-cad_to_dagmc-0.7.1.dist-info/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
-cad_to_dagmc-0.7.1.dist-info/METADATA,sha256=9gUrCwcSrUx0wHrYoug9f9PJiiiCEwnH4BU-_-pyJ-s,7610
-cad_to_dagmc-0.7.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-cad_to_dagmc-0.7.1.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
-cad_to_dagmc-0.7.1.dist-info/RECORD,,