cad-to-dagmc 0.6.2__tar.gz → 0.7.0__tar.gz

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/.github/workflows/black.yml

@@ -13,11 +13,11 @@ jobs:
   black:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: ${{ github.head_ref }}
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
     - name: Install black
@@ -27,6 +27,6 @@ jobs:
     - name: Run black
       run: |
         black --line-length 100 .
-    - uses: stefanzweifel/git-auto-commit-action@v4
+    - uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: "[skip ci] Apply formatting changes"

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/.github/workflows/ci_with_install.yml

@@ -21,6 +21,9 @@ on:
 jobs:
   testing:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -37,7 +40,7 @@ jobs:
           sudo apt-get upgrade -y
           sudo apt-get install -y libgl1-mesa-glx libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0
           mamba activate
-          mamba create -y --name cad_to_dagmc python=3.10
+          mamba create -y --name cad_to_dagmc python=${{ matrix.python-version }}
           mamba activate cad_to_dagmc
           mamba install -y -c conda-forge "openmc=0.14.0=dagmc*nompi*" gmsh python-gmsh
           python -m pip install --upgrade pip 
@@ -45,7 +48,6 @@ jobs:
           python -c "import cad_to_dagmc"
           python -m pip install .[tests]
           pytest -v tests
-          python examples/surface_mesh/create_stp_files_for_examples.py
           python examples/surface_mesh/cadquery_assembly.py
           python examples/surface_mesh/cadquery_compound.py
           python examples/surface_mesh/cadquery_object_and_stp_file.py
@@ -56,5 +58,6 @@ jobs:
           python examples/surface_mesh/single_stp_file_multiple_volumes.py
           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/unstrucutred_volume_mesh/curved_cadquery_object_to_dagmc_volume_mesh.py
           python examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/.github/workflows/ci_with_pip_install.yml

@@ -53,15 +53,16 @@ jobs:
           python -m pip install .[tests]
           pytest -v tests
           cd examples
-          python create_stp_files_for_examples.py
-          python cadquery_assembly.py
-          python cadquery_compound.py
-          python cadquery_object_and_stp_file.py
-          python cadquery_text.py
-          python curved_cadquery_object_to_dagmc_surface_mesh.py
-          python curved_cadquery_object_to_dagmc_volume_mesh.py
-          python multiple_cadquery_objects.py
-          python multiple_stp_files.py
-          python single_stp_file_multiple_volumes.py
-          python single_cadquery_object.py
-          python single_stp_file.py
+          python examples/surface_mesh/cadquery_assembly.py
+          python examples/surface_mesh/cadquery_compound.py
+          python examples/surface_mesh/cadquery_object_and_stp_file.py
+          python examples/surface_mesh/cadquery_text.py
+          python examples/surface_mesh/curved_cadquery_object_to_dagmc_surface_mesh.py
+          python examples/surface_mesh/multiple_cadquery_objects.py
+          python examples/surface_mesh/multiple_stp_files.py
+          python examples/surface_mesh/single_stp_file_multiple_volumes.py
+          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/unstrucutred_volume_mesh/curved_cadquery_object_to_dagmc_volume_mesh.py
+          python examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cad_to_dagmc
-Version: 0.6.2
+Version: 0.7.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
@@ -51,10 +51,59 @@ Also checkout these other software projects that also create DAGMC geometry [CAD
 
 # Installation options
 
+- Install using Mamba
+- Install using Conda
 - Install using Mamba and pip
 - Install using Conda and pip
 - Install using pip and source compilations
 
+## Install using Mamba
+
+In principle, installing any Conda/Mamba distribution will work. A few Conda/Mamba options are:
+- [Miniforge](https://github.com/conda-forge/miniforge) (recommended as it includes mamba)
+- [Anaconda](https://www.anaconda.com/download)
+- [Miniconda](https://docs.conda.io/en/latest/miniconda.html)
+
+This example assumes you have installed the Miniforge option or separately have installed Mamba with ```conda install -c conda-forge mamba -y```
+
+Create a new environment, I've chosen Python 3.10 here but newer versions are
+also supported.
+```bash
+mamba create --name new_env python=3.10 -y
+```
+
+Activate the environment
+```bash
+mamba activate new_env
+```
+
+Then you can install the cad_to_dagmc package
+```bash
+mamba install -y -c conda-forge cad_to_dagmc
+```
+
+## Install using Conda
+
+In principle, installing any Conda/Mamba distribution will work. A few Conda/Mamba options are:
+- [Miniforge](https://github.com/conda-forge/miniforge) (recommended as it includes mamba)
+- [Anaconda](https://www.anaconda.com/download)
+- [Miniconda](https://docs.conda.io/en/latest/miniconda.html)
+
+Create a new environment, I've chosen Python 3.10 here but newer versions are
+also supported.
+```bash
+conda create --name new_env python=3.10 -y
+```
+
+Activate the environment
+```bash
+conda activate new_env
+```
+
+Then you can install the cad_to_dagmc package
+```bash
+conda install -y -c conda-forge cad_to_dagmc
+```
 
 ## Install using Mamba and pip
 
@@ -65,7 +114,7 @@ In principle, installing any Conda/Mamba distribution will work. A few Conda/Mam
 
 This example assumes you have installed the Miniforge option or separately have installed Mamba with ```conda install -c conda-forge mamba -y```
 
-Create a new conda environment, I've chosen Python 3.10 here but newer versions are
+Create a new environment, I've chosen Python 3.10 here but newer versions are
 also supported.
 ```bash
 mamba create --name new_env python=3.10 -y
@@ -81,7 +130,7 @@ Install the dependencies
 mamba install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
 ```
 
-Then you can install the cad_to_dagmc package with ```pip```
+Then you can install the cad_to_dagmc package
 ```bash
 pip install cad_to_dagmc
 ```
@@ -96,7 +145,7 @@ In principle, installing any Conda/Mamba distribution will work. A few Conda/Mam
 
 This example uses Conda to install some dependencies that are not available via PyPi.
 
-Create a new conda environment
+Create a new environment
 ```bash
 conda create --name new_env python=3.10 -y
 ```
@@ -111,7 +160,7 @@ Install the dependencies
 conda install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
 ```
 
-Then you can install the cad_to_dagmc package with ```pip```
+Then you can install the cad_to_dagmc package
 ```bash
 pip install cad_to_dagmc
 ```
@@ -130,7 +179,7 @@ Then you can install the cad_to_dagmc package with ```pip```
 pip install cad_to_dagmc
 ```
 
-## Install with transport code (e.g OpenMC)
+## Install with OpenMC or other particle transport codes
 
 You may also want to install OpenMC with DAGMC to make use of the h5m geometry files produced in simulations. However you could also use other supported particle transport codes such as MCNP, FLUKA and others [link to DAGMC documentation](https://svalinn.github.io/DAGMC/).
 
@@ -144,7 +193,6 @@ It might not be possible to install OpenMC and cad-to-dagmc in the same conda/ma
 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.
 
 
-
 # Known incompatibilities
 
 The package requires newer versions of Linux. For example the package does not work on Ubuntu 18.04 or older.
@@ -153,20 +201,6 @@ The package requires newer versions of pip. It is recommended to ensure that you
 
 Installing one of the package dependancies (gmsh) with pip appears to result in occational errors when passing cad objects between cadquery / ocp and gmsh. The conda install gmsh appears to work fine.
 
-# Usage - with OpenMC
-
-You may also want to install OpenMC with DAGMC to make use of the h5m geometry files produced in simulations. However you could also use other supported particle transport codes such as MCNP, FLUKA and others supported by [DAGMC](https://svalinn.github.io/DAGMC/).
-
-You can run ```mamba install -c conda-forge openmc``` however this may choose to install OpenMC without DAGMC included.
-
-You can be more specific with conda/mamba commands to make sure the latest version of OpenMC which contains DAGMC is chosen by conda / mamba
-```bash
-mamba install -c conda-forge -y "openmc=0.14.0=dagmc*nompi*"
-```
-
-You could also [install OpenMC from source](https://docs.openmc.org/en/stable/quickinstall.html) which might be prefered as it can be tricky for the conda enviroment to get resolved.
-
-
 
 # Usage - creation of DAGMC h5m files
 

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/README.md

@@ -30,10 +30,59 @@ Also checkout these other software projects that also create DAGMC geometry [CAD
 
 # Installation options
 
+- Install using Mamba
+- Install using Conda
 - Install using Mamba and pip
 - Install using Conda and pip
 - Install using pip and source compilations
 
+## Install using Mamba
+
+In principle, installing any Conda/Mamba distribution will work. A few Conda/Mamba options are:
+- [Miniforge](https://github.com/conda-forge/miniforge) (recommended as it includes mamba)
+- [Anaconda](https://www.anaconda.com/download)
+- [Miniconda](https://docs.conda.io/en/latest/miniconda.html)
+
+This example assumes you have installed the Miniforge option or separately have installed Mamba with ```conda install -c conda-forge mamba -y```
+
+Create a new environment, I've chosen Python 3.10 here but newer versions are
+also supported.
+```bash
+mamba create --name new_env python=3.10 -y
+```
+
+Activate the environment
+```bash
+mamba activate new_env
+```
+
+Then you can install the cad_to_dagmc package
+```bash
+mamba install -y -c conda-forge cad_to_dagmc
+```
+
+## Install using Conda
+
+In principle, installing any Conda/Mamba distribution will work. A few Conda/Mamba options are:
+- [Miniforge](https://github.com/conda-forge/miniforge) (recommended as it includes mamba)
+- [Anaconda](https://www.anaconda.com/download)
+- [Miniconda](https://docs.conda.io/en/latest/miniconda.html)
+
+Create a new environment, I've chosen Python 3.10 here but newer versions are
+also supported.
+```bash
+conda create --name new_env python=3.10 -y
+```
+
+Activate the environment
+```bash
+conda activate new_env
+```
+
+Then you can install the cad_to_dagmc package
+```bash
+conda install -y -c conda-forge cad_to_dagmc
+```
 
 ## Install using Mamba and pip
 
@@ -44,7 +93,7 @@ In principle, installing any Conda/Mamba distribution will work. A few Conda/Mam
 
 This example assumes you have installed the Miniforge option or separately have installed Mamba with ```conda install -c conda-forge mamba -y```
 
-Create a new conda environment, I've chosen Python 3.10 here but newer versions are
+Create a new environment, I've chosen Python 3.10 here but newer versions are
 also supported.
 ```bash
 mamba create --name new_env python=3.10 -y
@@ -60,7 +109,7 @@ Install the dependencies
 mamba install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
 ```
 
-Then you can install the cad_to_dagmc package with ```pip```
+Then you can install the cad_to_dagmc package
 ```bash
 pip install cad_to_dagmc
 ```
@@ -75,7 +124,7 @@ In principle, installing any Conda/Mamba distribution will work. A few Conda/Mam
 
 This example uses Conda to install some dependencies that are not available via PyPi.
 
-Create a new conda environment
+Create a new environment
 ```bash
 conda create --name new_env python=3.10 -y
 ```
@@ -90,7 +139,7 @@ Install the dependencies
 conda install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
 ```
 
-Then you can install the cad_to_dagmc package with ```pip```
+Then you can install the cad_to_dagmc package
 ```bash
 pip install cad_to_dagmc
 ```
@@ -109,7 +158,7 @@ Then you can install the cad_to_dagmc package with ```pip```
 pip install cad_to_dagmc
 ```
 
-## Install with transport code (e.g OpenMC)
+## Install with OpenMC or other particle transport codes
 
 You may also want to install OpenMC with DAGMC to make use of the h5m geometry files produced in simulations. However you could also use other supported particle transport codes such as MCNP, FLUKA and others [link to DAGMC documentation](https://svalinn.github.io/DAGMC/).
 
@@ -123,7 +172,6 @@ It might not be possible to install OpenMC and cad-to-dagmc in the same conda/ma
 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.
 
 
-
 # Known incompatibilities
 
 The package requires newer versions of Linux. For example the package does not work on Ubuntu 18.04 or older.
@@ -132,20 +180,6 @@ The package requires newer versions of pip. It is recommended to ensure that you
 
 Installing one of the package dependancies (gmsh) with pip appears to result in occational errors when passing cad objects between cadquery / ocp and gmsh. The conda install gmsh appears to work fine.
 
-# Usage - with OpenMC
-
-You may also want to install OpenMC with DAGMC to make use of the h5m geometry files produced in simulations. However you could also use other supported particle transport codes such as MCNP, FLUKA and others supported by [DAGMC](https://svalinn.github.io/DAGMC/).
-
-You can run ```mamba install -c conda-forge openmc``` however this may choose to install OpenMC without DAGMC included.
-
-You can be more specific with conda/mamba commands to make sure the latest version of OpenMC which contains DAGMC is chosen by conda / mamba
-```bash
-mamba install -c conda-forge -y "openmc=0.14.0=dagmc*nompi*"
-```
-
-You could also [install OpenMC from source](https://docs.openmc.org/en/stable/quickinstall.html) which might be prefered as it can be tricky for the conda enviroment to get resolved.
-
-
 
 # Usage - creation of DAGMC h5m files
 

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/examples/surface_mesh/cadquery_assembly.py

@@ -1,14 +1,13 @@
 import cadquery as cq
-from cadquery import Assembly
 from cad_to_dagmc import CadToDagmc
 
 result = cq.Workplane().sphere(5)
 result2 = cq.Workplane().moveTo(10, 0).sphere(2)
 
-assembly = Assembly()
+assembly = cq.Assembly()
 assembly.add(result)
 assembly.add(result2)
 
 my_model = CadToDagmc()
-my_model.add_cadquery_object(assembly)
-my_model.export_dagmc_h5m_file(min_mesh_size=0.5, max_mesh_size=1.0, material_tags=["mat1", "mat2"])
+my_model.add_cadquery_object(cadquery_object=assembly, material_tags=["mat1", "mat2"])
+my_model.export_dagmc_h5m_file(min_mesh_size=0.5, max_mesh_size=1.0)

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/examples/surface_mesh/cadquery_compound.py

@@ -24,5 +24,5 @@ cq_shape_2 = r2.extrude(1)
 compound_of_shapes = cq.Compound.makeCompound([cq_shape_1.val(), cq_shape_2.val()])
 
 my_model = CadToDagmc()
-my_model.add_cadquery_object(object=compound_of_shapes)
-my_model.export_dagmc_h5m_file(max_mesh_size=0.2, min_mesh_size=0.1, material_tags=["mat1", "mat2"])
+my_model.add_cadquery_object(cadquery_object=compound_of_shapes, material_tags=["mat1", "mat2"])
+my_model.export_dagmc_h5m_file(max_mesh_size=0.2, min_mesh_size=0.1)

cad_to_dagmc-0.7.0/examples/surface_mesh/cadquery_object_and_stp_file.py

@@ -0,0 +1,28 @@
+from cad_to_dagmc import CadToDagmc
+import cadquery as cq
+
+result = cq.Workplane("XY").moveTo(10, 0).box(3, 3, 0.5).edges("|Z").fillet(0.125)
+
+result2 = cq.Workplane("XY").box(1.0, 1.0, 1.0)
+assembly = cq.Assembly()
+assembly.add(result2)
+assembly.save("single_cube.stp", exportType="STEP")
+
+
+my_model = CadToDagmc()
+
+my_model.add_cadquery_object(
+    cadquery_object=result,
+    material_tags=["mat1"],
+)
+
+my_model.add_stp_file(
+    filename="single_cube.stp",
+    scale_factor=0.1,
+    material_tags=["mat2"],
+)
+
+my_model.export_dagmc_h5m_file(
+    max_mesh_size=0.2,
+    min_mesh_size=0.1,
+)

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/examples/surface_mesh/cadquery_text.py

@@ -5,12 +5,8 @@ text = cq.Workplane().text(txt="DAGMC", fontsize=10, distance=1)
 
 
 my_model = CadToDagmc()
-my_model.add_cadquery_object(object=text)
-
-my_model.export_dagmc_h5m_file(
-    filename="cadquery_text.h5m",
-    max_mesh_size=0.2,
-    min_mesh_size=0.1,
+my_model.add_cadquery_object(
+    cadquery_object=text,
     material_tags=[
         "mat1",
         "mat2",
@@ -19,3 +15,9 @@ my_model.export_dagmc_h5m_file(
         "mat5",
     ],  # 5 volumes one for each letter
 )
+
+my_model.export_dagmc_h5m_file(
+    filename="cadquery_text.h5m",
+    max_mesh_size=0.2,
+    min_mesh_size=0.1,
+)

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/examples/surface_mesh/curved_cadquery_object_to_dagmc_surface_mesh.py

@@ -39,11 +39,13 @@ result = (
 
 my_model = CadToDagmc()
 
-my_model.add_cadquery_object(result)
+my_model.add_cadquery_object(
+    cadquery_object=result,
+    material_tags=["mat1"],
+)
 
 my_model.export_dagmc_h5m_file(
     filename="cadquery_objects_and_stp_files.h5m",
     max_mesh_size=1,
     min_mesh_size=0.1,
-    material_tags=["mat1"],
 )

cad_to_dagmc-0.7.0/examples/surface_mesh/from_gmsh_mesh_file.py

@@ -0,0 +1,55 @@
+# 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
+
+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()
+assembly.add(result1)
+assembly.add(result2)
+assembly.save("two_connected_cubes.stp", exportType="STEP")
+
+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")
+
+mesh.export_dagmc_h5m_file(
+    material_tags=["mat1", "mat2"],
+    filename="dagmc.h5m",
+)
+
+# making use of the DAGMC file in OpenMC
+import openmc
+
+openmc.config["cross_sections"] = "cross_sections.xml"
+
+mat1 = openmc.Material(name="mat1")
+mat1.add_nuclide("H1", 1, percent_type="ao")
+mat1.set_density("g/cm3", 0.001)
+
+mat2 = openmc.Material(name="mat2")
+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.6.2 → cad_to_dagmc-0.7.0}/examples/surface_mesh/multiple_cadquery_objects.py

@@ -7,6 +7,6 @@ box = cq.Workplane("XY").moveTo(2, 0).box(2, 2, 2)
 box_with_round_corners = cq.Workplane("XY").box(2, 1, 1)
 
 my_model = CadToDagmc()
-my_model.add_cadquery_object(box)
-my_model.add_cadquery_object(box_with_round_corners)
-my_model.export_dagmc_h5m_file(material_tags=["mat1", "mat2"])
+my_model.add_cadquery_object(cadquery_object=box, material_tags=["mat1"])
+my_model.add_cadquery_object(cadquery_object=box_with_round_corners, material_tags=["mat2"])
+my_model.export_dagmc_h5m_file()

cad_to_dagmc-0.7.0/examples/surface_mesh/multiple_stp_files.py

@@ -0,0 +1,30 @@
+from cad_to_dagmc import CadToDagmc
+import cadquery as cq
+
+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()
+assembly.add(result1)
+assembly.add(result2)
+assembly.save("two_connected_cubes.stp", exportType="STEP")
+
+result = cq.Workplane().moveTo(100, 0).sphere(5)
+assembly = cq.Assembly()
+assembly.add(result)
+assembly.save("single_sphere.stp", exportType="STEP")
+
+my_model = CadToDagmc()
+my_model.add_stp_file(
+    filename="two_connected_cubes.stp",
+    material_tags=["mat1", "mat2"],
+)
+my_model.add_stp_file(
+    filename="single_sphere.stp",
+    material_tags=["mat3"],
+)
+
+my_model.export_dagmc_h5m_file(
+    max_mesh_size=1,
+    min_mesh_size=0.5,
+    implicit_complement_material_tag="air",
+)

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/examples/surface_mesh/single_cadquery_object.py

@@ -4,5 +4,5 @@ import cadquery as cq
 result = sphere = cq.Workplane().moveTo(100, 0).sphere(5)
 
 my_model = CadToDagmc()
-my_model.add_cadquery_object(result)
-my_model.export_dagmc_h5m_file(material_tags=["mat1"])
+my_model.add_cadquery_object(cadquery_object=result, material_tags=["mat1"])
+my_model.export_dagmc_h5m_file()

cad_to_dagmc-0.7.0/examples/surface_mesh/single_stp_file.py

@@ -0,0 +1,24 @@
+from cad_to_dagmc import CadToDagmc
+
+import cadquery as cq
+
+result = cq.Workplane("XY")
+spline_points = [
+    (2.75, 1.5),
+    (2.5, 1.75),
+    (2.0, 1.5),
+    (1.5, 1.0),
+    (1.0, 1.25),
+    (0.5, 1.0),
+    (0, 1.0),
+]
+r = result.lineTo(3.0, 0).lineTo(3.0, 1.0).spline(spline_points, includeCurrent=True).close()
+result = r.extrude(1.5)
+assembly = cq.Assembly()
+assembly.add(result)
+assembly.save("spline_extrude.stp", exportType="STEP")
+
+
+my_model = CadToDagmc()
+my_model.add_stp_file(filename="spline_extrude.stp", material_tags=["mat1"])
+my_model.export_dagmc_h5m_file()

cad_to_dagmc-0.7.0/examples/surface_mesh/single_stp_file_multiple_volumes.py

@@ -0,0 +1,16 @@
+from cad_to_dagmc import CadToDagmc
+
+import cadquery as cq
+
+result = cq.Workplane().text(txt="DAGMC", fontsize=10, distance=1)
+assembly = cq.Assembly()
+assembly.add(result)
+assembly.save("text_dagmc.stp", exportType="STEP")
+
+
+my_model = CadToDagmc()
+# the d and c from the word dagmc would be tagged with one material and the agm are tagged with another material
+my_model.add_stp_file(
+    filename="text_dagmc.stp", material_tags=["mat1", "mat2", "mat2", "mat2", "mat1"]
+)
+my_model.export_dagmc_h5m_file()

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py

@@ -19,7 +19,6 @@ mesh_filter = openmc.MeshFilter(umesh)
 tally = openmc.Tally(name="unstrucutred_mesh_tally")
 tally.filters = [mesh_filter]
 tally.scores = ["flux"]
-tally.estimator = "tracklength"
 my_tallies = openmc.Tallies([tally])
 
 
@@ -38,7 +37,6 @@ my_geometry = openmc.Geometry([cell1])
 
 my_settings = openmc.Settings()
 my_settings.batches = 10
-my_settings.inactive = 0
 my_settings.particles = 5000
 my_settings.run_mode = "fixed source"
 

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.0}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.6.2'
-__version_tuple__ = version_tuple = (0, 6, 2)
+__version__ = version = '0.7.0'
+__version_tuple__ = version_tuple = (0, 7, 0)