cad-to-dagmc 0.8.0__py3-none-any.whl → 0.8.2__py3-none-any.whl

_version.py

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

cad_to_dagmc/core.py

@@ -8,7 +8,7 @@ import tempfile
 import warnings
 
 
-def _define_moab_core_and_tags() -> tuple[core.Core, dict]:
+def define_moab_core_and_tags() -> tuple[core.Core, dict]:
     """Creates a MOAB Core instance which can be built up by adding sets of
     triangles to the instance
 
@@ -62,7 +62,7 @@ def _define_moab_core_and_tags() -> tuple[core.Core, dict]:
     return moab_core, tags
 
 
-def _vertices_to_h5m(
+def vertices_to_h5m(
     vertices: list[tuple[float, float, float]] | list["cadquery.occ_impl.geom.Vector"],
     triangles_by_solid_by_face: list[list[tuple[int, int, int]]],
     material_tags: list[str],
@@ -100,7 +100,7 @@ def _vertices_to_h5m(
             else:
                 face_ids_with_solid_ids[face_id] = [solid_id]
 
-    moab_core, tags = _define_moab_core_and_tags()
+    moab_core, tags = define_moab_core_and_tags()
 
     volume_sets_by_solid_id = {}
     for material_tag, (solid_id, triangles_on_each_face) in zip(
@@ -233,7 +233,7 @@ def init_gmsh():
     return gmsh
 
 
-def _mesh_brep(
+def mesh_brep(
     gmsh,
     min_mesh_size: float | None = None,
     max_mesh_size: float | None = None,
@@ -355,21 +355,21 @@ def mesh_to_vertices_and_triangles(
     return vertices, triangles_by_solid_by_face
 
 
-def _get_ids_from_assembly(assembly: cq.assembly.Assembly):
+def get_ids_from_assembly(assembly: cq.assembly.Assembly):
     ids = []
     for obj, name, loc, _ in assembly:
         ids.append(name)
     return ids
 
 
-def _get_ids_from_imprinted_assembly(solid_id_dict):
+def get_ids_from_imprinted_assembly(solid_id_dict):
     ids = []
     for id in list(solid_id_dict.values()):
         ids.append(id[0])
     return ids
 
 
-def _check_material_tags(material_tags, iterable_solids):
+def check_material_tags(material_tags, iterable_solids):
     if material_tags:
         if len(material_tags) != len(iterable_solids):
             msg = (
@@ -448,7 +448,7 @@ class MeshToDagmc:
 
         gmsh.finalize()
 
-        h5m_filename = _vertices_to_h5m(
+        h5m_filename = vertices_to_h5m(
             vertices=vertices,
             triangles_by_solid_by_face=triangles_by_solid_by_face,
             material_tags=material_tags,
@@ -503,6 +503,7 @@ class CadToDagmc:
             cq.assembly.Assembly | cq.occ_impl.shapes.Compound | cq.occ_impl.shapes.Solid
         ),
         material_tags: list[str] | None,
+        scale_factor: float = 1.0,
     ) -> int:
         """Loads the parts from CadQuery object into the model.
 
@@ -514,6 +515,10 @@ class CadToDagmc:
                 same order as the volumes in the geometry added (STP file and
                 CadQuery objects) and match the material tags used in the
                 neutronics code (e.g. OpenMC).
+            scale_factor: a scaling factor to apply to the geometry that can be
+                used to increase the size or decrease the size of the geometry.
+                Useful when converting the geometry to cm for use in neutronics
+                simulations.
 
         Returns:
             int: number of volumes in the stp file.
@@ -527,12 +532,17 @@ class CadToDagmc:
         else:
             iterable_solids = cadquery_object.val().Solids()
 
-        _check_material_tags(material_tags, iterable_solids)
+        if scale_factor == 1.0:
+            scaled_iterable_solids = iterable_solids
+        else:
+            scaled_iterable_solids = [part.scale(scale_factor) for part in iterable_solids]
+
+        check_material_tags(material_tags, scaled_iterable_solids)
         if material_tags:
             self.material_tags = self.material_tags + material_tags
-        self.parts = self.parts + iterable_solids
+        self.parts = self.parts + scaled_iterable_solids
 
-        return len(iterable_solids)
+        return len(scaled_iterable_solids)
 
     def export_unstructured_mesh_file(
         self,
@@ -603,7 +613,7 @@ class CadToDagmc:
 
         gmsh, _ = get_volumes(gmsh, imprinted_assembly, method=method, scale_factor=scale_factor)
 
-        gmsh = _mesh_brep(
+        gmsh = mesh_brep(
             gmsh=gmsh,
             min_mesh_size=min_mesh_size,
             max_mesh_size=max_mesh_size,
@@ -680,7 +690,7 @@ class CadToDagmc:
 
         gmsh, _ = get_volumes(gmsh, imprinted_assembly, method=method, scale_factor=scale_factor)
 
-        gmsh = _mesh_brep(
+        gmsh = mesh_brep(
             gmsh=gmsh,
             min_mesh_size=min_mesh_size,
             max_mesh_size=max_mesh_size,
@@ -751,7 +761,7 @@ class CadToDagmc:
         for part in self.parts:
             assembly.add(part)
 
-        original_ids = _get_ids_from_assembly(assembly)
+        original_ids = get_ids_from_assembly(assembly)
 
         # both id lists should be the same length as each other and the same
         # length as the self.material_tags
@@ -764,7 +774,7 @@ class CadToDagmc:
                 assembly
             )
 
-            scrambled_ids = _get_ids_from_imprinted_assembly(imprinted_solids_with_org_id)
+            scrambled_ids = get_ids_from_imprinted_assembly(imprinted_solids_with_org_id)
 
             material_tags_in_brep_order = order_material_ids_by_brep_order(
                 original_ids, scrambled_ids, self.material_tags
@@ -773,7 +783,7 @@ class CadToDagmc:
             material_tags_in_brep_order = self.material_tags
             imprinted_assembly = assembly
 
-        _check_material_tags(material_tags_in_brep_order, self.parts)
+        check_material_tags(material_tags_in_brep_order, self.parts)
 
         gmsh = init_gmsh()
 
@@ -781,7 +791,7 @@ class CadToDagmc:
             gmsh, imprinted_assembly, method=method, scale_factor=scale_factor
         )
 
-        gmsh = _mesh_brep(
+        gmsh = mesh_brep(
             gmsh=gmsh,
             min_mesh_size=min_mesh_size,
             max_mesh_size=max_mesh_size,
@@ -798,7 +808,7 @@ class CadToDagmc:
         gmsh.finalize()
 
         # checks and fixes triangle fix_normals within vertices_to_h5m
-        return _vertices_to_h5m(
+        return vertices_to_h5m(
             vertices=vertices,
             triangles_by_solid_by_face=triangles_by_solid_by_face,
             material_tags=material_tags_in_brep_order,

{cad_to_dagmc-0.8.0.dist-info → cad_to_dagmc-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cad_to_dagmc
-Version: 0.8.0
+Version: 0.8.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

cad_to_dagmc-0.8.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+_version.py,sha256=t6tJJG56wlBKsg_0M1Q4l1ir09jgXRw1tolMbDalW9g,411
+cad_to_dagmc/__init__.py,sha256=fskHUTyCunSpnpJUvBfAYjx4uwDKXHTTiMP6GqnFRf0,494
+cad_to_dagmc/core.py,sha256=dW8p0TuQKJHPR6dqOulc7mTkB9zB2q_odkNSg8mU-Ew,31867
+cad_to_dagmc-0.8.2.dist-info/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
+cad_to_dagmc-0.8.2.dist-info/METADATA,sha256=aRZgmsBIcMbAB80vBJmuCWUkN6Ejab7X0IPBXsc52lU,8700
+cad_to_dagmc-0.8.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+cad_to_dagmc-0.8.2.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
+cad_to_dagmc-0.8.2.dist-info/RECORD,,

cad_to_dagmc-0.8.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-_version.py,sha256=vspFLRfYI6gAAN7kyihey2lhPos0jxqKaNDWFlKPlmU,411
-cad_to_dagmc/__init__.py,sha256=fskHUTyCunSpnpJUvBfAYjx4uwDKXHTTiMP6GqnFRf0,494
-cad_to_dagmc/core.py,sha256=w8Bu3MyjhQtW4KYRXktib7aPbjTy8jfSdpSgzw57gIc,31366
-cad_to_dagmc-0.8.0.dist-info/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
-cad_to_dagmc-0.8.0.dist-info/METADATA,sha256=GvclO4Hs5U2TwJLenoQZVAsQ0GSNOjOQ1IUhqS0rNWA,8700
-cad_to_dagmc-0.8.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-cad_to_dagmc-0.8.0.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
-cad_to_dagmc-0.8.0.dist-info/RECORD,,