From aa8b8736b53d74617de85487307bd7c496f5a19c Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Wed, 4 Dec 2024 11:12:32 -0800 Subject: [PATCH 1/8] chore: upgrade Trilinos. --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 216993fba0..1eb229015c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "286-547" + "GEOS_TPL_TAG": "288-578" } }, "runArgs": [ From a929eb8cb937057e1152588ef0ad553adc0173c3 Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Fri, 6 Dec 2024 13:13:40 -0800 Subject: [PATCH 2/8] fortran compiler on LC --- host-configs/LLNL/lassen-base.cmake | 7 +++++++ host-configs/LLNL/lassen-clang-10-cuda-11.cmake | 7 ------- host-configs/LLNL/lassen-clang-13-cuda-11.cmake | 7 ------- host-configs/LLNL/lassen-clang-13-cuda-12.cmake | 7 ------- host-configs/LLNL/lassen-gcc-8-cuda-11.cmake | 5 ----- 5 files changed, 7 insertions(+), 26 deletions(-) diff --git a/host-configs/LLNL/lassen-base.cmake b/host-configs/LLNL/lassen-base.cmake index b8014d6410..a31bb5da36 100644 --- a/host-configs/LLNL/lassen-base.cmake +++ b/host-configs/LLNL/lassen-base.cmake @@ -72,6 +72,13 @@ set(PYTHON_EXECUTABLE /usr/gapps/GEOSX/thirdPartyLibs/python/lassen-gcc-python/p set(Python3_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs/python/lassen-gcc-python/python CACHE PATH "") set(Python3_EXECUTABLE /usr/gapps/GEOSX/thirdPartyLibs/python/lassen-gcc-python/python/bin/python3 CACHE PATH "") +# Fortran +set(CMAKE_Fortran_COMPILER /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran CACHE PATH "") +set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -mtune=power9" CACHE STRING "") +set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") +set(OpenMP_Fortran_FLAGS "-fopenmp" CACHE STRING "") +set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "") + # ATS set(ATS_ARGUMENTS "--ats jsrun_omp --ats jsrun_bind=packed" CACHE STRING "") diff --git a/host-configs/LLNL/lassen-clang-10-cuda-11.cmake b/host-configs/LLNL/lassen-clang-10-cuda-11.cmake index 74c04803ed..a75238f916 100644 --- a/host-configs/LLNL/lassen-clang-10-cuda-11.cmake +++ b/host-configs/LLNL/lassen-clang-10-cuda-11.cmake @@ -1,12 +1,5 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-10-cuda-11.cmake) -# Fortran -set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2022.08.19-cuda-11.8.0/bin/xlf_r CACHE PATH "") -set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -qarch=pwr9 -qtune=pwr9" CACHE STRING "") -set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") -set(OpenMP_Fortran_FLAGS "-qsmp=omp" CACHE STRING "") -set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "") - # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1 CACHE PATH "") set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.8.0/bin/mpifort CACHE PATH "") diff --git a/host-configs/LLNL/lassen-clang-13-cuda-11.cmake b/host-configs/LLNL/lassen-clang-13-cuda-11.cmake index 428274e26d..2611a351a6 100644 --- a/host-configs/LLNL/lassen-clang-13-cuda-11.cmake +++ b/host-configs/LLNL/lassen-clang-13-cuda-11.cmake @@ -1,12 +1,5 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-13-cuda-11.cmake) -# Fortran -set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2022.08.19-cuda-11.8.0/bin/xlf_r CACHE PATH "") -set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -qarch=pwr9 -qtune=pwr9" CACHE STRING "") -set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") -set(OpenMP_Fortran_FLAGS "-qsmp=omp" CACHE STRING "") -set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "") - # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-13.0.1-gcc-8.3.1 CACHE PATH "") set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.8.0/bin/mpifort CACHE PATH "") diff --git a/host-configs/LLNL/lassen-clang-13-cuda-12.cmake b/host-configs/LLNL/lassen-clang-13-cuda-12.cmake index 14ee23d0c8..b2183c8c63 100644 --- a/host-configs/LLNL/lassen-clang-13-cuda-12.cmake +++ b/host-configs/LLNL/lassen-clang-13-cuda-12.cmake @@ -1,12 +1,5 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-13-cuda-12.cmake) -# Fortran -set(CMAKE_Fortran_COMPILER /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran CACHE PATH "") -set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -mtune=power9" CACHE STRING "") -set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") -set(OpenMP_Fortran_FLAGS "-fopenmp" CACHE STRING "") -set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "") - # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-13.0.1-gcc-8.3.1/ CACHE PATH "") set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1/bin/mpifort CACHE PATH "") diff --git a/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake b/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake index fa12811e52..af58f9632e 100644 --- a/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake +++ b/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake @@ -5,11 +5,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE) set(CMAKE_CUDA_FLAGS_RELEASE "-O3 -DNDEBUG -Xcompiler -DNDEBUG -Xcompiler -O3" CACHE STRING "" FORCE) -# Fortran -set(CMAKE_Fortran_COMPILER /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran CACHE PATH "") -set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=power9 -mtune=power9" CACHE STRING "") -set(FORTRAN_MANGLE_NO_UNDERSCORE OFF CACHE BOOL "") - # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1 CACHE PATH "") set(MPI_Fortran_COMPILER ${MPI_HOME}/bin/mpifort CACHE PATH "") From 9cffe8e05dedcf7e5823960dc681532a6a429ca6 Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Fri, 6 Dec 2024 13:58:34 -0800 Subject: [PATCH 3/8] try different fortran compilers. --- host-configs/LLNL/lassen-clang-10-cuda-11.cmake | 2 +- host-configs/LLNL/lassen-clang-13-cuda-11.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/host-configs/LLNL/lassen-clang-10-cuda-11.cmake b/host-configs/LLNL/lassen-clang-10-cuda-11.cmake index a75238f916..0d2333ae0e 100644 --- a/host-configs/LLNL/lassen-clang-10-cuda-11.cmake +++ b/host-configs/LLNL/lassen-clang-10-cuda-11.cmake @@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/ # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1 CACHE PATH "") -set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.8.0/bin/mpifort CACHE PATH "") +set(MPI_Fortran_COMPILER spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0/bin/mpifort CACHE PATH "") include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake) diff --git a/host-configs/LLNL/lassen-clang-13-cuda-11.cmake b/host-configs/LLNL/lassen-clang-13-cuda-11.cmake index 2611a351a6..6b709d1b1a 100644 --- a/host-configs/LLNL/lassen-clang-13-cuda-11.cmake +++ b/host-configs/LLNL/lassen-clang-13-cuda-11.cmake @@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/ # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-13.0.1-gcc-8.3.1 CACHE PATH "") -set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.8.0/bin/mpifort CACHE PATH "") +set(MPI_Fortran_COMPILER spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0/bin/mpifort CACHE PATH "") include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake) From 2661837bf8b321f8b7d2f44eff690a01620324d6 Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Fri, 6 Dec 2024 14:08:24 -0800 Subject: [PATCH 4/8] fix path --- host-configs/LLNL/lassen-clang-10-cuda-11.cmake | 2 +- host-configs/LLNL/lassen-clang-13-cuda-11.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/host-configs/LLNL/lassen-clang-10-cuda-11.cmake b/host-configs/LLNL/lassen-clang-10-cuda-11.cmake index 0d2333ae0e..e0de78e26e 100644 --- a/host-configs/LLNL/lassen-clang-10-cuda-11.cmake +++ b/host-configs/LLNL/lassen-clang-10-cuda-11.cmake @@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/ # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1 CACHE PATH "") -set(MPI_Fortran_COMPILER spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0/bin/mpifort CACHE PATH "") +set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0/bin/mpifort CACHE PATH "") include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake) diff --git a/host-configs/LLNL/lassen-clang-13-cuda-11.cmake b/host-configs/LLNL/lassen-clang-13-cuda-11.cmake index 6b709d1b1a..869245a979 100644 --- a/host-configs/LLNL/lassen-clang-13-cuda-11.cmake +++ b/host-configs/LLNL/lassen-clang-13-cuda-11.cmake @@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/ # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-13.0.1-gcc-8.3.1 CACHE PATH "") -set(MPI_Fortran_COMPILER spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0/bin/mpifort CACHE PATH "") +set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0/bin/mpifort CACHE PATH "") include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake) From 30cbe258a7ca899db82e5abe5edd461a26174830 Mon Sep 17 00:00:00 2001 From: "Randolph R. Settgast" Date: Tue, 10 Dec 2024 15:26:32 -0800 Subject: [PATCH 5/8] revert and modify LC hostconfigs --- host-configs/LLNL/lassen-base.cmake | 7 ------- host-configs/LLNL/lassen-clang-10-cuda-11.cmake | 9 ++++++++- host-configs/LLNL/lassen-clang-13-cuda-11.cmake | 7 +++++++ host-configs/LLNL/lassen-clang-13-cuda-12.cmake | 7 +++++++ host-configs/LLNL/lassen-gcc-8-cuda-11.cmake | 7 +++++++ 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/host-configs/LLNL/lassen-base.cmake b/host-configs/LLNL/lassen-base.cmake index a31bb5da36..b8014d6410 100644 --- a/host-configs/LLNL/lassen-base.cmake +++ b/host-configs/LLNL/lassen-base.cmake @@ -72,13 +72,6 @@ set(PYTHON_EXECUTABLE /usr/gapps/GEOSX/thirdPartyLibs/python/lassen-gcc-python/p set(Python3_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs/python/lassen-gcc-python/python CACHE PATH "") set(Python3_EXECUTABLE /usr/gapps/GEOSX/thirdPartyLibs/python/lassen-gcc-python/python/bin/python3 CACHE PATH "") -# Fortran -set(CMAKE_Fortran_COMPILER /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran CACHE PATH "") -set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -mtune=power9" CACHE STRING "") -set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") -set(OpenMP_Fortran_FLAGS "-fopenmp" CACHE STRING "") -set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "") - # ATS set(ATS_ARGUMENTS "--ats jsrun_omp --ats jsrun_bind=packed" CACHE STRING "") diff --git a/host-configs/LLNL/lassen-clang-10-cuda-11.cmake b/host-configs/LLNL/lassen-clang-10-cuda-11.cmake index e0de78e26e..9c9ff7de26 100644 --- a/host-configs/LLNL/lassen-clang-10-cuda-11.cmake +++ b/host-configs/LLNL/lassen-clang-10-cuda-11.cmake @@ -1,9 +1,16 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-10-cuda-11.cmake) +# Fortran +set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2023.06.28/xlf/16.1.1/bin/xlf CACHE PATH "") +set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -qarch=pwr9 -qtune=pwr9" CACHE STRING "") +set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") +set(OpenMP_Fortran_FLAGS "-qsmp=omp" CACHE STRING "") +set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "") + # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1 CACHE PATH "") set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0/bin/mpifort CACHE PATH "") include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake) -set(ENABLE_CUDA_NVTOOLSEXT OFF CACHE BOOL "") \ No newline at end of file +set(ENABLE_CUDA_NVTOOLSEXT ON CACHE BOOL "") \ No newline at end of file diff --git a/host-configs/LLNL/lassen-clang-13-cuda-11.cmake b/host-configs/LLNL/lassen-clang-13-cuda-11.cmake index 869245a979..c57f0014e5 100644 --- a/host-configs/LLNL/lassen-clang-13-cuda-11.cmake +++ b/host-configs/LLNL/lassen-clang-13-cuda-11.cmake @@ -1,5 +1,12 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-13-cuda-11.cmake) +# Fortran +set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2023.06.28/xlf/16.1.1/bin/xlf CACHE PATH "") +set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -qarch=pwr9 -qtune=pwr9" CACHE STRING "") +set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") +set(OpenMP_Fortran_FLAGS "-qsmp=omp" CACHE STRING "") +set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "") + # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-13.0.1-gcc-8.3.1 CACHE PATH "") set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0/bin/mpifort CACHE PATH "") diff --git a/host-configs/LLNL/lassen-clang-13-cuda-12.cmake b/host-configs/LLNL/lassen-clang-13-cuda-12.cmake index b2183c8c63..5129a2f4e3 100644 --- a/host-configs/LLNL/lassen-clang-13-cuda-12.cmake +++ b/host-configs/LLNL/lassen-clang-13-cuda-12.cmake @@ -1,5 +1,12 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-13-cuda-12.cmake) +# Fortran +set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2023.06.28/xlf/16.1.1/bin/xlf CACHE PATH "") +set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -mtune=power9" CACHE STRING "") +set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") +set(OpenMP_Fortran_FLAGS "-fopenmp" CACHE STRING "") +set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "") + # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-13.0.1-gcc-8.3.1/ CACHE PATH "") set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1/bin/mpifort CACHE PATH "") diff --git a/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake b/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake index af58f9632e..3e9fd6783d 100644 --- a/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake +++ b/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake @@ -5,8 +5,15 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE) set(CMAKE_CUDA_FLAGS_RELEASE "-O3 -DNDEBUG -Xcompiler -DNDEBUG -Xcompiler -O3" CACHE STRING "" FORCE) +# Fortran +set(CMAKE_Fortran_COMPILER /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran CACHE PATH "") +set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=power9 -mtune=power9" CACHE STRING "") +set(FORTRAN_MANGLE_NO_UNDERSCORE OFF CACHE BOOL "") + # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1 CACHE PATH "") set(MPI_Fortran_COMPILER ${MPI_HOME}/bin/mpifort CACHE PATH "") +set(ENABLE_CUDA_NVTOOLSEXT ON CACHE BOOL "") + include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake) From c3460b99e553bdfb65ee1178a16aedf359689c09 Mon Sep 17 00:00:00 2001 From: "Randolph R. Settgast" Date: Tue, 10 Dec 2024 19:20:29 -0800 Subject: [PATCH 6/8] use gcc again --- host-configs/LLNL/lassen-clang-13-cuda-12.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host-configs/LLNL/lassen-clang-13-cuda-12.cmake b/host-configs/LLNL/lassen-clang-13-cuda-12.cmake index 5129a2f4e3..14ee23d0c8 100644 --- a/host-configs/LLNL/lassen-clang-13-cuda-12.cmake +++ b/host-configs/LLNL/lassen-clang-13-cuda-12.cmake @@ -1,7 +1,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-13-cuda-12.cmake) # Fortran -set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2023.06.28/xlf/16.1.1/bin/xlf CACHE PATH "") +set(CMAKE_Fortran_COMPILER /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran CACHE PATH "") set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -mtune=power9" CACHE STRING "") set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") set(OpenMP_Fortran_FLAGS "-fopenmp" CACHE STRING "") From d1f559f73339dcd3c96e95681f4277fe050f9acd Mon Sep 17 00:00:00 2001 From: "Randolph R. Settgast" Date: Tue, 10 Dec 2024 20:53:39 -0800 Subject: [PATCH 7/8] update LvArray for lc path. udpate GEOS_TPL_TAG --- .devcontainer/devcontainer.json | 2 +- src/coreComponents/LvArray | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1eb229015c..28ba75bfd2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "288-578" + "GEOS_TPL_TAG": "288-584" } }, "runArgs": [ diff --git a/src/coreComponents/LvArray b/src/coreComponents/LvArray index 9b1c004949..54269d04e3 160000 --- a/src/coreComponents/LvArray +++ b/src/coreComponents/LvArray @@ -1 +1 @@ -Subproject commit 9b1c00494974c73ff38f8590f010f624efe9964c +Subproject commit 54269d04e3e7760f1e4231cd1f9e31fbc54a5799 From c9ae4645cff10b3bf24acb09483a1ba6b79310cc Mon Sep 17 00:00:00 2001 From: Matteo Cusini Date: Wed, 11 Dec 2024 09:42:59 -0800 Subject: [PATCH 8/8] update submodule. --- src/coreComponents/LvArray | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreComponents/LvArray b/src/coreComponents/LvArray index 54269d04e3..00e3ead670 160000 --- a/src/coreComponents/LvArray +++ b/src/coreComponents/LvArray @@ -1 +1 @@ -Subproject commit 54269d04e3e7760f1e4231cd1f9e31fbc54a5799 +Subproject commit 00e3ead67060d3c3d4b8291d8e4abbf680b87eb3