cad-to-dagmc 0.9.6__py3-none-any.whl → 0.9.8__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.6'
-__version_tuple__ = version_tuple = (0, 9, 6)
+__version__ = version = '0.9.8'
+__version_tuple__ = version_tuple = (0, 9, 8)
 
 __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)
@@ -687,6 +697,7 @@ class CadToDagmc:
             assembly.add(part)
 
         if imprint:
+            print("Imprinting assembly for unstructured mesh generation")
             imprinted_assembly, _ = cq.occ_impl.assembly.imprint(assembly)
         else:
             imprinted_assembly = assembly
@@ -777,6 +788,7 @@ class CadToDagmc:
             assembly.add(part)
 
         if imprint:
+            print("Imprinting assembly for mesh generation")
             imprinted_assembly, _ = cq.occ_impl.assembly.imprint(assembly)
         else:
             imprinted_assembly = assembly
@@ -1013,6 +1025,7 @@ class CadToDagmc:
         elif meshing_backend == "gmsh":
             # If assembly is not to be imprinted, pass through the assembly as-is
             if imprint:
+                print("Imprinting assembly for mesh generation")
                 imprinted_assembly, imprinted_solids_with_org_id = cq.occ_impl.assembly.imprint(
                     assembly
                 )

cad_to_dagmc/direct_mesh_plugin.py

@@ -291,6 +291,7 @@ def to_mesh(
     # Imprinted assemblies end up being compounds, whereas you have to step through each of the
     # parts in an assembly and extract the solids.
     if imprint:
+        print("Imprinting assembly for mesh generation")
         # Imprint the assembly and process it as a compound
         (
             imprinted_assembly,
@@ -329,6 +330,7 @@ def to_mesh(
 
     # Step through all of the collected solids and their respective faces to get the vertices
     for solid in solids:
+        print(f"Meshing solid {solid_idx} of {len(solids)}")
         # Reset this each time so that we get the correct number of faces per solid
         face_triangles = {}
 

{cad_to_dagmc-0.9.6.dist-info → cad_to_dagmc-0.9.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.6
+Version: 0.9.8
 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
@@ -73,7 +73,7 @@ Cad-to-dagmc offers a wide range of features including.
 
 - Install using Mamba
 - Install using Conda
-- Install using pip and source compilations
+- Install using pip
 
 ## Install using Mamba
 
@@ -151,10 +151,10 @@ You may also want to install OpenMC with DAGMC to make use of the h5m geometry f
 
 To install OpenMC you can run ```mamba install -c conda-forge openmc``` however this more specific command makes sure the latest version of OpenMC which contains DAGMC is chosen by conda / mamba
 ```bash
-mamba install -c conda-forge -y "openmc=0.15.0=dagmc*nompi*"
+mamba install -c conda-forge -y "openmc=0.15.2=dagmc*nompi*"
 ```
 
-It might not be possible to install OpenMC and cad-to-dagmc in the same conda/mamba python environment so you may have to create a new conda/mamba environment and install OpenMC there.
+You could also install using this [wheel repo](https://github.com/shimwell/wheels)
 
 Another option would be to [install OpenMC from source](https://docs.openmc.org/en/stable/quickinstall.html) which would also need compiling with MOAB and DAGMC options.
 

cad_to_dagmc-0.9.8.dist-info/RECORD

@@ -0,0 +1,9 @@
+_version.py,sha256=H7-sGIKTltvB6i41Ij4ifczW_TE-rd9_0VfDTgdon0w,704
+cad_to_dagmc/__init__.py,sha256=oCr1P0QnBsf6AH0RZujX7T7tdrb75NazdF70HtqXSfc,528
+cad_to_dagmc/core.py,sha256=i3iNhvKOLt2VfdQ8frSLQ5L8y1QC23JprLuoeqqiyD4,43222
+cad_to_dagmc/direct_mesh_plugin.py,sha256=iKPYtWQd35Ipxv6g8fZ-r7GFKd1VlCwrSfaNzrGFtf0,24131
+cad_to_dagmc-0.9.8.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
+cad_to_dagmc-0.9.8.dist-info/METADATA,sha256=rpYNMTMwcYgI_JqMRCcVlT2q0e8UnMCJACtoue617jc,8994
+cad_to_dagmc-0.9.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cad_to_dagmc-0.9.8.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
+cad_to_dagmc-0.9.8.dist-info/RECORD,,

cad_to_dagmc-0.9.6.dist-info/RECORD

@@ -1,9 +0,0 @@
-_version.py,sha256=e8-aWL0R1dkk01VJUUTVieOVR2LgJj8i-n3ez_PgchQ,704
-cad_to_dagmc/__init__.py,sha256=oCr1P0QnBsf6AH0RZujX7T7tdrb75NazdF70HtqXSfc,528
-cad_to_dagmc/core.py,sha256=88L93amP-SMzppnXa7tWTvPnVGTxJUvVLN9B8PL_fp4,42556
-cad_to_dagmc/direct_mesh_plugin.py,sha256=5jG5ILafjbDacaAvBRWD_ilMZLepcM6H1Tjze85vAxE,24013
-cad_to_dagmc-0.9.6.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
-cad_to_dagmc-0.9.6.dist-info/METADATA,sha256=0CdxtSGC0GnICOxxkFZB45Bj5lJyqBh052HVjiq23K8,9120
-cad_to_dagmc-0.9.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cad_to_dagmc-0.9.6.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
-cad_to_dagmc-0.9.6.dist-info/RECORD,,