cad-to-dagmc 0.9.6__tar.gz → 0.9.8__tar.gz

{cad_to_dagmc-0.9.6 → cad_to_dagmc-0.9.8}/.github/workflows/ci_with_pip_install.yml

@@ -21,22 +21,25 @@ on:
 jobs:
   testing:
     runs-on: ubuntu-latest
-    container:
-      image: openmc/openmc:develop-dagmc
+    strategy:
+      matrix:
+        python-version: [3.12]
     steps:
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: install non pypi dependencies
         shell: bash
         run: |
-          apt-get --allow-releaseinfo-change update
-          apt-get update -y
-          apt-get upgrade -y
-          apt-get install -y libblas-dev liblapack-dev libgl1 libglx-mesa0 libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0 libxcursor-dev libxft2 libxinerama-dev make cmake libeigen3-dev
-          apt install python3
-          apt install python3-pip
-          python -m pip install --extra-index-url https://shimwell.github.io/wheels moab
+          sudo apt-get update -y
+          sudo apt-get upgrade -y
+          sudo apt-get install -y libblas-dev liblapack-dev libgl1 libglx-mesa0 libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0 libxcursor-dev libxft2 libxinerama-dev make cmake libeigen3-dev
+          # Python3 and pip are pre-installed on GitHub Actions runners
+          python -m pip install --extra-index-url https://shimwell.github.io/wheels moab openmc
           python -c "import pymoab"
           python -m pip install .[tests]
           python -m pip install git+https://github.com/svalinn/pydagmc

{cad_to_dagmc-0.9.6 → cad_to_dagmc-0.9.8}/PKG-INFO

@@ -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.6 → cad_to_dagmc-0.9.8}/README.md

@@ -48,7 +48,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
 
@@ -126,10 +126,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.6 → cad_to_dagmc-0.9.8}/src/_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 = 'gc9bf24ac7'
+__commit_id__ = commit_id = 'g00e5e76df'

{cad_to_dagmc-0.9.6 → cad_to_dagmc-0.9.8}/src/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-0.9.6 → cad_to_dagmc-0.9.8}/src/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 → cad_to_dagmc-0.9.8}/src/cad_to_dagmc.egg-info/PKG-INFO

@@ -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.6 → cad_to_dagmc-0.9.8}/tests/test_file_creation.py

@@ -133,7 +133,9 @@ def test_h5m_with_multi_volume_touching(meshing_backend):
         assert get_volumes_and_materials_from_h5m(h5m_file) == tags_dict
 
         cad_to_dagmc.export_gmsh_file_to_dagmc_h5m_file(
-            dagmc_filename=h5m_file, material_tags=mat_tags, gmsh_filename=h5m_file + ".msh"
+            dagmc_filename=h5m_file,
+            material_tags=mat_tags,
+            gmsh_filename=h5m_file + ".msh",
         )
         assert get_volumes_and_materials_from_h5m(h5m_file) == tags_dict
 

{cad_to_dagmc-0.9.6 → cad_to_dagmc-0.9.8}/tests/test_get_volumes.py

@@ -9,8 +9,14 @@ import cad_to_dagmc
     "scale_factor, expected_bbox",
     [
         (1.0, (-5.0000001, -5.0000001, -5.0000001, 5.0000001, 5.0000001, 5.0000001)),
-        (2.0, (-10.0000001, -10.0000001, -10.0000001, 10.0000001, 10.0000001, 10.0000001)),
-        (10.0, (-50.0000001, -50.0000001, -50.0000001, 50.0000001, 50.0000001, 50.0000001)),
+        (
+            2.0,
+            (-10.0000001, -10.0000001, -10.0000001, 10.0000001, 10.0000001, 10.0000001),
+        ),
+        (
+            10.0,
+            (-50.0000001, -50.0000001, -50.0000001, 50.0000001, 50.0000001, 50.0000001),
+        ),
     ],
 )
 def test_get_volumes(scale_factor, expected_bbox):
@@ -35,8 +41,18 @@ def test_get_volumes(scale_factor, expected_bbox):
 @pytest.mark.parametrize(
     "scale_factor, expected_bbox_lower_left, expected_bbox_upper_right, meshing_backend",
     [
-        (1.0, (-5.0000001, -5.0000001, -5.0000001), (5.0000001, 5.0000001, 5.0000001), "cadquery"),
-        (1.0, (-5.0000001, -5.0000001, -5.0000001), (5.0000001, 5.0000001, 5.0000001), "gmsh"),
+        (
+            1.0,
+            (-5.0000001, -5.0000001, -5.0000001),
+            (5.0000001, 5.0000001, 5.0000001),
+            "cadquery",
+        ),
+        (
+            1.0,
+            (-5.0000001, -5.0000001, -5.0000001),
+            (5.0000001, 5.0000001, 5.0000001),
+            "gmsh",
+        ),
         (
             2.0,
             (-10.0000001, -10.0000001, -10.0000001),

{cad_to_dagmc-0.9.6 → cad_to_dagmc-0.9.8}/tests/test_h5m_in_transport.py

@@ -288,7 +288,9 @@ def test_umesh_with_volumes(meshing_backend):
     model.add_cadquery_object(assembly, material_tags=mat_tags)
 
     h5m_file = model.export_dagmc_h5m_file(
-        filename="dagmc.h5m", set_size={1: 0.9, 2: 0.1, 3: 0.9}, meshing_backend=meshing_backend
+        filename="dagmc.h5m",
+        set_size={1: 0.9, 2: 0.1, 3: 0.9},
+        meshing_backend=meshing_backend,
     )
 
     vtk_file = model.export_unstructured_mesh_file(

{cad_to_dagmc-0.9.6 → cad_to_dagmc-0.9.8}/tests/test_kwarg_args.py

@@ -54,7 +54,9 @@ class TestKwargsExportDagmcH5mFile:
 
         with pytest.raises(ValueError, match="CadQuery backend cannot be used for volume meshing"):
             self.my_model.export_dagmc_h5m_file(
-                filename=str(output_file), meshing_backend="cadquery", unstructured_volumes=[1]
+                filename=str(output_file),
+                meshing_backend="cadquery",
+                unstructured_volumes=[1],
             )
 
     def test_invalid_meshing_backend_raises_error(self, tmp_path):

{cad_to_dagmc-0.9.6 → cad_to_dagmc-0.9.8}/tests/test_python_api.py

@@ -400,7 +400,9 @@ def test_unstructured_mesh_with_volumes(meshing_backend):
     model.add_cadquery_object(assembly, material_tags=["mat1", "mat2", "mat3"])
 
     filename = model.export_dagmc_h5m_file(
-        filename="dagmc.h5m", set_size={1: 0.9, 2: 0.1, 3: 0.9}, meshing_backend=meshing_backend
+        filename="dagmc.h5m",
+        set_size={1: 0.9, 2: 0.1, 3: 0.9},
+        meshing_backend=meshing_backend,
     )
     assert Path(filename).is_file()