Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update wind-utils submod #1277

Merged
merged 10 commits into from
Jul 31, 2024
+4 −4
Merged

Update wind-utils submod #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e667c9b
update wind utils
marchdf Jul 30, 2024
fccc539
update
marchdf Jul 30, 2024
cf98b28
revert
marchdf Jul 30, 2024
d89eccc
more
marchdf Jul 31, 2024
b94c48d
again
marchdf Jul 31, 2024
31ed608
add wind-utils to ci
marchdf Jul 31, 2024
f4d66a3
final submod update
marchdf Jul 31, 2024
f3a9f5a
replace refs to spack-manager
marchdf Jul 31, 2024
0e5d09a
remove gmake
marchdf Jul 31, 2024
d0e0a21
remove wind utils from CI
marchdf Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion docs/source/user/build_spack.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,6 @@ Inside the container you can directly load the pre-installed version of Nalu-Win

spack load nalu-wind

`Spack-Manager <https://github.com/sandialabs/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 <https://sandialabs.github.io/spack-manager/user_profiles/developers/developer_workflow.html>`_. This workflow is how the CI builds are generated in GitHub actions.
`ExaWind-Manager <https://github.com/Exawind/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.
2 changes: 1 addition & 1 deletion wind-utils
Open in desktop
Submodule wind-utils updated 26 files
+5 −2 CMakeLists.txt
+23 −17 src/core/CFDMesh.cpp
+6 −7 src/core/CFDMesh.h
+2 −1 src/core/CMakeLists.txt
+11 −4 src/mesh/CMakeLists.txt
+14 −11 src/mesh/HexBlockBase.cpp
+2 −3 src/mesh/HexBlockMesh.cpp
+1 −2 src/mesh/Plot3DMesh.cpp
+11 −10 src/mesh/Slice.cpp
+1 −1 src/mesh/slice_mesh.cpp
+10 −8 src/postprocessing/ABLStatistics.cpp
+3 −1 src/postprocessing/CMakeLists.txt
+17 −14 src/preprocessing/ABLFields.cpp
+8 −4 src/preprocessing/BdyIOPlanes.cpp
+3 −1 src/preprocessing/CMakeLists.txt
+10 −7 src/preprocessing/ChannelFields.cpp
+7 −4 src/preprocessing/HITFields.cpp
+5 −3 src/preprocessing/InflowHistory.cpp
+5 −4 src/preprocessing/NDTW2D.cpp
+4 −4 src/preprocessing/NestedRefinement.cpp
+3 −4 src/preprocessing/RotateMesh.cpp
+7 −6 src/preprocessing/SamplingPlanes.cpp
+1 −1 src/preprocessing/TranslateMesh.cpp
+3 −1 src/preprocessing/nalu_preprocess.cpp
+3 −2 src/tools/boxturb/CMakeLists.txt
+3 −1 src/tools/turbsim_netcdf/CMakeLists.txt
Loading