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

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

@@ -37,11 +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 conda-forge moab gmsh python-gmsh cadquery=2.4.0 "openmc=0.14.0=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.6.0 → cad_to_dagmc-0.6.1}/.github/workflows/ci_with_install.yml

@@ -1,4 +1,6 @@
 
+# This CI does includes particle transport tests as openmc is installed
+
 name: CI with install
 
 on:
@@ -37,15 +39,12 @@ jobs:
           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
+          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"
           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
+          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
@@ -58,13 +57,4 @@ jobs:
           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 → cad_to_dagmc-0.6.1}/.github/workflows/ci_with_pip_install.yml

@@ -1,4 +1,6 @@
 
+# This CI does not currently include particle transport tests as openmc is not installed
+
 name: CI with pip install
 
 on:
@@ -32,16 +34,24 @@ jobs:
           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 
-          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 --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 tests -v
+          pytest -v tests
           cd examples
           python create_stp_files_for_examples.py
           python cadquery_assembly.py

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cad_to_dagmc
-Version: 0.6.0
+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
@@ -14,6 +14,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"
@@ -40,8 +42,7 @@ 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.
-
+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/).
 
@@ -49,16 +50,20 @@ This package is tested with [pytest tests](https://github.com/fusion-energy/cad_
 
 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
+# Installation options
+
+- Install using Mamba and pip
+- Install using Conda and pip
+- Install using pip and source compilations
+
 
-In principle, any Conda/Mamba distribution will work. A few Conda/Mamba options are:
+## 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)
 
-
-# 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
@@ -74,7 +79,7 @@ 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
+mamba install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
 ```
 
 Then you can install the cad_to_dagmc package with ```pip```
@@ -82,19 +87,13 @@ 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/).
-
-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
 
-# 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.
 
@@ -110,7 +109,7 @@ 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
+conda install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
 ```
 
 Then you can install the cad_to_dagmc package with ```pip```
@@ -118,6 +117,43 @@ Then you can install the cad_to_dagmc package with ```pip```
 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/).

{cad_to_dagmc-0.6.0 → cad_to_dagmc-0.6.1}/README.md

@@ -20,8 +20,7 @@ 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.
-
+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/).
 
@@ -29,16 +28,20 @@ This package is tested with [pytest tests](https://github.com/fusion-energy/cad_
 
 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
+# Installation options
+
+- Install using Mamba and pip
+- Install using Conda and pip
+- Install using pip and source compilations
+
 
-In principle, any Conda/Mamba distribution will work. A few Conda/Mamba options are:
+## 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)
 
-
-# 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
@@ -54,7 +57,7 @@ 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
+mamba install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
 ```
 
 Then you can install the cad_to_dagmc package with ```pip```
@@ -62,19 +65,13 @@ 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/).
-
-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
 
-# 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.
 
@@ -90,7 +87,7 @@ 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
+conda install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
 ```
 
 Then you can install the cad_to_dagmc package with ```pip```
@@ -98,6 +95,43 @@ Then you can install the cad_to_dagmc package with ```pip```
 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/).

{cad_to_dagmc-0.6.0 → cad_to_dagmc-0.6.1}/pyproject.toml

@@ -20,6 +20,8 @@ classifiers = [
 dependencies = [
     "trimesh",
     "networkx",
+    "cadquery-ocp>=7.7.2",
+    "cadquery>=2.4.0",
 ]
 dynamic = ["version"]
 

{cad_to_dagmc-0.6.0 → cad_to_dagmc-0.6.1}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.6.0'
-__version_tuple__ = version_tuple = (0, 6, 0)
+__version__ = version = '0.6.1'
+__version_tuple__ = version_tuple = (0, 6, 1)

{cad_to_dagmc-0.6.0 → cad_to_dagmc-0.6.1}/src/cad_to_dagmc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cad_to_dagmc
-Version: 0.6.0
+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
@@ -14,6 +14,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"
@@ -40,8 +42,7 @@ 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.
-
+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/).
 
@@ -49,16 +50,20 @@ This package is tested with [pytest tests](https://github.com/fusion-energy/cad_
 
 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
+# Installation options
+
+- Install using Mamba and pip
+- Install using Conda and pip
+- Install using pip and source compilations
+
 
-In principle, any Conda/Mamba distribution will work. A few Conda/Mamba options are:
+## 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)
 
-
-# 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
@@ -74,7 +79,7 @@ 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
+mamba install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
 ```
 
 Then you can install the cad_to_dagmc package with ```pip```
@@ -82,19 +87,13 @@ 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/).
-
-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
 
-# 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.
 
@@ -110,7 +109,7 @@ 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
+conda install -y -c conda-forge "moab>=5.3.0" gmsh python-gmsh
 ```
 
 Then you can install the cad_to_dagmc package with ```pip```
@@ -118,6 +117,43 @@ Then you can install the cad_to_dagmc package with ```pip```
 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/).

{cad_to_dagmc-0.6.0 → cad_to_dagmc-0.6.1}/src/cad_to_dagmc.egg-info/SOURCES.txt

@@ -43,11 +43,8 @@ tests/single_volume_thin.stp
 tests/single_volume_thin.vtk
 tests/test_brep_file.brep
 tests/test_file_creation.py
-tests/test_h5m_in_simulation.py
 tests/test_h5m_in_transport.py
 tests/test_loading_from_file_vs_shape_object.py
-tests/test_model_creation_for_transport.py
-tests/test_package.py
 tests/test_python_api.py
 tests/test_two_joined_cubes.brep
 tests/test_two_sep_cubes.brep

{cad_to_dagmc-0.6.0 → cad_to_dagmc-0.6.1}/src/cad_to_dagmc.egg-info/requires.txt

@@ -1,5 +1,7 @@
 trimesh
 networkx
+cadquery-ocp>=7.7.2
+cadquery>=2.4.0
 
 [tests]
 pytest