cad-to-dagmc 0.9.7__py3-none-any.whl → 0.9.9__py3-none-any.whl

_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.9.7'
-__version_tuple__ = version_tuple = (0, 9, 7)
+__version__ = version = '0.9.9'
+__version_tuple__ = version_tuple = (0, 9, 9)
 
 __commit_id__ = commit_id = None

cad_to_dagmc/core.py

@@ -106,6 +106,9 @@ def vertices_to_h5m(
 
     moab_core, tags = define_moab_core_and_tags()
 
+    # Add the vertices once at the start
+    all_moab_verts = moab_core.create_vertices(vertices)
+
     volume_sets_by_solid_id = {}
     for material_tag, (solid_id, triangles_on_each_face) in zip(
         material_tags, triangles_by_solid_by_face.items()
@@ -145,14 +148,21 @@ def vertices_to_h5m(
 
                 moab_core.tag_set_data(tags["surf_sense"], face_set, sense_data)
 
-                moab_verts = moab_core.create_vertices(vertices)
+                # Collect only the vertices that lie on triangles on this face
+                face_vertices_set = set()
+                for triangle in triangles_on_face:
+                    face_vertices_set.update(triangle)
+                face_vertices_list = sorted(face_vertices_set)
+
+                # Only add these to the MOAB face
+                moab_verts = [all_moab_verts[ii] for ii in face_vertices_list]
                 moab_core.add_entity(face_set, moab_verts)
 
                 for triangle in triangles_on_face:
                     tri = (
-                        moab_verts[int(triangle[0])],
-                        moab_verts[int(triangle[1])],
-                        moab_verts[int(triangle[2])],
+                        all_moab_verts[int(triangle[0])],
+                        all_moab_verts[int(triangle[1])],
+                        all_moab_verts[int(triangle[2])],
                     )
 
                     moab_triangle = moab_core.create_element(types.MBTRI, tri)
@@ -580,7 +590,7 @@ class CadToDagmc:
         cadquery_object: (
             cq.assembly.Assembly | cq.occ_impl.shapes.Compound | cq.occ_impl.shapes.Solid
         ),
-        material_tags: list[str] | None,
+        material_tags: list[str] | None = None,
         scale_factor: float = 1.0,
     ) -> int:
         """Loads the parts from CadQuery object into the model.
@@ -603,18 +613,36 @@ class CadToDagmc:
         """
 
         if isinstance(cadquery_object, cq.assembly.Assembly):
-            cadquery_object = cadquery_object.toCompound()
+            # look for materials in each part of the assembly
+            if material_tags is None:
+                material_tags = []
+                for child in cadquery_object.children:
+                    if child.material is not None and child.material.name is not None:
+                        material_tags.append(child.material.name)
+                    else:
+                        raise ValueError(
+                            f"Not all parts in the assembly have material tags assigned. "
+                            f"Missing material tag for child: {child}. "
+                            "Please assign material tags to all parts or provide material_tags argument when adding the assembly."
+                        )
+
+            cadquery_compound = cadquery_object.toCompound()
+        else:
+            cadquery_compound = cadquery_object
 
-        if isinstance(cadquery_object, (cq.occ_impl.shapes.Compound, cq.occ_impl.shapes.Solid)):
-            iterable_solids = cadquery_object.Solids()
+        if isinstance(cadquery_compound, (cq.occ_impl.shapes.Compound, cq.occ_impl.shapes.Solid)):
+            iterable_solids = cadquery_compound.Solids()
         else:
-            iterable_solids = cadquery_object.val().Solids()
+            iterable_solids = cadquery_compound.val().Solids()
 
         if scale_factor == 1.0:
             scaled_iterable_solids = iterable_solids
         else:
             scaled_iterable_solids = [part.scale(scale_factor) for part in iterable_solids]
 
+        # look for materials in the
+        # if material_tags is None:
+
         check_material_tags(material_tags, scaled_iterable_solids)
         if material_tags:
             self.material_tags = self.material_tags + material_tags

{cad_to_dagmc-0.9.7.dist-info → cad_to_dagmc-0.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.7
+Version: 0.9.9
 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.9.9.dist-info/RECORD

@@ -0,0 +1,9 @@
+_version.py,sha256=ICJcCYYRydywQ4LYVoe5Hg1g5gm82yoqqH0yhtrP2aM,704
+cad_to_dagmc/__init__.py,sha256=oCr1P0QnBsf6AH0RZujX7T7tdrb75NazdF70HtqXSfc,528
+cad_to_dagmc/core.py,sha256=i9CfNmDBCGati5YzfSA9ymwcgxeleDDN71ge5laxjr8,44105
+cad_to_dagmc/direct_mesh_plugin.py,sha256=iKPYtWQd35Ipxv6g8fZ-r7GFKd1VlCwrSfaNzrGFtf0,24131
+cad_to_dagmc-0.9.9.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
+cad_to_dagmc-0.9.9.dist-info/METADATA,sha256=xhzOG-Pb2wBJB5_wHaMhNxRIREnJxVqslrFrFUlaLf0,8994
+cad_to_dagmc-0.9.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cad_to_dagmc-0.9.9.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
+cad_to_dagmc-0.9.9.dist-info/RECORD,,

cad_to_dagmc-0.9.7.dist-info/RECORD

@@ -1,9 +0,0 @@
-_version.py,sha256=nVR1UPhFOYODT1jRbOZVkLGatCOSQLCVT4ndGPtcnZ8,704
-cad_to_dagmc/__init__.py,sha256=oCr1P0QnBsf6AH0RZujX7T7tdrb75NazdF70HtqXSfc,528
-cad_to_dagmc/core.py,sha256=2U7KdBCCJst3pQTbMV3qjNzV1qNIzT_Ey9OZK7NVd48,42756
-cad_to_dagmc/direct_mesh_plugin.py,sha256=iKPYtWQd35Ipxv6g8fZ-r7GFKd1VlCwrSfaNzrGFtf0,24131
-cad_to_dagmc-0.9.7.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
-cad_to_dagmc-0.9.7.dist-info/METADATA,sha256=1qZc6ys0oUghoevoLgz-YO3uODOxYocdapgnb7GBIXA,8994
-cad_to_dagmc-0.9.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cad_to_dagmc-0.9.7.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
-cad_to_dagmc-0.9.7.dist-info/RECORD,,