From e667c9b4677449b8f956cdc09195b1b88676a817 Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Tue, 30 Jul 2024 15:07:41 -0600 Subject: [PATCH 01/10] update wind utils --- wind-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wind-utils b/wind-utils index a055d9438..210b9f77b 160000 --- a/wind-utils +++ b/wind-utils @@ -1 +1 @@ -Subproject commit a055d9438f1348f8bdeb5d320343c83c469de220 +Subproject commit 210b9f77b8be11ea6b4b15c83f770419785b143b From fccc53970080550ff682990af74eeb464ef8b978 Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Tue, 30 Jul 2024 15:33:32 -0600 Subject: [PATCH 02/10] update --- wind-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wind-utils b/wind-utils index 210b9f77b..6cb7acd2f 160000 --- a/wind-utils +++ b/wind-utils @@ -1 +1 @@ -Subproject commit 210b9f77b8be11ea6b4b15c83f770419785b143b +Subproject commit 6cb7acd2fbfd8e1a04fb77e8527d6754f2fdb44f From cf98b285ee7b6c31ee4c514e5e19fa81d9ac7ee9 Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Tue, 30 Jul 2024 15:36:54 -0600 Subject: [PATCH 03/10] revert --- wind-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wind-utils b/wind-utils index 6cb7acd2f..210b9f77b 160000 --- a/wind-utils +++ b/wind-utils @@ -1 +1 @@ -Subproject commit 6cb7acd2fbfd8e1a04fb77e8527d6754f2fdb44f +Subproject commit 210b9f77b8be11ea6b4b15c83f770419785b143b From d89eccc111a949f7f5725072725ef24ef4ee5fca Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Wed, 31 Jul 2024 09:39:37 -0600 Subject: [PATCH 04/10] more --- wind-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wind-utils b/wind-utils index 210b9f77b..20d743cce 160000 --- a/wind-utils +++ b/wind-utils @@ -1 +1 @@ -Subproject commit 210b9f77b8be11ea6b4b15c83f770419785b143b +Subproject commit 20d743cce6dd11fdd62ef42f99df710f73121d5b From b94c48ded67768f4ffc6b5d76c5f7614ccbbbc1b Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Wed, 31 Jul 2024 09:48:25 -0600 Subject: [PATCH 05/10] again --- wind-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wind-utils b/wind-utils index 20d743cce..2d9d2c877 160000 --- a/wind-utils +++ b/wind-utils @@ -1 +1 @@ -Subproject commit 20d743cce6dd11fdd62ef42f99df710f73121d5b +Subproject commit 2d9d2c877d295200b3ee074924ae4d9485ef9c58 From 31ed608371f4dbf63bbbf3086a3f1fb540c11539 Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Wed, 31 Jul 2024 09:49:24 -0600 Subject: [PATCH 06/10] add wind-utils to ci --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0038f6f6..7cb0fb41a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: spack -e e4s-build config add view:true && \ spack -e e4s-build add cmake && \ spack -e e4s-build install && \ - quick-create-dev -s nalu-wind@master+tioga+hypre && \ + quick-create-dev -s nalu-wind@master+tioga+hypre+wind-utils && \ spack manager external ${EXAWIND_MANAGER}/environments/e4s-build --exclude nalu-wind gmake && \ spack install && \ spack cd -b nalu-wind && \ @@ -80,7 +80,7 @@ jobs: spack -e e4s-build config add view:true && \ spack -e e4s-build add cmake && \ spack -e e4s-build install && \ - quick-create-dev -s nalu-wind@master+tioga+hypre~trilinos-solvers && \ + quick-create-dev -s nalu-wind@master+tioga+hypre~trilinos-solvers+wind-utils && \ spack manager external ${EXAWIND_MANAGER}/environments/e4s-build --exclude nalu-wind gmake && \ spack install && \ spack cd -b nalu-wind && \ From f4d66a31f061aba3c8403d73be9efd11f8abc3fe Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Wed, 31 Jul 2024 09:50:01 -0600 Subject: [PATCH 07/10] final submod update --- wind-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wind-utils b/wind-utils index 2d9d2c877..e32b19dfa 160000 --- a/wind-utils +++ b/wind-utils @@ -1 +1 @@ -Subproject commit 2d9d2c877d295200b3ee074924ae4d9485ef9c58 +Subproject commit e32b19dfa07f307f816a9b4bdb3d8478eb18d02c From f3a9f5ae47fe40ca5a3c903f19395dad49b94c4a Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Wed, 31 Jul 2024 09:58:38 -0600 Subject: [PATCH 08/10] replace refs to spack-manager --- docs/source/user/build_spack.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From 0e5d09a72c0d03d67fc0a8f8b0a42e0f7156ff23 Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Wed, 31 Jul 2024 10:20:53 -0600 Subject: [PATCH 09/10] remove gmake --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7cb0fb41a..21c7f1867 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+wind-utils && \ - 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+wind-utils && \ - 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 \ From d0e0a2121cba937b9f00dcfe1a6953d2006cf279 Mon Sep 17 00:00:00 2001 From: Marc Henry de Frahan Date: Wed, 31 Jul 2024 10:28:34 -0600 Subject: [PATCH 10/10] remove wind utils from CI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21c7f1867..ff9eacccb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: spack -e e4s-build config add view:true && \ spack -e e4s-build add cmake && \ spack -e e4s-build install && \ - quick-create-dev -s nalu-wind@master+tioga+hypre+wind-utils && \ + quick-create-dev -s nalu-wind@master+tioga+hypre && \ spack manager external ${EXAWIND_MANAGER}/environments/e4s-build --exclude nalu-wind && \ spack install && \ spack cd -b nalu-wind && \ @@ -80,7 +80,7 @@ jobs: spack -e e4s-build config add view:true && \ spack -e e4s-build add cmake && \ spack -e e4s-build install && \ - quick-create-dev -s nalu-wind@master+tioga+hypre~trilinos-solvers+wind-utils && \ + quick-create-dev -s nalu-wind@master+tioga+hypre~trilinos-solvers && \ spack manager external ${EXAWIND_MANAGER}/environments/e4s-build --exclude nalu-wind && \ spack install && \ spack cd -b nalu-wind && \