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

{cad_to_dagmc-0.5.1 → cad_to_dagmc-0.6.1}/.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,12 +37,14 @@ 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 "openmc=0.14.0=dagmc*nompi*" moab>=5.3.0 gmsh python-gmsh
           python -m pip install --upgrade pip
-          python -m pip install cad_to_dagmc openmc_data_downloader
+          python -m pip install .
+          python -m pip install openmc_data_downloader
           openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9
-          git clone https://github.com/fusion-energy/model_benchmark_zoo.git
+          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]
+          conda env export > environment.yml
+          cat environment.yml
           pytest tests/test_cad_to_dagmc -v

{cad_to_dagmc-0.5.1 → cad_to_dagmc-0.6.1}/.github/workflows/ci_with_install.yml

@@ -1,8 +1,5 @@
 
-# This CI will launch a Docker image that contains all the dependencies required
-# within that image the pytest test suite is run 
-# container:
-#       image: continuumio/miniconda3:23.3.1-0
+# This CI does includes particle transport tests as openmc is installed
 
 name: CI with install
 
@@ -28,8 +25,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # - uses: conda-incubator/setup-miniconda@v2
-
       - name: install non pypi dependencies
         shell: bash
         run: |
@@ -42,22 +37,24 @@ 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
+          mamba create -y --name cad_to_dagmc python=3.10
+          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 
           python -m pip install .
           python -c "import cad_to_dagmc"
-          mamba install -y -c conda-forge "openmc=0.13.3=dagmc*nompi*"
           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.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
+          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
+          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
+          python examples/unstrucutred_volume_mesh/simulate_unstrucutred_volume_mesh_with_openmc.py

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

@@ -0,0 +1,67 @@
+
+# This CI does not currently include particle transport tests as openmc is not installed
+
+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-get install -y make cmake
+          apt install python3
+          apt install python3-pip
+          python -m pip install --upgrade pip
+          mkdir MOAB
+          cd MOAB
+          git clone --single-branch -b 5.5.1 --depth 1 https://bitbucket.org/fathomteam/moab/
+          mkdir build
+          cd build
+          apt-get install -y libeigen3-dev
+          cmake ../moab -DENABLE_PYMOAB=ON -DENABLE_HDF5=ON -DENABLE_BLASLAPACK=OFF -DENABLE_FORTRAN=OFF
+          make -j2
+          make install
+          cd ../..
+          python -m pip install .
+          python -c "import cad_to_dagmc"
+          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

cad_to_dagmc-0.6.1/PKG-INFO

@@ -0,0 +1,180 @@
+Metadata-Version: 2.1
+Name: cad_to_dagmc
+Version: 0.6.1
+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
+Project-URL: Bug Tracker, https://github.com/fusion-energy/cad_to_dagmc/issues
+Keywords: dagmc,geometry,plot,slice
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: trimesh
+Requires-Dist: networkx
+Requires-Dist: cadquery-ocp>=7.7.2
+Requires-Dist: cadquery>=2.4.0
+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 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)
+
+cad-to-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 options
+
+- Install using Mamba and pip
+- Install using Conda and pip
+- Install using pip and source compilations
+
+
+## Install using Mamba and pip
+
+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 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 "moab>=5.3.0" gmsh python-gmsh
+```
+
+Then you can install the cad_to_dagmc package with ```pip```
+```bash
+pip install cad_to_dagmc
+```
+
+
+## Install using Conda and pip
+
+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 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 "moab>=5.3.0" gmsh python-gmsh
+```
+
+Then you can install the cad_to_dagmc package with ```pip```
+```bash
+pip install cad_to_dagmc
+```
+
+## Install using pip and source compilations
+
+It should possible to avoid the use of conda and installing using pip and compiling from source.
+
+First compile MOAB (and install Pymoab) from source
+
+Then install gmsh from source (installing from pip appears to cause conflicts with the open cascade used in ocp and cadquery)
+
+Then you can install the cad_to_dagmc package with ```pip```
+
+```bash
+pip install cad_to_dagmc
+```
+
+## Install with transport code (e.g 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 [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.
+
+
+
+# Known incompatibilities
+
+The package requires newer versions of Linux. For example the package does not work on Ubuntu 18.04 or older.
+
+The package requires newer versions of pip. It is recommended to ensure that your version of pip is up to date. This can be done with ```python -m pip install --upgrade pip```
+
+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
+
+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.6.1/README.md

@@ -0,0 +1,158 @@
+
+[![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)
+
+cad-to-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 options
+
+- Install using Mamba and pip
+- Install using Conda and pip
+- Install using pip and source compilations
+
+
+## Install using Mamba and pip
+
+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 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 "moab>=5.3.0" gmsh python-gmsh
+```
+
+Then you can install the cad_to_dagmc package with ```pip```
+```bash
+pip install cad_to_dagmc
+```
+
+
+## Install using Conda and pip
+
+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 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 "moab>=5.3.0" gmsh python-gmsh
+```
+
+Then you can install the cad_to_dagmc package with ```pip```
+```bash
+pip install cad_to_dagmc
+```
+
+## Install using pip and source compilations
+
+It should possible to avoid the use of conda and installing using pip and compiling from source.
+
+First compile MOAB (and install Pymoab) from source
+
+Then install gmsh from source (installing from pip appears to cause conflicts with the open cascade used in ocp and cadquery)
+
+Then you can install the cad_to_dagmc package with ```pip```
+
+```bash
+pip install cad_to_dagmc
+```
+
+## Install with transport code (e.g 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 [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.
+
+
+
+# Known incompatibilities
+
+The package requires newer versions of Linux. For example the package does not work on Ubuntu 18.04 or older.
+
+The package requires newer versions of pip. It is recommended to ensure that your version of pip is up to date. This can be done with ```python -m pip install --upgrade pip```
+
+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
+
+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.1/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.1/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.1/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.1/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.1/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.1/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.1/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.1/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.1/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.1/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"])