diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0038f6f6..ff9eacccb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: spack -e e4s-build add cmake && \ spack -e e4s-build install && \ quick-create-dev -s nalu-wind@master+tioga+hypre && \ - spack manager external ${EXAWIND_MANAGER}/environments/e4s-build --exclude nalu-wind gmake && \ + spack manager external ${EXAWIND_MANAGER}/environments/e4s-build --exclude nalu-wind && \ spack install && \ spack cd -b nalu-wind && \ spack build-env nalu-wind ctest -j $(nproc) -L unit --output-on-failure \ @@ -81,7 +81,7 @@ jobs: spack -e e4s-build add cmake && \ spack -e e4s-build install && \ quick-create-dev -s nalu-wind@master+tioga+hypre~trilinos-solvers && \ - spack manager external ${EXAWIND_MANAGER}/environments/e4s-build --exclude nalu-wind gmake && \ + spack manager external ${EXAWIND_MANAGER}/environments/e4s-build --exclude nalu-wind && \ spack install && \ spack cd -b nalu-wind && \ spack build-env nalu-wind ctest -j $(nproc) -L unit --output-on-failure \ diff --git a/docs/source/user/build_spack.rst b/docs/source/user/build_spack.rst index 01caa1ad3..25996059c 100644 --- a/docs/source/user/build_spack.rst +++ b/docs/source/user/build_spack.rst @@ -230,6 +230,6 @@ Inside the container you can directly load the pre-installed version of Nalu-Win spack load nalu-wind -`Spack-Manager `_ is used generate the container and is pre-installed in the container. Additional development of the code can be done through the Spack-Manager's developer tools. A quick-start guide for these tools is available `here `_. This workflow is how the CI builds are generated in GitHub actions. +`ExaWind-Manager `_ is used generate the container and is pre-installed in the container. Additional development of the code can be done through the Exawind-Manager's developer tools. If you are uncomfortable using spack for development then you can also set up your own build workflow in more of a "roll-your-own" development environment using CMake and just utilize the pre-installed TPL's that are available in the container through spack. This really comes down to your development preferences and your comfort level with CMake. diff --git a/wind-utils b/wind-utils index a055d9438..e32b19dfa 160000 --- a/wind-utils +++ b/wind-utils @@ -1 +1 @@ -Subproject commit a055d9438f1348f8bdeb5d320343c83c469de220 +Subproject commit e32b19dfa07f307f816a9b4bdb3d8478eb18d02c