Skip to content

Commit

Permalink
Merge pull request #64 from fusion-energy/fix_benchmark_zoo_tests
Browse files Browse the repository at this point in the history
Fixed benchmark zoo tests
  • Loading branch information
shimwell authored Mar 17, 2024
2 parents d68bf5c + 79a8105 commit cc8b1da
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 6 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci_with_benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@ 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 cadquery-ocp==7.7.2
python -m pip install cadquery==2.4.0
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
cd model_benchmark_zoo
Expand Down
30 changes: 26 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ Also checkout these other software projects that also create DAGMC geometry [CAD

# 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

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
Expand Down Expand Up @@ -76,6 +77,11 @@ Another option would be to [install OpenMC from source](https://docs.openmc.org/

# 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
Expand All @@ -98,6 +104,22 @@ Then you can install the cad_to_dagmc package with ```pip```
pip install cad_to_dagmc
```

# Install using pip

It is 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 cadquery and ocp using pip
pip install cadquery-ocp==7.7.2
pip install 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/).
Expand Down

0 comments on commit cc8b1da

Please sign in to comment.