From 5bcf48283287dd063c51f66b85951622afc18a72 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Fri, 20 Aug 2021 07:18:47 +0200
Subject: [PATCH 01/36] first addition

---
 .github/workflows/unix_mac.yml | 135 +++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 .github/workflows/unix_mac.yml

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
new file mode 100644
index 0000000000..5aac75bf01
--- /dev/null
+++ b/.github/workflows/unix_mac.yml
@@ -0,0 +1,135 @@
+name: Mac builds
+
+on:
+  # allows us to run workflows manually
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - develop
+      - master
+  push:
+    branches:
+      - develop
+      - master
+  release:
+    types: # This configuration does not affect the page_build event above
+      - created
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  main:
+    runs-on: macos-10.15
+
+    name: 'Cubit ${{ matrix.cubit }} Build for ${{ matrix.os }} ${{ matrix.os_version }} of Svalinn Plugin'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Environment Variables
+        shell: bash -l {0}
+        run: |
+          COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/Releases
+
+          if [ "${{ matrix.cubit }}" == "17.1.0" ]; then
+            BASE=Trelis-17.1.0
+            BASESDK=Trelis-SDK-17.1.0
+            CUBIT_BASE_NAME=Trelis-17.1
+            HDF5_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial
+          elif [ "${{ matrix.cubit }}" == "2021.4" ]; then
+            BASE=Coreform-Cubit-2021.4%2B15017_05893177
+            CUBIT_BASE_NAME=Coreform-Cubit-2021.4
+            HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
+          elif [ "${{ matrix.cubit }}" == "2021.5" ]; then
+            BASE=Coreform-Cubit-2021.5%2B15962_5043ef39
+            CUBIT_BASE_NAME=Coreform-Cubit-2021.5
+            HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
+          fi
+
+          SUFFIX=Mac64
+          EXT=dmg
+          echo "SED=gsed" >> $GITHUB_ENV
+          echo "BUILD_SHARED_LIBS=OFF" >> $GITHUB_ENV
+          echo "BUILD_STATIC_LIBS=ON" >> $GITHUB_ENV
+          echo "system=mac" >> $GITHUB_ENV
+          echo "CUBIT_PATH=/Applications/${CUBIT_BASE_NAME}.app/Contents" >> $GITHUB_ENV
+          echo "COREFORM_BASE_URL=${COREFORM_BASE_URL}/MacOS/" >> $GITHUB_ENV
+
+          echo "OS=${{ matrix.os }}" >> $GITHUB_ENV
+          echo "OS_VERSION=${{ matrix.os_version }}" >> $GITHUB_ENV
+          echo "CMAKE_ADDITIONAL_FLAGS=-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0" >> $GITHUB_ENV
+
+          echo "CUBIT_PKG=${BASE}-${SUFFIX}.${EXT}" >> $GITHUB_ENV
+          echo "CUBIT_SDK_PKG=${BASESDK}-${SUFFIX}.tar.gz" >> $GITHUB_ENV
+          echo "CUBIT_BASE_NAME=${CUBIT_BASE_NAME}" >> $GITHUB_ENV
+
+          echo "CURRENT=$(pwd)" >> $GITHUB_ENV
+          echo "SCRIPTPATH=$GITHUB_WORKSPACE" >> $GITHUB_ENV
+          echo "PLUGIN_ABS_PATH=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV
+          echo "FOLDER_PKG=$GITHUB_WORKSPACE/pkg" >> $GITHUB_ENV
+
+          echo "" >> ${HOME}/.bash_profile
+          echo "source $GITHUB_WORKSPACE/scripts/unix_share_build.sh" >> $HOME/.bash_profile
+      
+      - name: Initial setup
+        shell: bash -l {0}
+        run: |
+          ${system}_install_prerequisites
+ 
+      - name: Downloading packages
+        shell: bash -l {0}
+        run: |
+          mkdir -p $FOLDER_PKG
+          cd ${FOLDER_PKG}
+          curl -L ${COREFORM_BASE_URL}${CUBIT_PKG} --output ${CUBIT_PKG}
+          if [ "${{ matrix.cubit }}" = "17.1.0" ]; then
+            curl -L ${COREFORM_BASE_URL}${CUBIT_SDK_PKG} --output ${CUBIT_SDK_PKG}
+          fi
+          mkdir ${SCRIPTPATH}/release
+
+      - name: Cubit setup
+        shell: bash -l {0}
+        run: |
+          ${system}_setup_cubit ${{ matrix.cubit }}
+
+      - name: Build HDF5
+        shell: bash -l {0}
+        run: |
+          ${system}_build_hdf5
+
+      - name: Build MOAB
+        shell: bash -l {0}
+        run: |
+          build_moab
+
+      - name: Build DAGMC
+        shell: bash -l {0}
+        run: |
+          build_dagmc
+
+      - name: Build plugin
+        shell: bash -l {0}
+        run: |
+          build_plugin 
+
+      - name: Prepare package
+        shell: bash -l {0}
+        run: |
+          ${system}_build_plugin_pkg ${{ matrix.cubit }}
+
+      - if: github.event_name != 'release'
+        name: Upload artifact for CI
+        uses: actions/upload-artifact@v2
+        with:
+          name: svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
+          path: ${{ github.workspace }}/release/svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
+          if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn` 
+    
+      - if: github.event_name == 'release'
+        name: Upload binaries into the release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ github.workspace }}/release/svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
+          asset_name: svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
+          tag: ${{ github.ref }}

From 515e92871569b472f91edd5c2767c4a3b3f38cb3 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Fri, 20 Aug 2021 07:33:19 +0200
Subject: [PATCH 02/36] starting simple

---
 .github/workflows/unix_mac.yml | 121 +++++++++------------------------
 1 file changed, 31 insertions(+), 90 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 5aac75bf01..38a0430ed0 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -29,107 +29,48 @@ jobs:
       - name: Environment Variables
         shell: bash -l {0}
         run: |
-          COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/Releases
 
-          if [ "${{ matrix.cubit }}" == "17.1.0" ]; then
-            BASE=Trelis-17.1.0
-            BASESDK=Trelis-SDK-17.1.0
-            CUBIT_BASE_NAME=Trelis-17.1
-            HDF5_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial
-          elif [ "${{ matrix.cubit }}" == "2021.4" ]; then
-            BASE=Coreform-Cubit-2021.4%2B15017_05893177
-            CUBIT_BASE_NAME=Coreform-Cubit-2021.4
-            HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
-          elif [ "${{ matrix.cubit }}" == "2021.5" ]; then
-            BASE=Coreform-Cubit-2021.5%2B15962_5043ef39
-            CUBIT_BASE_NAME=Coreform-Cubit-2021.5
-            HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
-          fi
-
-          SUFFIX=Mac64
-          EXT=dmg
-          echo "SED=gsed" >> $GITHUB_ENV
-          echo "BUILD_SHARED_LIBS=OFF" >> $GITHUB_ENV
-          echo "BUILD_STATIC_LIBS=ON" >> $GITHUB_ENV
-          echo "system=mac" >> $GITHUB_ENV
-          echo "CUBIT_PATH=/Applications/${CUBIT_BASE_NAME}.app/Contents" >> $GITHUB_ENV
-          echo "COREFORM_BASE_URL=${COREFORM_BASE_URL}/MacOS/" >> $GITHUB_ENV
-
-          echo "OS=${{ matrix.os }}" >> $GITHUB_ENV
-          echo "OS_VERSION=${{ matrix.os_version }}" >> $GITHUB_ENV
-          echo "CMAKE_ADDITIONAL_FLAGS=-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0" >> $GITHUB_ENV
-
-          echo "CUBIT_PKG=${BASE}-${SUFFIX}.${EXT}" >> $GITHUB_ENV
-          echo "CUBIT_SDK_PKG=${BASESDK}-${SUFFIX}.tar.gz" >> $GITHUB_ENV
-          echo "CUBIT_BASE_NAME=${CUBIT_BASE_NAME}" >> $GITHUB_ENV
-
-          echo "CURRENT=$(pwd)" >> $GITHUB_ENV
-          echo "SCRIPTPATH=$GITHUB_WORKSPACE" >> $GITHUB_ENV
-          echo "PLUGIN_ABS_PATH=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV
-          echo "FOLDER_PKG=$GITHUB_WORKSPACE/pkg" >> $GITHUB_ENV
-
-          echo "" >> ${HOME}/.bash_profile
-          echo "source $GITHUB_WORKSPACE/scripts/unix_share_build.sh" >> $HOME/.bash_profile
       
       - name: Initial setup
         shell: bash -l {0}
         run: |
-          ${system}_install_prerequisites
- 
-      - name: Downloading packages
-        shell: bash -l {0}
-        run: |
-          mkdir -p $FOLDER_PKG
-          cd ${FOLDER_PKG}
-          curl -L ${COREFORM_BASE_URL}${CUBIT_PKG} --output ${CUBIT_PKG}
-          if [ "${{ matrix.cubit }}" = "17.1.0" ]; then
-            curl -L ${COREFORM_BASE_URL}${CUBIT_SDK_PKG} --output ${CUBIT_SDK_PKG}
-          fi
-          mkdir ${SCRIPTPATH}/release
-
-      - name: Cubit setup
-        shell: bash -l {0}
-        run: |
-          ${system}_setup_cubit ${{ matrix.cubit }}
-
-      - name: Build HDF5
-        shell: bash -l {0}
-        run: |
-          ${system}_build_hdf5
+        brew install eigen gcc@6 gsed hdf5
+        brew link hdf5
 
       - name: Build MOAB
         shell: bash -l {0}
         run: |
-          build_moab
+          mkdir -pv moab/bld
+          cd moab
+          git clone https://bitbucket.org/fathomteam/moab -b 5.3.0 --depth 1 --shallow-submodules
+          cd moab
+          # # patching MOAB CMakeLists.txt to use default find(HDF5)
+          # $SED -i "s/HDF5_MOAB/HDF5/" CMakeLists.txt
+          # cd ..
+          # #end of patch
+          cd bld
+          cmake ../moab -DENABLE_HDF5=ON \
+                  -DHDF5_ROOT=$HDF5_PATH \
+                  -DBUILD_SHARED_LIBS=ON \
+                  -DENABLE_BLASLAPACK=OFF \
+                  -DENABLE_FORTRAN=OFF \
+                  -DCMAKE_INSTALL_PREFIX=/opt/moab
+          make
+          make install
+          cd ../..
+          rm -rf moab/moab moab/bld
 
       - name: Build DAGMC
         shell: bash -l {0}
         run: |
-          build_dagmc
-
-      - name: Build plugin
-        shell: bash -l {0}
-        run: |
-          build_plugin 
-
-      - name: Prepare package
-        shell: bash -l {0}
-        run: |
-          ${system}_build_plugin_pkg ${{ matrix.cubit }}
+          mkdir -p $GITHUB_WORKSPACE/bld
+          cd $GITHUB_WORKSPACE/bld
+          cmake ${dagmc_build_dir} -DMOAB_DIR=/opt/moab \
+                      -DBUILD_CI_TESTS=ON \
+                      -DBUILD_STATIC_EXE=OFF \
+                      -DCMAKE_INSTALL_PREFIX=/root/dagmc
+                      # -DDOUBLE_DOWN=${double_down} \
+                      # -Ddd_ROOT=${double_down_install_dir}
+          make
+          make install
 
-      - if: github.event_name != 'release'
-        name: Upload artifact for CI
-        uses: actions/upload-artifact@v2
-        with:
-          name: svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
-          path: ${{ github.workspace }}/release/svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
-          if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn` 
-    
-      - if: github.event_name == 'release'
-        name: Upload binaries into the release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ github.workspace }}/release/svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
-          asset_name: svalinn-plugin_${{ matrix.os }}-${{ matrix.os_version }}_cubit_${{ matrix.cubit }}.tgz
-          tag: ${{ github.ref }}

From 70ddc4f071e7f865aa63c9f9ef75432ec25c8b06 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Fri, 20 Aug 2021 07:38:21 +0200
Subject: [PATCH 03/36] fixing indent

---
 .github/workflows/unix_mac.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 38a0430ed0..922c371404 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -34,8 +34,8 @@ jobs:
       - name: Initial setup
         shell: bash -l {0}
         run: |
-        brew install eigen gcc@6 gsed hdf5
-        brew link hdf5
+          brew install eigen gcc@6 gsed hdf5
+          brew link hdf5
 
       - name: Build MOAB
         shell: bash -l {0}

From f5d860f4f9d8c0c5137b33b8624260fe5eccc95d Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Fri, 20 Aug 2021 08:15:01 +0200
Subject: [PATCH 04/36] fixing dagmc path

---
 .github/workflows/unix_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 922c371404..a81ee81d94 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -65,7 +65,7 @@ jobs:
         run: |
           mkdir -p $GITHUB_WORKSPACE/bld
           cd $GITHUB_WORKSPACE/bld
-          cmake ${dagmc_build_dir} -DMOAB_DIR=/opt/moab \
+          cmake ../ -DMOAB_DIR=/opt/moab \
                       -DBUILD_CI_TESTS=ON \
                       -DBUILD_STATIC_EXE=OFF \
                       -DCMAKE_INSTALL_PREFIX=/root/dagmc

From 4036e462ce602f339f3effb4ba5e847ea5bc726b Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Fri, 20 Aug 2021 08:34:25 +0200
Subject: [PATCH 05/36] fixing MOAB PATH

---
 .github/workflows/unix_mac.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index a81ee81d94..eecce1a804 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -40,6 +40,7 @@ jobs:
       - name: Build MOAB
         shell: bash -l {0}
         run: |
+          cd $GITHUB_WORKSPACE/..
           mkdir -pv moab/bld
           cd moab
           git clone https://bitbucket.org/fathomteam/moab -b 5.3.0 --depth 1 --shallow-submodules
@@ -54,7 +55,7 @@ jobs:
                   -DBUILD_SHARED_LIBS=ON \
                   -DENABLE_BLASLAPACK=OFF \
                   -DENABLE_FORTRAN=OFF \
-                  -DCMAKE_INSTALL_PREFIX=/opt/moab
+                  -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab
           make
           make install
           cd ../..
@@ -65,7 +66,7 @@ jobs:
         run: |
           mkdir -p $GITHUB_WORKSPACE/bld
           cd $GITHUB_WORKSPACE/bld
-          cmake ../ -DMOAB_DIR=/opt/moab \
+          cmake ../ -DMOAB_DIR=$GITHUB_WORKSPACE/../moab \
                       -DBUILD_CI_TESTS=ON \
                       -DBUILD_STATIC_EXE=OFF \
                       -DCMAKE_INSTALL_PREFIX=/root/dagmc

From 1fa4f92e7a4622113c934e5bf4bb866e942369a7 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Fri, 20 Aug 2021 22:40:55 +0200
Subject: [PATCH 06/36] adding static MOAB

---
 .github/workflows/unix_mac.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index eecce1a804..377ce3b7ae 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -51,13 +51,22 @@ jobs:
           # #end of patch
           cd bld
           cmake ../moab -DENABLE_HDF5=ON \
-                  -DHDF5_ROOT=$HDF5_PATH \
-                  -DBUILD_SHARED_LIBS=ON \
-                  -DENABLE_BLASLAPACK=OFF \
-                  -DENABLE_FORTRAN=OFF \
-                  -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab
+                        -DHDF5_ROOT=$HDF5_PATH \
+                        -DBUILD_SHARED_LIBS=ON \
+                        -DENABLE_BLASLAPACK=OFF \
+                        -DENABLE_FORTRAN=OFF \
+                        -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab
           make
           make install
+          rm -rf *
+          cmake ../moab -DENABLE_HDF5=ON -DHDF5_ROOT=${HDF5_PATH} \
+                        -DENABLE_PYMOAB=ON \
+                        -DENABLE_BLASLAPACK=OFF \
+                        -DENABLE_FORTRAN=OFF \
+                        -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab \
+                        -DBUILD_SHARED_LIBS=ON
+          make -j${ci_jobs}
+          make install
           cd ../..
           rm -rf moab/moab moab/bld
 

From 4982f78428422104a1ed0a0869cf824b7fd30fe9 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 07:24:58 +0200
Subject: [PATCH 07/36]  no patch required ?

---
 .github/workflows/unix_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 377ce3b7ae..38f9230168 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -44,7 +44,7 @@ jobs:
           mkdir -pv moab/bld
           cd moab
           git clone https://bitbucket.org/fathomteam/moab -b 5.3.0 --depth 1 --shallow-submodules
-          cd moab
+          # cd moab
           # # patching MOAB CMakeLists.txt to use default find(HDF5)
           # $SED -i "s/HDF5_MOAB/HDF5/" CMakeLists.txt
           # cd ..

From 3c698063e368113cd7b5f1d39644a02e62e19dfb Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 07:35:03 +0200
Subject: [PATCH 08/36] adding numpy

---
 .github/workflows/unix_mac.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 38f9230168..8b1e35216f 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -36,6 +36,7 @@ jobs:
         run: |
           brew install eigen gcc@6 gsed hdf5
           brew link hdf5
+          brew install numpy --with-python3
 
       - name: Build MOAB
         shell: bash -l {0}

From d3d15f94400c1bf4642cbd977b7cf0d77d56d2ad Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 07:49:51 +0200
Subject: [PATCH 09/36] is array missing ?

---
 src/dagmc/DagMC.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dagmc/DagMC.cpp b/src/dagmc/DagMC.cpp
index c72eb7e859..94b39158e9 100644
--- a/src/dagmc/DagMC.cpp
+++ b/src/dagmc/DagMC.cpp
@@ -7,6 +7,7 @@
 #include <string.h>
 
 #include <algorithm>
+#include <array>
 #include <climits>
 #include <fstream>
 #include <iostream>

From 4118f2e18a1c1e6211943fae57e8b2468f1dae79 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 07:51:42 +0200
Subject: [PATCH 10/36] revert ...

---
 src/dagmc/DagMC.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/dagmc/DagMC.cpp b/src/dagmc/DagMC.cpp
index 94b39158e9..c72eb7e859 100644
--- a/src/dagmc/DagMC.cpp
+++ b/src/dagmc/DagMC.cpp
@@ -7,7 +7,6 @@
 #include <string.h>
 
 #include <algorithm>
-#include <array>
 #include <climits>
 #include <fstream>
 #include <iostream>

From 6eb4f7702aa5666569844405b51630dc2790e2eb Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 07:53:07 +0200
Subject: [PATCH 11/36] numpy correctly ? and no link hdf5 anymore

---
 .github/workflows/unix_mac.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 8b1e35216f..bcb7e98845 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -35,8 +35,8 @@ jobs:
         shell: bash -l {0}
         run: |
           brew install eigen gcc@6 gsed hdf5
-          brew link hdf5
-          brew install numpy --with-python3
+          # brew link hdf5
+          brew install numpy
 
       - name: Build MOAB
         shell: bash -l {0}

From dadfc8956af0e646b1f8a31bf56fa5b045959afa Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 08:20:20 +0200
Subject: [PATCH 12/36] using pyenv...

---
 .github/workflows/unix_mac.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index bcb7e98845..45ff6312b9 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -26,17 +26,20 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Environment Variables
+      - name: Initial setup
         shell: bash -l {0}
         run: |
+          brew install eigen gcc@6 gsed hdf5 pyenv
+          # brew link hdf5
+          pyenv install 3.9.1
+          pyenv global 3.9.1
+          pip install numpy
 
-      
-      - name: Initial setup
+      - name: Environment Variables
         shell: bash -l {0}
         run: |
-          brew install eigen gcc@6 gsed hdf5
-          # brew link hdf5
-          brew install numpy
+          echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi' >> $HOME/.bash_profile
+      
 
       - name: Build MOAB
         shell: bash -l {0}

From 7304bf2796d6ca870cc9e0c6bdeebf03ad169b13 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 09:48:04 +0200
Subject: [PATCH 13/36] need cython

---
 .github/workflows/unix_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 45ff6312b9..53473200c6 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -33,7 +33,7 @@ jobs:
           # brew link hdf5
           pyenv install 3.9.1
           pyenv global 3.9.1
-          pip install numpy
+          pip install numpy cython
 
       - name: Environment Variables
         shell: bash -l {0}

From 5b1e1edd8277098481b04e1b9c11c9b509c5c6ef Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 10:22:52 +0200
Subject: [PATCH 14/36] xcode-select --install needed ?

---
 .github/workflows/unix_mac.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 53473200c6..ee3e4d49a2 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -29,6 +29,7 @@ jobs:
       - name: Initial setup
         shell: bash -l {0}
         run: |
+          xcode-select --install
           brew install eigen gcc@6 gsed hdf5 pyenv
           # brew link hdf5
           pyenv install 3.9.1

From 72a935a4de1300303010a90ec76cdacfa6e7051c Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 10:51:13 +0200
Subject: [PATCH 15/36] better pyenv ?

---
 .github/workflows/unix_mac.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index ee3e4d49a2..38668b24d6 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -32,6 +32,7 @@ jobs:
           xcode-select --install
           brew install eigen gcc@6 gsed hdf5 pyenv
           # brew link hdf5
+          eval "$(pyenv init -)
           pyenv install 3.9.1
           pyenv global 3.9.1
           pip install numpy cython
@@ -45,6 +46,7 @@ jobs:
       - name: Build MOAB
         shell: bash -l {0}
         run: |
+          eval "$(pyenv init -)
           cd $GITHUB_WORKSPACE/..
           mkdir -pv moab/bld
           cd moab
@@ -78,6 +80,7 @@ jobs:
       - name: Build DAGMC
         shell: bash -l {0}
         run: |
+          eval "$(pyenv init -)
           mkdir -p $GITHUB_WORKSPACE/bld
           cd $GITHUB_WORKSPACE/bld
           cmake ../ -DMOAB_DIR=$GITHUB_WORKSPACE/../moab \

From 5c6aca0923a7253bf6161f2feefede9ca4b47de9 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 11:07:37 +0200
Subject: [PATCH 16/36] no need for gsed

---
 .github/workflows/unix_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 38668b24d6..cd67f901f9 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -30,7 +30,7 @@ jobs:
         shell: bash -l {0}
         run: |
           xcode-select --install
-          brew install eigen gcc@6 gsed hdf5 pyenv
+          brew install eigen gcc@6 hdf5 pyenv
           # brew link hdf5
           eval "$(pyenv init -)
           pyenv install 3.9.1

From 6b9da99f9feddf611dfb2962366af2dd061c73c7 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 11:32:51 +0200
Subject: [PATCH 17/36] no xcode install

---
 .github/workflows/unix_mac.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index cd67f901f9..f7e2628909 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -29,7 +29,6 @@ jobs:
       - name: Initial setup
         shell: bash -l {0}
         run: |
-          xcode-select --install
           brew install eigen gcc@6 hdf5 pyenv
           # brew link hdf5
           eval "$(pyenv init -)

From a422c6dbc1fe94ea2da7c8d9c38c75523e0a715b Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 11:35:04 +0200
Subject: [PATCH 18/36] clsogin the quote

---
 .github/workflows/unix_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index f7e2628909..67d571af02 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -31,7 +31,7 @@ jobs:
         run: |
           brew install eigen gcc@6 hdf5 pyenv
           # brew link hdf5
-          eval "$(pyenv init -)
+          eval "$(pyenv init -)"
           pyenv install 3.9.1
           pyenv global 3.9.1
           pip install numpy cython

From 8ae8cad2983c1d06f3fa2558b984de714008dda2 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 11:39:17 +0200
Subject: [PATCH 19/36] clsogin the quote

---
 .github/workflows/unix_mac.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 67d571af02..9098a604c5 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Build MOAB
         shell: bash -l {0}
         run: |
-          eval "$(pyenv init -)
+          eval "$(pyenv init -)"
           cd $GITHUB_WORKSPACE/..
           mkdir -pv moab/bld
           cd moab
@@ -79,7 +79,7 @@ jobs:
       - name: Build DAGMC
         shell: bash -l {0}
         run: |
-          eval "$(pyenv init -)
+          eval "$(pyenv init -)"
           mkdir -p $GITHUB_WORKSPACE/bld
           cd $GITHUB_WORKSPACE/bld
           cmake ../ -DMOAB_DIR=$GITHUB_WORKSPACE/../moab \

From 46647d2ba5f45303059d029b8706d6406f7eb407 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 12:03:58 +0200
Subject: [PATCH 20/36] nothing in bash_profile

---
 .github/workflows/unix_mac.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 9098a604c5..2a2288697b 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -36,10 +36,10 @@ jobs:
           pyenv global 3.9.1
           pip install numpy cython
 
-      - name: Environment Variables
-        shell: bash -l {0}
-        run: |
-          echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi' >> $HOME/.bash_profile
+      # - name: Environment Variables
+      #   shell: bash -l {0}
+      #   run: |
+      #     echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi' >> $HOME/.bash_profile
       
 
       - name: Build MOAB

From 6dbd062a76eb52079c5521382322b75c7b762710 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 14:04:47 +0200
Subject: [PATCH 21/36] what is python ?

---
 .github/workflows/unix_mac.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 2a2288697b..5b899deb9f 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -46,6 +46,9 @@ jobs:
         shell: bash -l {0}
         run: |
           eval "$(pyenv init -)"
+          which python
+          python --version
+
           cd $GITHUB_WORKSPACE/..
           mkdir -pv moab/bld
           cd moab

From 19378c88cb469512a54c6774d335f7858b80cd76 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 14:10:52 +0200
Subject: [PATCH 22/36] forcing 3.9.1

---
 .github/workflows/unix_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 5b899deb9f..1b68504128 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -47,8 +47,8 @@ jobs:
         run: |
           eval "$(pyenv init -)"
           which python
+          pyenv global 3.9.1
           python --version
-
           cd $GITHUB_WORKSPACE/..
           mkdir -pv moab/bld
           cd moab

From 7f9204d6132cef72a1c94336058fe81277f7af26 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 14:21:00 +0200
Subject: [PATCH 23/36] force pyenv init

---
 .github/workflows/unix_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 1b68504128..74686a68a9 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Build MOAB
         shell: bash -l {0}
         run: |
-          eval "$(pyenv init -)"
+          pyenv init -
           which python
           pyenv global 3.9.1
           python --version

From e4ce87193062acc90844d22cfb46e10b425f977a Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 14:37:04 +0200
Subject: [PATCH 24/36] any better ?gp

---
 .github/workflows/unix_mac.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 74686a68a9..9a7bbbee6e 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -25,15 +25,18 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
       - name: Initial setup
         shell: bash -l {0}
         run: |
-          brew install eigen gcc@6 hdf5 pyenv
-          # brew link hdf5
-          eval "$(pyenv init -)"
-          pyenv install 3.9.1
-          pyenv global 3.9.1
+          brew install eigen gcc@6 hdf5
+          # # brew link hdf5
+          # eval "$(pyenv init -)"
+          # pyenv install 3.9.1
+          # pyenv global 3.9.1
           pip install numpy cython
 
       # - name: Environment Variables
@@ -47,7 +50,6 @@ jobs:
         run: |
           pyenv init -
           which python
-          pyenv global 3.9.1
           python --version
           cd $GITHUB_WORKSPACE/..
           mkdir -pv moab/bld

From c545dea1cc84c7ff51863eb959af9e1f4b986962 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 14:47:07 +0200
Subject: [PATCH 25/36] installing python3 with brew

---
 .github/workflows/unix_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 9a7bbbee6e..3c718a88f4 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Initial setup
         shell: bash -l {0}
         run: |
-          brew install eigen gcc@6 hdf5
+          brew install eigen gcc@6 hdf5 python3
           # # brew link hdf5
           # eval "$(pyenv init -)"
           # pyenv install 3.9.1

From 7630c7384ad6334c2251fcdfc5e6e513d1d4740f Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 14:49:07 +0200
Subject: [PATCH 26/36] how about now ?

---
 .github/workflows/unix_mac.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 3c718a88f4..baa7a3c9eb 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -32,7 +32,8 @@ jobs:
       - name: Initial setup
         shell: bash -l {0}
         run: |
-          brew install eigen gcc@6 hdf5 python3
+          brew install eigen gcc@6 hdf5
+          brew link --overwrite python
           # # brew link hdf5
           # eval "$(pyenv init -)"
           # pyenv install 3.9.1

From 4297d925fd2c1c4b195629bc046434093a567a79 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 14:56:14 +0200
Subject: [PATCH 27/36] pymoab in shared libs

---
 .github/workflows/unix_mac.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index baa7a3c9eb..4d6e29609b 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -63,6 +63,7 @@ jobs:
           # #end of patch
           cd bld
           cmake ../moab -DENABLE_HDF5=ON \
+                        -DENABLE_PYMOAB=ON \
                         -DHDF5_ROOT=$HDF5_PATH \
                         -DBUILD_SHARED_LIBS=ON \
                         -DENABLE_BLASLAPACK=OFF \
@@ -70,15 +71,14 @@ jobs:
                         -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab
           make
           make install
-          rm -rf *
-          cmake ../moab -DENABLE_HDF5=ON -DHDF5_ROOT=${HDF5_PATH} \
-                        -DENABLE_PYMOAB=ON \
-                        -DENABLE_BLASLAPACK=OFF \
-                        -DENABLE_FORTRAN=OFF \
-                        -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab \
-                        -DBUILD_SHARED_LIBS=ON
-          make -j${ci_jobs}
-          make install
+          # rm -rf *
+          # cmake ../moab -DENABLE_HDF5=ON -DHDF5_ROOT=${HDF5_PATH} \
+          #               -DENABLE_BLASLAPACK=OFF \
+          #               -DENABLE_FORTRAN=OFF \
+          #               -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab \
+          #               -DBUILD_SHARED_LIBS=ON
+          # make -j${ci_jobs}
+          # make install
           cd ../..
           rm -rf moab/moab moab/bld
 

From 0785cc662e7227d60718db17ce904fa0f9f34a22 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 14:59:03 +0200
Subject: [PATCH 28/36] forcing SHARED LIB and no STATIC

---
 .github/workflows/unix_mac.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 4d6e29609b..208c03d83b 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -91,6 +91,8 @@ jobs:
           cmake ../ -DMOAB_DIR=$GITHUB_WORKSPACE/../moab \
                       -DBUILD_CI_TESTS=ON \
                       -DBUILD_STATIC_EXE=OFF \
+                      -DBUILD_SHARED_LIBS=ON \
+                      -DBUILD_STATIC_LIBS=OFF \
                       -DCMAKE_INSTALL_PREFIX=/root/dagmc
                       # -DDOUBLE_DOWN=${double_down} \
                       # -Ddd_ROOT=${double_down_install_dir}

From ad4742ad4935e06a97b751a13a542f92655cdaac Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sat, 21 Aug 2021 15:08:00 +0200
Subject: [PATCH 29/36] no pymoab

---
 .github/workflows/unix_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 208c03d83b..d64d6a2b9b 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -63,7 +63,7 @@ jobs:
           # #end of patch
           cd bld
           cmake ../moab -DENABLE_HDF5=ON \
-                        -DENABLE_PYMOAB=ON \
+                        -DENABLE_PYMOAB=OFF \
                         -DHDF5_ROOT=$HDF5_PATH \
                         -DBUILD_SHARED_LIBS=ON \
                         -DENABLE_BLASLAPACK=OFF \

From 1d50d4deabe60e21be26078f8dd18e4c48d68456 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sun, 22 Aug 2021 06:51:16 +0200
Subject: [PATCH 30/36] array needed

---
 src/dagmc/DagMC.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dagmc/DagMC.cpp b/src/dagmc/DagMC.cpp
index c72eb7e859..94b39158e9 100644
--- a/src/dagmc/DagMC.cpp
+++ b/src/dagmc/DagMC.cpp
@@ -7,6 +7,7 @@
 #include <string.h>
 
 #include <algorithm>
+#include <array>
 #include <climits>
 #include <fstream>
 #include <iostream>

From 2b53aabc8fb5d101ed89dbf7291abecde346ab9c Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sun, 22 Aug 2021 07:12:41 +0200
Subject: [PATCH 31/36] updating install prefix

---
 .github/workflows/unix_mac.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index d64d6a2b9b..c72ce8a095 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -93,7 +93,7 @@ jobs:
                       -DBUILD_STATIC_EXE=OFF \
                       -DBUILD_SHARED_LIBS=ON \
                       -DBUILD_STATIC_LIBS=OFF \
-                      -DCMAKE_INSTALL_PREFIX=/root/dagmc
+                      -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../dagmc
                       # -DDOUBLE_DOWN=${double_down} \
                       # -Ddd_ROOT=${double_down_install_dir}
           make

From 27faea5e7deb0bdf3936b47ada6d935bed671fab Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sun, 22 Aug 2021 07:48:08 +0200
Subject: [PATCH 32/36] adding test

---
 .github/workflows/unix_mac.yml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index c72ce8a095..3fdec2cb87 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -34,10 +34,6 @@ jobs:
         run: |
           brew install eigen gcc@6 hdf5
           brew link --overwrite python
-          # # brew link hdf5
-          # eval "$(pyenv init -)"
-          # pyenv install 3.9.1
-          # pyenv global 3.9.1
           pip install numpy cython
 
       # - name: Environment Variables
@@ -49,18 +45,10 @@ jobs:
       - name: Build MOAB
         shell: bash -l {0}
         run: |
-          pyenv init -
-          which python
-          python --version
           cd $GITHUB_WORKSPACE/..
           mkdir -pv moab/bld
           cd moab
           git clone https://bitbucket.org/fathomteam/moab -b 5.3.0 --depth 1 --shallow-submodules
-          # cd moab
-          # # patching MOAB CMakeLists.txt to use default find(HDF5)
-          # $SED -i "s/HDF5_MOAB/HDF5/" CMakeLists.txt
-          # cd ..
-          # #end of patch
           cd bld
           cmake ../moab -DENABLE_HDF5=ON \
                         -DENABLE_PYMOAB=OFF \
@@ -85,7 +73,6 @@ jobs:
       - name: Build DAGMC
         shell: bash -l {0}
         run: |
-          eval "$(pyenv init -)"
           mkdir -p $GITHUB_WORKSPACE/bld
           cd $GITHUB_WORKSPACE/bld
           cmake ../ -DMOAB_DIR=$GITHUB_WORKSPACE/../moab \
@@ -98,4 +85,14 @@ jobs:
                       # -Ddd_ROOT=${double_down_install_dir}
           make
           make install
+      - name: Testing DAGMC
+        shell: bash -l {0}
+        run: |
+          cd $GITHUB_WORKSPACE/bld
+          PATH=$GITHUB_WORKSPACE/bld/bin:$PATH make test
+          cd $GITHUB_WORKSPACE
+          git clean -dfx
+          cd $GITHUB_WORKSPACE/cmake/test_config
+          cmake . -DDAGMC_ROOT=$GITHUB_WORKSPACE/../dagmc
+          make all test
 

From 682fdcf5682c8420604a6d83876f088dff92f29f Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <mouginot.baptiste@gmail.com>
Date: Sun, 22 Aug 2021 08:34:42 +0200
Subject: [PATCH 33/36] some shuffling and no config test...

---
 .github/workflows/{unix_mac.yml => mac_build_test.yml} | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
 rename .github/workflows/{unix_mac.yml => mac_build_test.yml} (89%)

diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/mac_build_test.yml
similarity index 89%
rename from .github/workflows/unix_mac.yml
rename to .github/workflows/mac_build_test.yml
index 3fdec2cb87..3465c3aa4b 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/mac_build_test.yml
@@ -1,4 +1,4 @@
-name: Mac builds
+name: Mac Build/Test
 
 on:
   # allows us to run workflows manually
@@ -21,8 +21,6 @@ jobs:
   main:
     runs-on: macos-10.15
 
-    name: 'Cubit ${{ matrix.cubit }} Build for ${{ matrix.os }} ${{ matrix.os_version }} of Svalinn Plugin'
-
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.9
@@ -90,9 +88,4 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE/bld
           PATH=$GITHUB_WORKSPACE/bld/bin:$PATH make test
-          cd $GITHUB_WORKSPACE
-          git clean -dfx
-          cd $GITHUB_WORKSPACE/cmake/test_config
-          cmake . -DDAGMC_ROOT=$GITHUB_WORKSPACE/../dagmc
-          make all test
 

From 2386228fc0bf1fd6e5b71d66437ca9a5a71a46b5 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com>
Date: Sun, 22 Aug 2021 16:02:48 +0200
Subject: [PATCH 34/36] Apply suggestions from code review

Co-authored-by: Paul Wilson <paul.wilson@wisc.edu>
---
 .github/workflows/mac_build_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml
index 3465c3aa4b..3262aad90b 100644
--- a/.github/workflows/mac_build_test.yml
+++ b/.github/workflows/mac_build_test.yml
@@ -18,7 +18,7 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  main:
+  BuildTest:
     runs-on: macos-10.15
 
     steps:

From 38ba4a8c939a027cd9a72acde808ac702294cc65 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com>
Date: Sun, 22 Aug 2021 16:09:14 +0200
Subject: [PATCH 35/36] nopymoab -> no python module + some cleaning

---
 .github/workflows/mac_build_test.yml | 37 +++++++++-------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml
index 3262aad90b..615ac57085 100644
--- a/.github/workflows/mac_build_test.yml
+++ b/.github/workflows/mac_build_test.yml
@@ -23,27 +23,22 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
+
       - name: Initial setup
         shell: bash -l {0}
         run: |
           brew install eigen gcc@6 hdf5
-          brew link --overwrite python
-          pip install numpy cython
 
-      # - name: Environment Variables
-      #   shell: bash -l {0}
-      #   run: |
-      #     echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi' >> $HOME/.bash_profile
+      - name: Environment Variables
+        shell: bash -l {0}
+        run: |
+          echo "HOME=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV
       
 
       - name: Build MOAB
         shell: bash -l {0}
         run: |
-          cd $GITHUB_WORKSPACE/..
+          cd ${HOME}
           mkdir -pv moab/bld
           cd moab
           git clone https://bitbucket.org/fathomteam/moab -b 5.3.0 --depth 1 --shallow-submodules
@@ -54,35 +49,25 @@ jobs:
                         -DBUILD_SHARED_LIBS=ON \
                         -DENABLE_BLASLAPACK=OFF \
                         -DENABLE_FORTRAN=OFF \
-                        -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab
+                        -DCMAKE_INSTALL_PREFIX=${HOME}/moab
           make
           make install
-          # rm -rf *
-          # cmake ../moab -DENABLE_HDF5=ON -DHDF5_ROOT=${HDF5_PATH} \
-          #               -DENABLE_BLASLAPACK=OFF \
-          #               -DENABLE_FORTRAN=OFF \
-          #               -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab \
-          #               -DBUILD_SHARED_LIBS=ON
-          # make -j${ci_jobs}
-          # make install
-          cd ../..
-          rm -rf moab/moab moab/bld
+          rm -rf ${HOME}/moab/moab ${HOME}/moab/bld
 
       - name: Build DAGMC
         shell: bash -l {0}
         run: |
           mkdir -p $GITHUB_WORKSPACE/bld
           cd $GITHUB_WORKSPACE/bld
-          cmake ../ -DMOAB_DIR=$GITHUB_WORKSPACE/../moab \
+          cmake ../ -DMOAB_DIR=${HOME}/moab \
                       -DBUILD_CI_TESTS=ON \
                       -DBUILD_STATIC_EXE=OFF \
                       -DBUILD_SHARED_LIBS=ON \
                       -DBUILD_STATIC_LIBS=OFF \
-                      -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../dagmc
-                      # -DDOUBLE_DOWN=${double_down} \
-                      # -Ddd_ROOT=${double_down_install_dir}
+                      -DCMAKE_INSTALL_PREFIX=${HOME}/dagmc
           make
           make install
+
       - name: Testing DAGMC
         shell: bash -l {0}
         run: |

From 7ee19e3785c57491caf71b1ace05f3adc3535a2c Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com>
Date: Sun, 22 Aug 2021 16:10:32 +0200
Subject: [PATCH 36/36] adding changelog

---
 doc/CHANGELOG.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
index 8cd17fca97..818b499834 100644
--- a/doc/CHANGELOG.rst
+++ b/doc/CHANGELOG.rst
@@ -16,6 +16,7 @@ Next version
    * Enforcing usage of Python3 for PyNE amalgamation. (#773)
    * Adding workflow_dispatch option to docker_publish workflow (#776)
    * DagMC methods for creation and removal of the graveyard volume (#714)
+   * CI build and test now support MacOS (shared build, no pymoab, no Double Down) (#780)
 
 **Changed:**