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

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.1}/.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.1}/.github/workflows/ci_with_benchmarks.yml

@@ -35,11 +35,11 @@ jobs:
           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
+          sudo apt-get install -y libgl1 libglx-mesa0 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 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 .
+          mamba install -y -c conda-forge "openmc=0.15.0=dagmc*nompi*" trimesh networkx cadquery gmsh python-gmsh
+          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
           git clone --single-branch -b main --depth 1 https://github.com/fusion-energy/model_benchmark_zoo.git

cad_to_dagmc-0.6.2/.github/workflows/ci_with_install.yml → cad_to_dagmc-0.7.1/.github/workflows/ci_with_conda_install.yml

@@ -1,7 +1,7 @@
 
 # This CI does includes particle transport tests as openmc is installed
 
-name: CI with install
+name: CI with Conda install
 
 on:
   pull_request:
@@ -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
@@ -35,17 +38,17 @@ jobs:
           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
+          sudo apt-get install -y libgl1 libglx-mesa0 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 
-          python -m pip install .
+          mamba install -y -c conda-forge "openmc=0.15.0=dagmc*nompi*" trimesh networkx cadquery gmsh python-gmsh
+          python -m ensurepip --upgrade
+          python -m pip install . --no-deps
           python -c "import cad_to_dagmc"
-          python -m pip install .[tests]
+          mamba install -y -c conda-forge pytest vtk
+          python -m pip install .[tests] --no-deps
           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 +59,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.7.1/.github/workflows/ci_with_pip_install.yml

@@ -0,0 +1,61 @@
+
+# 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 libhdf5-dev 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 --upgrade pip
+          git clone  --single-branch -b master --depth 1 https://bitbucket.org/fathomteam/moab/
+          cd moab
+          git checkout faf7e989c0fd0be4a19f61c1d4713afc5397c8a7
+          python -m pip install . --config-settings=cmake.args=-DENABLE_HDF5=ON
+          cd ..
+          python -c "import pymoab"
+          python -m pip install .[tests]
+          python -c "import cad_to_dagmc"
+          pytest -v tests
+          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.1}/.gitignore

@@ -137,3 +137,4 @@ dmypy.json
 *.stp
 src/_version.py
 *.msh
+*.step

cad_to_dagmc-0.7.1/CITATION.cff

@@ -0,0 +1,10 @@
+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+authors:
+- family-names: "Shimwell"
+  given-names: "Jonathan"
+  orcid: "https://orcid.org/0000-0001-6909-0946"
+title: "CAD to DAGMC. Convert CAD geometry (STP files) or Cadquery assemblies to DAGMC h5m files"
+version: 0.7.0
+date-released: 2024-4-14
+url: "https://github.com/fusion-energy/cad_to_dagmc"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cad_to_dagmc
-Version: 0.6.2
+Version: 0.7.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
@@ -15,6 +15,8 @@ License-File: LICENSE
 Requires-Dist: trimesh
 Requires-Dist: networkx
 Requires-Dist: cadquery>=2.4.0
+Requires-Dist: numpy<=1.23.5
+Requires-Dist: gmsh
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: vtk; extra == "tests"
@@ -51,12 +53,11 @@ Also checkout these other software projects that also create DAGMC geometry [CAD
 
 # Installation options
 
-- Install using Mamba and pip
-- Install using Conda and pip
+- Install using Mamba
+- Install using Conda
 - Install using pip and source compilations
 
-
-## Install using Mamba and pip
+## 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)
@@ -65,7 +66,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
@@ -76,27 +77,20 @@ Activate the environment
 mamba activate new_env
 ```
 
-Install the dependencies
+Then you can install the cad_to_dagmc package
 ```bash
-mamba install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
+mamba install -y -c conda-forge cad_to_dagmc
 ```
 
-Then you can install the cad_to_dagmc package with ```pip```
-```bash
-pip install cad_to_dagmc
-```
-
-
-## Install using Conda and pip
+## 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)
 
-This example uses Conda to install some dependencies that are not available via PyPi.
-
-Create a new conda environment
+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
 ```
@@ -106,23 +100,37 @@ Activate the environment
 conda activate new_env
 ```
 
-Install the dependencies
+Then you can install the cad_to_dagmc package
 ```bash
-conda install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
+conda install -y -c conda-forge cad_to_dagmc
 ```
 
-Then you can install the cad_to_dagmc package with ```pip```
-```bash
-pip install cad_to_dagmc
+## Install using pip and source compilations
+
+It is also possible to avoid the use of conda/mamba and installing using pip.
+
+First ensure hdf5 is installed as this is needed by MOAB pip install command
+
+```
+sudo apt-get install libhdf5-dev
 ```
 
-## Install using pip and source compilations
+Then clone the latest version of MOAB and cd into the moab directory.
 
-It should possible to avoid the use of conda and installing using pip and compiling from source.
+```
+git clone  master https://bitbucket.org/fathomteam/moab/
+cd moab
+```
 
-First compile MOAB (and install Pymoab) from source
+Ensure pip is up to date as a new version is needed
+```
+python -m pip install --upgrade pip
+```
 
-Then install gmsh from source (installing from pip appears to cause conflicts with the open cascade used in ocp and cadquery)
+Run the pip install command with cmake arguments.
+```
+pip install . --config-settings=cmake.args=-DENABLE_HDF5=ON
+```
 
 Then you can install the cad_to_dagmc package with ```pip```
 
@@ -130,7 +138,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,28 +152,13 @@ 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.
 
 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.
-
+Installing one of the package dependancies (gmsh) with pip appears to result in errors when passing cad objects in memory between cadquery / ocp and gmsh. The default method of passing cad objects is via file so this should not impact most users. The conda install gmsh appears to work fine with in memory passing of cad objects as the version of OCP matches between Gmsh and CadQuery.
 
 
 # Usage - creation of DAGMC h5m files

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

@@ -30,12 +30,11 @@ Also checkout these other software projects that also create DAGMC geometry [CAD
 
 # Installation options
 
-- Install using Mamba and pip
-- Install using Conda and pip
+- Install using Mamba
+- Install using Conda
 - Install using pip and source compilations
 
-
-## Install using Mamba and pip
+## 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)
@@ -44,7 +43,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
@@ -55,27 +54,20 @@ Activate the environment
 mamba activate new_env
 ```
 
-Install the dependencies
+Then you can install the cad_to_dagmc package
 ```bash
-mamba install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
+mamba install -y -c conda-forge cad_to_dagmc
 ```
 
-Then you can install the cad_to_dagmc package with ```pip```
-```bash
-pip install cad_to_dagmc
-```
-
-
-## Install using Conda and pip
+## 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)
 
-This example uses Conda to install some dependencies that are not available via PyPi.
-
-Create a new conda environment
+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
 ```
@@ -85,23 +77,37 @@ Activate the environment
 conda activate new_env
 ```
 
-Install the dependencies
+Then you can install the cad_to_dagmc package
 ```bash
-conda install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
+conda install -y -c conda-forge cad_to_dagmc
 ```
 
-Then you can install the cad_to_dagmc package with ```pip```
-```bash
-pip install cad_to_dagmc
+## Install using pip and source compilations
+
+It is also possible to avoid the use of conda/mamba and installing using pip.
+
+First ensure hdf5 is installed as this is needed by MOAB pip install command
+
+```
+sudo apt-get install libhdf5-dev
 ```
 
-## Install using pip and source compilations
+Then clone the latest version of MOAB and cd into the moab directory.
 
-It should possible to avoid the use of conda and installing using pip and compiling from source.
+```
+git clone  master https://bitbucket.org/fathomteam/moab/
+cd moab
+```
 
-First compile MOAB (and install Pymoab) from source
+Ensure pip is up to date as a new version is needed
+```
+python -m pip install --upgrade pip
+```
 
-Then install gmsh from source (installing from pip appears to cause conflicts with the open cascade used in ocp and cadquery)
+Run the pip install command with cmake arguments.
+```
+pip install . --config-settings=cmake.args=-DENABLE_HDF5=ON
+```
 
 Then you can install the cad_to_dagmc package with ```pip```
 
@@ -109,7 +115,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,28 +129,13 @@ 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.
 
 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.
-
+Installing one of the package dependancies (gmsh) with pip appears to result in errors when passing cad objects in memory between cadquery / ocp and gmsh. The default method of passing cad objects is via file so this should not impact most users. The conda install gmsh appears to work fine with in memory passing of cad objects as the version of OCP matches between Gmsh and CadQuery.
 
 
 # Usage - creation of DAGMC h5m files

{cad_to_dagmc-0.6.2 → cad_to_dagmc-0.7.1}/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.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)
-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.1/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.1}/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.1}/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.1/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.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)
-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()