cad-to-dagmc 0.5.1__tar.gz → 0.6.0__tar.gz

{cad_to_dagmc-0.5.1 → cad_to_dagmc-0.6.0}/.github/workflows/ci_with_benchmarks.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: install non pypi dependencies for cad creation
+      - name: install dependencies and run CSG / DAMGC benchmarks
         env:
           OPENMC_CROSS_SECTIONS: /home/runner/work/cad_to_dagmc/cad_to_dagmc/cross_sections.xml
         shell: bash
@@ -37,8 +37,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 install -y -c cadquery -c conda-forge moab gmsh python-gmsh cadquery=master "openmc=0.13.3=dagmc*nompi*"
-          mamba install -y -c conda-forge "openmc=0.13.3=dagmc*nompi*"
+          mamba install -y -c conda-forge moab gmsh python-gmsh cadquery=2.4.0 "openmc=0.14.0=dagmc*nompi*"
           python -m pip install --upgrade pip
           python -m pip install cad_to_dagmc openmc_data_downloader
           openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9

cad_to_dagmc-0.6.0/.github/workflows/ci_with_install.yml

@@ -0,0 +1,70 @@
+
+name: CI with install
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - 'docs/**'
+      - '.gitignore'
+      - '*.md'
+      - 'CITATION.cff'
+      - 'LICENSE.txt'
+      - 'readthedocs.yml'
+  push:
+    branches:
+      - main
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: install non pypi dependencies
+        shell: bash
+        run: |
+          wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
+          bash Miniforge3.sh -b -p "${HOME}/conda"
+          source "${HOME}/conda/etc/profile.d/conda.sh"
+          source "${HOME}/conda/etc/profile.d/mamba.sh"
+          sudo apt-get --allow-releaseinfo-change update
+          sudo apt-get update -y
+          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 activate cad_to_dagmc
+          mamba install -y -c conda-forge moab>=5.3.0 gmsh python-gmsh ocp=7.7.2.0 cadquery=2.4.0
+          python -m pip install --upgrade pip 
+          python -m pip install .
+          python -c "import cad_to_dagmc"
+          python -m pip install .[tests]
+          pytest -v tests/test_file_creation.py
+          pytest -v tests/test_loading_from_file_vs_shape_object.py
+          pytest -v tests/test_python_api.py
+          pytest -v tests/test_version.py
+          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
+          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/unstrucutred_volume_mesh/curved_cadquery_object_to_dagmc_volume_mesh.py
+          pytest -v tests/test_model_creation_for_transport.py
+          mamba activate base
+          mamba create -y --name openmc python=3.10
+          mamba activate openmc
+          mamba install -y -c conda-forge "openmc=0.14.0=dagmc*nompi*"
+          python -m pip install pytest
+          python -m pip install vtk
+          pytest -v tests/test_h5m_in_simulation.py
+          pytest -v tests/test_h5m_in_transport.py
+          python examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py

cad_to_dagmc-0.6.0/.github/workflows/ci_with_pip_install.yml

@@ -0,0 +1,57 @@
+
+name: CI with pip install
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - 'docs/**'
+      - '.gitignore'
+      - '*.md'
+      - 'CITATION.cff'
+      - 'LICENSE.txt'
+      - 'readthedocs.yml'
+  push:
+    branches:
+      - main
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    container:
+      image: openmc/openmc:develop-dagmc
+    steps:
+      - 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 libgl1-mesa-glx 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 
+          apt install python3
+          apt install python3-pip
+          python -m pip install --upgrade pip 
+          python -m pip install gmsh
+          python -m pip install cadquery-ocp==7.7.2
+          python -m pip install cadquery==2.4.0
+          python -m pip install .
+          python -c "import cad_to_dagmc"
+          python -m pip install .[tests]
+          pytest tests -v
+          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

{cad_to_dagmc-0.5.1 → cad_to_dagmc-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cad_to_dagmc
-Version: 0.5.1
+Version: 0.6.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
@@ -16,11 +16,12 @@ Requires-Dist: trimesh
 Requires-Dist: networkx
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
+Requires-Dist: vtk; extra == "tests"
 
 
 [![N|Python](https://www.python.org/static/community_logos/python-powered-w-100x40.png)](https://www.python.org)
 
-[![CI with model benchmark zoo](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_benchmarks.yml/badge.svg)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_benchmarks.yml) Testing package and running examples
+[![CI with install](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_install.yml/badge.svg?branch=main)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_install.yml) Testing package and running examples
 
 [![CI with model benchmark zoo](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_benchmarks.yml/badge.svg?branch=main)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_benchmarks.yml) Testing with [Model Benchmark Zoo](https://github.com/fusion-energy/model_benchmark_zoo)
 
@@ -29,34 +30,41 @@ Requires-Dist: pytest; extra == "tests"
 [![PyPI](https://img.shields.io/pypi/v/cad_to_dagmc?color=brightgreen&label=pypi&logo=grebrightgreenen&logoColor=green)](https://pypi.org/project/cad_to_dagmc/)
 
 
-A minimal package that uses CadQuery functionality to convert CAD geometry to [DAGMC](https://github.com/svalinn/DAGMC/) h5m files
+A minimal package that converts CAD geometry to [DAGMC](https://github.com/svalinn/DAGMC/) h5m files
+
+cad-to-dagmc can create:
+- surface meshes / faceted geometry / triangular meshes
+- unstructured mesh / tetrahedral meshes / volume meshes
+
+cad-to-dagmc can convert:
+- STEP files
+- CadQuery objects (in memory)
+
+cadto-dagmc aims to produce DAGMC compatible h5m files from CAD geometry is intended to convert [STEP](http://www.steptools.com/stds/step/) files or [CadQuery](https://cadquery.readthedocs.io) objects to a [DAGMC](https://github.com/svalinn/DAGMC/) compatible h5m file.
 
-This particular method of producing DAGMC compatible h5m files from CAD geometry is intended to convert STP files or [CadQuery](https://cadquery.readthedocs.io) objects to a DAGMC compatible h5m file.
 
 The resulting DAGMC geometry can then be used for simulations in [OpenMC](https://github.com/openmc-dev/openmc/) or [other supported codes](https://svalinn.github.io/DAGMC/).
 
 This package is tested with [pytest tests](https://github.com/fusion-energy/cad_to_dagmc/tree/main/tests) and also the DAGMC geometry made with this package is compared to simulation carried out with native constructive solid geometry, see [Model Benchmark Zoo](https://github.com/fusion-energy/model_benchmark_zoo) for more details.
 
-Also checkout these other packages that also create DAGMC geometry [CAD-to-OpenMC](https://github.com/openmsr/CAD_to_OpenMC), [Stellarmesh](https://github.com/Thea-Energy/stellarmesh) 
+Also checkout these other software projects that also create DAGMC geometry [CAD-to-OpenMC](https://github.com/openmsr/CAD_to_OpenMC), [Stellarmesh](https://github.com/Thea-Energy/stellarmesh) and [Coreform Cubit](https://coreform.com/products/coreform-cubit/)
 
 # Installation prerequisite
 
 In principle, any Conda/Mamba distribution will work. A few Conda/Mamba options are:
-- [Mambaforge](https://github.com/conda-forge/miniforge#mambaforge)
-- [Miniforge](https://github.com/conda-forge/miniforge#miniforge-pypy3)
+- [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)
 
 
 # Install using Mamba and pip
 
-This example assumes you have installed the MambaForge option or separately
-installed Mamba with ```conda install -c conda-forge mamba -y```
+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.9 here but new versions are
+Create a new conda environment, I've chosen Python 3.10 here but newer versions are
 also supported.
 ```bash
-mamba create --name new_env python=3.9 -y
+mamba create --name new_env python=3.10 -y
 ```
 
 Activate the environment
@@ -66,7 +74,7 @@ mamba activate new_env
 
 Install the dependencies
 ```bash
-mamba install -c cadquery -c conda-forge moab gmsh python-gmsh cadquery=master -y
+mamba install -y -c conda-forge gmsh python-gmsh moab>=5.3.0 ocp>=7.7.2.0 cadquery>=2.4.0
 ```
 
 Then you can install the cad_to_dagmc package with ```pip```
@@ -74,11 +82,17 @@ Then you can install the cad_to_dagmc package with ```pip```
 pip install cad_to_dagmc
 ```
 
-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/).You can run ```conda 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
+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/).
+
+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.13.3=dagmc*nompi*"
+mamba install -c conda-forge -y "openmc=0.14.0=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.
+
+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. 
+
 
 # Install using Conda and pip
 
@@ -86,7 +100,7 @@ This example uses Conda to install some dependencies that are not available via
 
 Create a new conda environment
 ```bash
-conda create --name new_env python=3.9 -y
+conda create --name new_env python=3.10 -y
 ```
 
 Activate the environment
@@ -96,7 +110,7 @@ conda activate new_env
 
 Install the dependencies
 ```bash
-conda install -c cadquery -c conda-forge moab gmsh python-gmsh cadquery=master -y
+conda install -y -c conda-forge gmsh python-gmsh moab>=5.3.0 ocp>=7.7.2.0 cadquery>=2.4.0
 ```
 
 Then you can install the cad_to_dagmc package with ```pip```
@@ -104,11 +118,19 @@ Then you can install the cad_to_dagmc package with ```pip```
 pip install cad_to_dagmc
 ```
 
-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/).You can run ```conda 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
+# 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
-conda install -c conda-forge -y "openmc=0.13.3=dagmc*nompi*"
+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
@@ -117,4 +139,6 @@ For examples see the [examples folder](https://github.com/fusion-energy/cad_to_d
 
 # Usage - simulation with transport code
 
-For examples see the CAD tasks in the [neutronics-workshop](https://github.com/fusion-energy/neutronics-workshop)
+For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
+
+For more examples see the CAD tasks in the [neutronics-workshop](https://github.com/fusion-energy/neutronics-workshop) and [model benchmark zoo](https://github.com/fusion-energy/model_benchmark_zoo)

cad_to_dagmc-0.6.0/README.md

@@ -0,0 +1,124 @@
+
+[![N|Python](https://www.python.org/static/community_logos/python-powered-w-100x40.png)](https://www.python.org)
+
+[![CI with install](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_install.yml/badge.svg?branch=main)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_install.yml) Testing package and running examples
+
+[![CI with model benchmark zoo](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_benchmarks.yml/badge.svg?branch=main)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_benchmarks.yml) Testing with [Model Benchmark Zoo](https://github.com/fusion-energy/model_benchmark_zoo)
+
+[![Upload Python Package](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/python-publish.yml/badge.svg)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/python-publish.yml)
+
+[![PyPI](https://img.shields.io/pypi/v/cad_to_dagmc?color=brightgreen&label=pypi&logo=grebrightgreenen&logoColor=green)](https://pypi.org/project/cad_to_dagmc/)
+
+
+A minimal package that converts CAD geometry to [DAGMC](https://github.com/svalinn/DAGMC/) h5m files
+
+cad-to-dagmc can create:
+- surface meshes / faceted geometry / triangular meshes
+- unstructured mesh / tetrahedral meshes / volume meshes
+
+cad-to-dagmc can convert:
+- STEP files
+- CadQuery objects (in memory)
+
+cadto-dagmc aims to produce DAGMC compatible h5m files from CAD geometry is intended to convert [STEP](http://www.steptools.com/stds/step/) files or [CadQuery](https://cadquery.readthedocs.io) objects to a [DAGMC](https://github.com/svalinn/DAGMC/) compatible h5m file.
+
+
+The resulting DAGMC geometry can then be used for simulations in [OpenMC](https://github.com/openmc-dev/openmc/) or [other supported codes](https://svalinn.github.io/DAGMC/).
+
+This package is tested with [pytest tests](https://github.com/fusion-energy/cad_to_dagmc/tree/main/tests) and also the DAGMC geometry made with this package is compared to simulation carried out with native constructive solid geometry, see [Model Benchmark Zoo](https://github.com/fusion-energy/model_benchmark_zoo) for more details.
+
+Also checkout these other software projects that also create DAGMC geometry [CAD-to-OpenMC](https://github.com/openmsr/CAD_to_OpenMC), [Stellarmesh](https://github.com/Thea-Energy/stellarmesh) and [Coreform Cubit](https://coreform.com/products/coreform-cubit/)
+
+# Installation prerequisite
+
+In principle, 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)
+
+
+# Install using Mamba and pip
+
+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
+also supported.
+```bash
+mamba create --name new_env python=3.10 -y
+```
+
+Activate the environment
+```bash
+mamba activate new_env
+```
+
+Install the dependencies
+```bash
+mamba install -y -c conda-forge gmsh python-gmsh moab>=5.3.0 ocp>=7.7.2.0 cadquery>=2.4.0
+```
+
+Then you can install the cad_to_dagmc package with ```pip```
+```bash
+pip install cad_to_dagmc
+```
+
+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/).
+
+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.14.0=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.
+
+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. 
+
+
+# Install using Conda and pip
+
+This example uses Conda to install some dependencies that are not available via PyPi.
+
+Create a new conda environment
+```bash
+conda create --name new_env python=3.10 -y
+```
+
+Activate the environment
+```bash
+conda activate new_env
+```
+
+Install the dependencies
+```bash
+conda install -y -c conda-forge gmsh python-gmsh moab>=5.3.0 ocp>=7.7.2.0 cadquery>=2.4.0
+```
+
+Then you can install the cad_to_dagmc package with ```pip```
+```bash
+pip install cad_to_dagmc
+```
+
+# 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
+
+For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
+
+# Usage - simulation with transport code
+
+For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
+
+For more examples see the CAD tasks in the [neutronics-workshop](https://github.com/fusion-energy/neutronics-workshop) and [model benchmark zoo](https://github.com/fusion-energy/model_benchmark_zoo)

{cad_to_dagmc-0.5.1/examples → cad_to_dagmc-0.6.0/examples/surface_mesh}/cadquery_assembly.py

@@ -10,5 +10,5 @@ assembly.add(result)
 assembly.add(result2)
 
 my_model = CadToDagmc()
-my_model.add_cadquery_object(assembly, material_tags=["mat1", "mat2"])
-my_model.export_dagmc_h5m_file(min_mesh_size=0.5, max_mesh_size=1.0)
+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"])

{cad_to_dagmc-0.5.1/examples → cad_to_dagmc-0.6.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, material_tags=["mat1", "mat2"])
-my_model.export_dagmc_h5m_file(max_mesh_size=0.2, min_mesh_size=0.1)
+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"])

cad_to_dagmc-0.6.0/examples/surface_mesh/cadquery_object_and_stp_file.py

@@ -0,0 +1,16 @@
+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)
+
+my_model = CadToDagmc()
+
+my_model.add_cadquery_object(result)
+
+my_model.add_stp_file(filename="single_cube.stp", scale_factor=0.1)
+
+my_model.export_dagmc_h5m_file(
+    max_mesh_size=0.2,
+    min_mesh_size=0.1,
+    material_tags=["mat1", "mat2"],
+)

{cad_to_dagmc-0.5.1/examples → cad_to_dagmc-0.6.0/examples/surface_mesh}/cadquery_text.py

@@ -5,8 +5,12 @@ text = cq.Workplane().text(txt="DAGMC", fontsize=10, distance=1)
 
 
 my_model = CadToDagmc()
-my_model.add_cadquery_object(
-    object=text,
+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,
     material_tags=[
         "mat1",
         "mat2",
@@ -15,5 +19,3 @@ my_model.add_cadquery_object(
         "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.5.1/examples/curved_cadquery_object.py → cad_to_dagmc-0.6.0/examples/surface_mesh/curved_cadquery_object_to_dagmc_surface_mesh.py

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

{cad_to_dagmc-0.5.1/examples → cad_to_dagmc-0.6.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, material_tags=["mat1"])
-my_model.add_cadquery_object(box_with_round_corners, material_tags=["mat2"])
-my_model.export_dagmc_h5m_file()
+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"])

cad_to_dagmc-0.6.0/examples/surface_mesh/multiple_stp_files.py

@@ -0,0 +1,12 @@
+from cad_to_dagmc import CadToDagmc
+
+my_model = CadToDagmc()
+my_model.add_stp_file("two_connected_cubes.stp")
+my_model.add_stp_file("single_sphere.stp")
+
+my_model.export_dagmc_h5m_file(
+    max_mesh_size=1,
+    min_mesh_size=0.5,
+    implicit_complement_material_tag="air",
+    material_tags=["mat1", "mat2", "mat3"],
+)

{cad_to_dagmc-0.5.1/examples → cad_to_dagmc-0.6.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, material_tags=["mat1"])
-my_model.export_dagmc_h5m_file()
+my_model.add_cadquery_object(result)
+my_model.export_dagmc_h5m_file(material_tags=["mat1"])

cad_to_dagmc-0.6.0/examples/surface_mesh/single_stp_file.py

@@ -0,0 +1,5 @@
+from cad_to_dagmc import CadToDagmc
+
+my_model = CadToDagmc()
+my_model.add_stp_file("spline_extrude.stp")
+my_model.export_dagmc_h5m_file(material_tags=["mat1"])

{cad_to_dagmc-0.5.1/examples → cad_to_dagmc-0.6.0/examples/surface_mesh}/single_stp_file_multiple_volumes.py

@@ -2,5 +2,5 @@ from cad_to_dagmc import CadToDagmc
 
 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("text_dagmc.stp", material_tags=["mat1", "mat2", "mat2", "mat2", "mat1"])
-my_model.export_dagmc_h5m_file()
+my_model.add_stp_file("text_dagmc.stp")
+my_model.export_dagmc_h5m_file(material_tags=["mat1", "mat2", "mat2", "mat2", "mat1"])

cad_to_dagmc-0.6.0/examples/unstrucutred_volume_mesh/curved_cadquery_object_to_dagmc_volume_mesh.py

@@ -0,0 +1,62 @@
+from cad_to_dagmc import CadToDagmc
+import cadquery as cq
+from math import sin, cos, pi, floor
+
+
+# define the generating function
+def hypocycloid(t, r1, r2):
+    return (
+        (r1 - r2) * cos(t) + r2 * cos(r1 / r2 * t - t),
+        (r1 - r2) * sin(t) + r2 * sin(-(r1 / r2 * t - t)),
+    )
+
+
+def epicycloid(t, r1, r2):
+    return (
+        (r1 + r2) * cos(t) - r2 * cos(r1 / r2 * t + t),
+        (r1 + r2) * sin(t) - r2 * sin(r1 / r2 * t + t),
+    )
+
+
+def gear(t, r1=4, r2=1):
+    if (-1) ** (1 + floor(t / 2 / pi * (r1 / r2))) < 0:
+        return epicycloid(t, r1, r2)
+    else:
+        return hypocycloid(t, r1, r2)
+
+
+# create the gear profile and extrude it
+result = (
+    cq.Workplane("XY")
+    .parametricCurve(lambda t: gear(t * 2 * pi, 6, 1))
+    .twistExtrude(15, 90)
+    .faces(">Z")
+    .workplane()
+    .circle(2)
+    .cutThruAll()
+)
+assembly = cq.Assembly()
+assembly.add(result)
+assembly.save("twist.step")
+
+s = cq.Workplane("XY")
+sPnts = [
+    (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 = s.lineTo(3.0, 0).lineTo(3.0, 1.0).spline(sPnts, includeCurrent=True).close()
+result2 = r.extrude(-20)
+assembly.add(result2)
+assembly.save("twist_and_extrude.step")
+
+my_model = CadToDagmc()
+
+my_model.add_cadquery_object(result)
+my_model.add_cadquery_object(result2)
+
+my_model.export_unstructured_mesh_file(filename="umesh.h5m", max_mesh_size=1, min_mesh_size=0.1)