Skip to content

Commit c8174b9

Browse files
rrsettgastrrsettgast
committed
GEOSX_ to GEOS_
1 parent 849b677 commit c8174b9

File tree

115 files changed

+409
-409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+409
-409
lines changed

‎host-configs/LBL/[email protected]‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ set(MPI_Fortran_COMPILER ${MPI_HOME}/bin/mpifort CACHE PATH "")
2424
set(MPIEXEC /usr/bin/srun CACHE PATH "")
2525
set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "")
2626

27-
set(GEOSX_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-gcc\@8.1.0-release-24-07-20" CACHE PATH "" )
27+
set(GEOS_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-gcc\@8.1.0-release-24-07-20" CACHE PATH "" )
2828

2929

30-
set(GEOSX_LINK_PREPEND_FLAG "-Wl,--whole-archive" CACHE STRING "" FORCE)
31-
set(GEOSX_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
30+
set(GEOS_LINK_PREPEND_FLAG "-Wl,--whole-archive" CACHE STRING "" FORCE)
31+
set(GEOS_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
3232

3333
set(ENABLE_SPHINX_EXECUTABLE OFF CACHE BOOL "")
3434
set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "")

‎host-configs/LBL/cori-intel.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ set(MPI_Fortran_COMPILER "ftn" CACHE PATH "" FORCE)
2424
set(MPIEXEC "/usr/bin/srun" CACHE PATH "")
2525
set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "")
2626

27-
set(GEOSX_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-intel-release-22-07-20" CACHE PATH "" )
27+
set(GEOS_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-intel-release-22-07-20" CACHE PATH "" )
2828

29-
set(GEOSX_LINK_PREPEND_FLAG "-Wl,--whole-archive" CACHE STRING "" FORCE)
30-
set(GEOSX_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
29+
set(GEOS_LINK_PREPEND_FLAG "-Wl,--whole-archive" CACHE STRING "" FORCE)
30+
set(GEOS_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
3131

3232
set(ENABLE_SPHINX_EXECUTABLE OFF CACHE BOOL "")
3333
set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "")

‎host-configs/LLNL/lassen-base.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#
88
###############################################################################
99

10-
set( GEOSX_BUILD_SHARED_LIBS ON CACHE BOOL "" )
11-
set( GEOSX_BUILD_OBJ_LIBS OFF CACHE BOOL "" )
10+
set( GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" )
11+
set( GEOS_BUILD_OBJ_LIBS OFF CACHE BOOL "" )
1212
# Fortran
1313
set(ENABLE_FORTRAN OFF CACHE BOOL "")
1414

@@ -54,7 +54,7 @@ if( ${ENABLE_HYPRE_DEVICE} STREQUAL "HIP" OR ${ENABLE_HYPRE_DEVICE} STREQUAL "CU
5454
set(ENABLE_TRILINOS OFF CACHE BOOL "" FORCE )
5555
else()
5656
set(ENABLE_HYPRE OFF CACHE BOOL "" FORCE )
57-
set(GEOSX_LA_INTERFACE "Trilinos" CACHE STRING "" FORCE )
57+
set(GEOS_LA_INTERFACE "Trilinos" CACHE STRING "" FORCE )
5858
endif()
5959

6060
# Documentation

‎host-configs/LLNL/tioga-base.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set( CAMP_STANDALONE TRUE CACHE BOOL "" )
1919
set( ENABLE_ROCM ON CACHE BOOL "" FORCE )
2020
set( ROCM_ROOT "${HIP_ROOT}" CACHE PATH "" )
2121

22-
set( GEOSX_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
22+
set( GEOS_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
2323
set( ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "" )
2424
set( gtest_disable_pthreads ON CACHE BOOL "" )
2525

‎host-configs/LLNL/tioga-cce-15.cmake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/tioga-cce-15.cmake)
22
include(${CMAKE_CURRENT_LIST_DIR}/tioga-base.cmake)
33

4-
set( CONDUIT_DIR "${GEOSX_TPL_DIR}/conduit-0.8.7" CACHE PATH "" )
5-
set( HDF5_DIR "${GEOSX_TPL_DIR}/hdf5-1.14.1-2" CACHE PATH "" )
4+
set( CONDUIT_DIR "${GEOS_TPL_DIR}/conduit-0.8.7" CACHE PATH "" )
5+
set( HDF5_DIR "${GEOS_TPL_DIR}/hdf5-1.14.1-2" CACHE PATH "" )
66

77
set( BLAS_DIR "/opt/rocm-5.4.3/" CACHE PATH "" )
88

9-
set( PUGIXML_DIR "${GEOSX_TPL_DIR}/pugixml-1.13" CACHE PATH "" )
10-
set( FMT_DIR "${GEOSX_TPL_DIR}/fmt-10.0.0" CACHE PATH "" )
11-
set( SUITESPARSE_DIR "${GEOSX_TPL_DIR}/suite-sparse-5.10.1" CACHE PATH "" )
9+
set( PUGIXML_DIR "${GEOS_TPL_DIR}/pugixml-1.13" CACHE PATH "" )
10+
set( FMT_DIR "${GEOS_TPL_DIR}/fmt-10.0.0" CACHE PATH "" )
11+
set( SUITESPARSE_DIR "${GEOS_TPL_DIR}/suite-sparse-5.10.1" CACHE PATH "" )
1212

1313
# HYPRE options
1414
set( ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "" )
1515
set( ENABLE_HYPRE_MIXINT FALSE CACHE STRING "" )
16-
set( HYPRE_DIR "${GEOSX_TPL_DIR}/hypre-develop" CACHE PATH "" )
16+
set( HYPRE_DIR "${GEOS_TPL_DIR}/hypre-develop" CACHE PATH "" )
1717

1818
set( ENABLE_CALIPER ON CACHE BOOL "" FORCE )
19-
set( CALIPER_DIR "${GEOSX_TPL_DIR}/caliper-2.8.0" CACHE PATH "" )
19+
set( CALIPER_DIR "${GEOS_TPL_DIR}/caliper-2.8.0" CACHE PATH "" )
2020

2121
# haven't build I/O TPLs on tioga yet
2222
set( ENABLE_SILO OFF CACHE BOOL "" FORCE )

‎host-configs/ORNL/[email protected]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set(ESSL_LIBRARIES /sw/ascent/essl/6.2.0-20190419/essl/6.2/lib64/libesslsmpcuda.
2121
/sw/ascent/xl/16.1.1-3/lib/libxlf90_r.so.1
2222
${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcublas.so
2323
${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcudart.so
24-
${GEOSX_TPL_ROOT_DIR}/liblapackforessl.a
24+
${GEOS_TPL_ROOT_DIR}/liblapackforessl.a
2525
/sw/ascent/xl/16.1.1-3/xlC/16.1.1/lib/libxl.a
2626
CACHE PATH "")
2727

‎host-configs/ORNL/frontier-base.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set( CAMP_STANDALONE TRUE CACHE BOOL "" )
1818
set( ENABLE_ROCM ON CACHE BOOL "" FORCE )
1919
set( ROCM_ROOT "${HIP_ROOT}" CACHE PATH "" )
2020

21-
set( GEOSX_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
21+
set( GEOS_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
2222

2323
set( ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "" )
2424
set( gtest_disable_pthreads ON CACHE BOOL "" )
@@ -31,8 +31,8 @@ set( ENABLE_DOCS OFF CACHE BOOL "" FORCE )
3131
set( ENABLE_SCOTCH OFF CACHE BOOL "" FORCE )
3232
set( ENABLE_SUPERLU_DIST OFF CACHE BOOL "" FORCE )
3333

34-
set( GEOSX_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE )
35-
set( GEOSX_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
34+
set( GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE )
35+
set( GEOS_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
3636

3737
set( CMAKE_CXX_STANDARD 17 CACHE STRING "" )
3838
set( BLT_CXX_STD c++17 CACHE STRING "" )

‎host-configs/ORNL/[email protected]‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ set(CCE_VERSION 15.0.0)
33
include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/ORNL/frontier-cce@${CCE_VERSION}.cmake)
44
include(${CMAKE_CURRENT_LIST_DIR}/frontier-base.cmake)
55

6-
set( CONDUIT_DIR "${GEOSX_TPL_DIR}/conduit-0.8.7" CACHE PATH "" )
7-
set( HDF5_DIR "${GEOSX_TPL_DIR}/hdf5-1.12.2" CACHE PATH "" )
6+
set( CONDUIT_DIR "${GEOS_TPL_DIR}/conduit-0.8.7" CACHE PATH "" )
7+
set( HDF5_DIR "${GEOS_TPL_DIR}/hdf5-1.12.2" CACHE PATH "" )
88

99
set( ENABLE_SILO FALSE CACHE BOOL "" )
1010
set( ENABLE_VTK FALSE CACHE BOOL "" )
1111

1212
set( BLAS_DIR "/opt/rocm-${ROCM_VERSION}/" CACHE PATH "" )
1313

14-
set( PUGIXML_DIR "${GEOSX_TPL_DIR}/pugixml-1.11.4" CACHE PATH "" )
15-
set( FMT_DIR "${GEOSX_TPL_DIR}/fmt-8.0.1" CACHE PATH "" )
16-
set( SUITESPARSE_DIR "${GEOSX_TPL_DIR}/suite-sparse-5.10.1" CACHE PATH "" )
14+
set( PUGIXML_DIR "${GEOS_TPL_DIR}/pugixml-1.11.4" CACHE PATH "" )
15+
set( FMT_DIR "${GEOS_TPL_DIR}/fmt-8.0.1" CACHE PATH "" )
16+
set( SUITESPARSE_DIR "${GEOS_TPL_DIR}/suite-sparse-5.10.1" CACHE PATH "" )
1717

1818
# HYPRE options
1919
set( ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "" )
@@ -22,4 +22,4 @@ set( ENABLE_HYPRE_MIXINT TRUE CACHE STRING "" )
2222
set( HYPRE_DIR "/lustre/orion/geo127/world-shared/hypre/hypre_v2.27.0-218-ge2806c33d_cce-15.0.0_rocm-5.4.3_mixint_umpire-2022.03.0_caliper-2.8.0_rel/" CACHE PATH "" )
2323

2424
set( ENABLE_CALIPER ON CACHE BOOL "" FORCE )
25-
set( CALIPER_DIR "${GEOSX_TPL_DIR}/caliper-2.8.0" CACHE PATH "" )
25+
set( CALIPER_DIR "${GEOS_TPL_DIR}/caliper-2.8.0" CACHE PATH "" )

‎host-configs/Stanford/sherlock-base.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ set(ENABLE_CALIPER ON CACHE BOOL "")
4343
if( ${ENABLE_HYPRE_DEVICE} STREQUAL "CUDA" )
4444
set(ENABLE_PETSC OFF CACHE BOOL "")
4545
set(ENABLE_TRILINOS OFF CACHE BOOL "")
46-
set(GEOSX_LA_INTERFACE "Hypre" CACHE STRING "")
46+
set(GEOS_LA_INTERFACE "Hypre" CACHE STRING "")
4747
endif()
4848

49-
set(GEOSX_TPL_DIR /home/groups/tchelepi/geosx/thirdPartyLibs/install-${CONFIG_NAME}-release CACHE PATH "")
49+
set(GEOS_TPL_DIR /home/groups/tchelepi/geosx/thirdPartyLibs/install-${CONFIG_NAME}-release CACHE PATH "")
5050
include(/home/groups/tchelepi/geosx/GEOSX/host-configs/tpls.cmake)

‎host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10-cuda11.5.0-sm80.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" C
2121
set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "")
2222

2323
# LAI options
24-
set(GEOSX_LA_INTERFACE "Hypre" CACHE STRING "" FORCE)
24+
set(GEOS_LA_INTERFACE "Hypre" CACHE STRING "" FORCE)
2525
set(ENABLE_HYPRE ON CACHE BOOL "" FORCE)
2626
set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "" FORCE)
2727
set(ENABLE_PETSC OFF CACHE BOOL "" FORCE)

0 commit comments

Comments
 (0)