cad-to-dagmc 0.8.2__tar.gz → 0.9.0__tar.gz

{cad_to_dagmc-0.8.2 → cad_to_dagmc-0.9.0}/.github/workflows/ci_with_benchmarks.yml

@@ -41,10 +41,11 @@ jobs:
           python -m ensurepip --upgrade
           python -m pip install . --no-deps
           python -m pip install openmc_data_downloader
-          openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9
+          openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9 Al27
           git clone --single-branch -b main --depth 1 https://github.com/fusion-energy/model_benchmark_zoo.git
           cd model_benchmark_zoo
           python -m pip install .[tests]
+          pip install git+https://github.com/svalinn/pydagmc
           conda env export > environment.yml
           cat environment.yml
           pytest tests/test_cad_to_dagmc -v

{cad_to_dagmc-0.8.2 → cad_to_dagmc-0.9.0}/.github/workflows/ci_with_conda_install.yml

@@ -44,6 +44,7 @@ jobs:
         run: |
           conda install -y -c conda-forge "openmc=0.15.0=dagmc*nompi*" trimesh networkx cadquery gmsh python-gmsh vtk
           python -m pip install .[tests]
+          python -m pip install git+https://github.com/svalinn/pydagmc
 
       - name: Test import
         shell: bash -l {0}
@@ -65,6 +66,8 @@ jobs:
           python examples/surface_mesh/cadquery_text.py
           python examples/surface_mesh/curved_cadquery_object_to_dagmc_surface_mesh.py
           python examples/surface_mesh/from_gmsh_mesh_file.py
+          python examples/surface_mesh/from_gmsh_mesh_file_with_tags.py
+          python examples/surface_mesh/from_gmsh_object_with_tag.py
           python examples/surface_mesh/multiple_cadquery_objects.py
           python examples/surface_mesh/multiple_stp_files.py
           python examples/surface_mesh/single_cadquery_object.py

{cad_to_dagmc-0.8.2 → cad_to_dagmc-0.9.0}/.github/workflows/ci_with_pip_install.yml

@@ -43,6 +43,7 @@ jobs:
           cd ..
           python -c "import pymoab"
           python -m pip install .[tests]
+          python -m pip install git+https://github.com/svalinn/pydagmc
           python -c "import cad_to_dagmc"
           pytest -v tests
           python examples/surface_mesh/cadquery_assembly.py
@@ -56,6 +57,8 @@ jobs:
           python examples/surface_mesh/single_cadquery_object.py
           python examples/surface_mesh/single_stp_file.py
           python examples/surface_mesh/from_gmsh_mesh_file.py
+          python examples/surface_mesh/from_gmsh_mesh_file_with_tags.py
+          python examples/surface_mesh/from_gmsh_object_with_tag.py
           python examples/unstrucutred_volume_mesh/curved_cadquery_object_to_dagmc_volume_mesh.py
           python examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py
           python examples/unstrucutred_volume_mesh/different_resolution_meshes.py

{cad_to_dagmc-0.8.2 → cad_to_dagmc-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.8.2
+Version: 0.9.0
 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
@@ -20,6 +20,8 @@ Requires-Dist: gmsh
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: vtk; extra == "tests"
+Requires-Dist: assembly-mesh-plugin; extra == "tests"
+Dynamic: license-file
 
 
 [![N|Python](https://www.python.org/static/community_logos/python-powered-w-100x40.png)](https://www.python.org)
@@ -43,10 +45,13 @@ cad-to-dagmc can create DAGMC compatible:
 
 cad-to-dagmc can convert the following in to DAGMC compatible meshes:
 - STEP files
-- CadQuery objects (in memory)
-- Gmsh meshes
+- CadQuery objects (optionally use names as material tags)
+- Gmsh meshes (optionally use physical groups as material tags)
 
 Cad-to-dagmc offers a wide range of features including.
+- Compatibly with [assembly-mesh-plugin](https://github.com/CadQuery/assembly-mesh-plugin) (see examples)
+- Access to the Gmsh mesh to allow user to define full set of mesh parameters
+- Option to use Gmsh physical groups as material tags
 - Geometry scaling with ```scale_factor``` argument
 - Model wide mesh size parameters with ```min_mesh_size``` and ```max_mesh_size``` arguments
 - Volume specific mesh sizing parameters with the ```set_size``` argument

{cad_to_dagmc-0.8.2 → cad_to_dagmc-0.9.0}/README.md

@@ -20,10 +20,13 @@ cad-to-dagmc can create DAGMC compatible:
 
 cad-to-dagmc can convert the following in to DAGMC compatible meshes:
 - STEP files
-- CadQuery objects (in memory)
-- Gmsh meshes
+- CadQuery objects (optionally use names as material tags)
+- Gmsh meshes (optionally use physical groups as material tags)
 
 Cad-to-dagmc offers a wide range of features including.
+- Compatibly with [assembly-mesh-plugin](https://github.com/CadQuery/assembly-mesh-plugin) (see examples)
+- Access to the Gmsh mesh to allow user to define full set of mesh parameters
+- Option to use Gmsh physical groups as material tags
 - Geometry scaling with ```scale_factor``` argument
 - Model wide mesh size parameters with ```min_mesh_size``` and ```max_mesh_size``` arguments
 - Volume specific mesh sizing parameters with the ```set_size``` argument

{cad_to_dagmc-0.8.2 → cad_to_dagmc-0.9.0}/examples/surface_mesh/from_gmsh_mesh_file.py

@@ -1,11 +1,12 @@
 # this file makes a GMESH mesh file from a Step file
 # then loads up the GMESH file and converts it to a DAGMC file
 
-
-# making the GMESH file
 from cad_to_dagmc import CadToDagmc
 import cadquery as cq
+import cad_to_dagmc
+import openmc
 
+# making the gmsh file just so we have one for the example
 result1 = cq.Workplane("XY").box(10.0, 10.0, 5.0)
 result2 = cq.Workplane("XY").moveTo(10, 0).box(10.0, 10.0, 5.0)
 assembly = cq.Assembly()
@@ -17,18 +18,15 @@ geometry = CadToDagmc()
 geometry.add_stp_file("two_connected_cubes.stp")
 geometry.export_gmsh_mesh_file(filename="example_gmsh_mesh.msh")
 
-# converting the mesh file to a DAGMC file
-from cad_to_dagmc import MeshToDagmc
 
-mesh = MeshToDagmc(filename="example_gmsh_mesh.msh")
+# converting the mesh file to a DAGMC file
 
-mesh.export_dagmc_h5m_file(
+cad_to_dagmc.export_gmsh_file_to_dagmc_h5m_file(
+    gmsh_filename="example_gmsh_mesh.msh",
     material_tags=["mat1", "mat2"],
-    filename="dagmc.h5m",
+    dagmc_filename="dagmc.h5m",
 )
 
-# making use of the DAGMC file in OpenMC
-import openmc
 
 openmc.config["cross_sections"] = "cross_sections.xml"
 

cad_to_dagmc-0.9.0/examples/surface_mesh/from_gmsh_mesh_file_with_tags.py

@@ -0,0 +1,44 @@
+# this file makes a GMESH mesh file that contains 3D physical groups.
+# these groups are then used as the material tags in the DAGMC file.
+
+
+# making the GMESH file
+import cad_to_dagmc
+import openmc
+
+
+# converting the mesh file to a DAGMC file
+
+cad_to_dagmc.export_gmsh_file_to_dagmc_h5m_file(
+    gmsh_filename="examples/surface_mesh/tagged_mesh.msh",
+    # no need to specify material tags as the mesh file already has physical
+    # groups which are used as material tags
+    # material_tags=["shell", "insert"],
+    dagmc_filename="dagmc.h5m",
+)
+
+# making use of the DAGMC file in OpenMC
+
+openmc.config["cross_sections"] = "cross_sections.xml"
+
+mat1 = openmc.Material(name="shell")
+mat1.add_nuclide("H1", 1, percent_type="ao")
+mat1.set_density("g/cm3", 0.001)
+
+mat2 = openmc.Material(name="insert")
+mat2.add_nuclide("H1", 1, percent_type="ao")
+mat2.set_density("g/cm3", 0.002)
+
+materials = openmc.Materials([mat1, mat2])
+
+universe = openmc.DAGMCUniverse("dagmc.h5m").bounded_universe()
+geometry = openmc.Geometry(universe)
+
+my_settings = openmc.Settings()
+my_settings.batches = 10
+my_settings.inactive = 0
+my_settings.particles = 500
+my_settings.run_mode = "fixed source"
+
+model = openmc.Model(geometry=geometry, materials=materials, settings=my_settings)
+model.run()

cad_to_dagmc-0.9.0/examples/surface_mesh/from_gmsh_object_with_tag.py

@@ -0,0 +1,26 @@
+import cadquery as cq
+import cad_to_dagmc
+import gmsh
+import assembly_mesh_plugin.plugin
+
+box_shape1 = cq.Workplane("XY").box(50, 50, 50)
+box_shape2 = cq.Workplane("XY").moveTo(0, 50).box(50, 50, 100)
+
+assembly = cq.Assembly()
+assembly.add(box_shape1, name="first_material")
+assembly.add(box_shape2, name="second_material")
+
+# getTaggedGmsh initializes gmsh and creates a mesh object ready for meshing
+assembly.getTaggedGmsh()
+# Here you can set the mesh parameters
+# In this case, we set the minimum and maximum mesh size
+# but you can set any other Gmsh parameters
+# Remember that the gmsh has physical groups if you want to use them when meshing
+gmsh.option.setNumber("Mesh.MeshSizeMax", 4.2)
+gmsh.model.mesh.generate(2)  # for DAGMC surface mesh we just need a 2D surface mesh
+
+cad_to_dagmc.export_gmsh_object_to_dagmc_h5m_file(filename="dagmc_from_gmsh_object.h5m")
+
+# finalize the GMSH API after using export_gmsh_object_to_dagmc_h5m_file
+# and getTaggedGmsh as these both need access to the GMSH object.
+gmsh.finalize()