chore: Change GEOSX to GEOS in a bunch of places

.github/workflows/build_and_test.yml

@@ -140,12 +140,12 @@ jobs:
 
         COMMIT=${{ github.event.pull_request.head.sha }}
         SHORT_COMMIT=${COMMIT:0:7}
-        script_args+=(--install-dir-basename GEOSX-${SHORT_COMMIT})
+        script_args+=(--install-dir-basename GEOS-${SHORT_COMMIT})
 
         # All the data exchanged with the docker container is eventually meant to be sent to the cloud. 
         if [[ ! -z "${{ inputs.GCP_BUCKET }}" ]]; then
           if [ "${{ inputs.BUILD_TYPE }}" = "build" ]; then
-            DATA_BASENAME=GEOSX-and-TPL-${SHORT_COMMIT}.tar.gz
+            DATA_BASENAME=GEOS-and-TPL-${SHORT_COMMIT}.tar.gz
           elif [ "${{ inputs.BUILD_TYPE }}" = "integrated_tests" ]; then
             DATA_BASENAME=integratedTests-pr${{ github.event.number }}-${{ github.run_number }}-${SHORT_COMMIT}.tar.gz
             script_args+=(--run-integrated-tests)

COPYRIGHT

@@ -1,19 +1,20 @@
 Intellectual Property Notice
 ----------------------------
-GEOSX is licensed under the GNU Lesser General Public License, Version 2.1.
+GEOS is licensed under the GNU Lesser General Public License, Version 2.1.
 See the toplevel LICENSE file for details.
 
-Copyrights and patents in the GEOSX project are retained by individual
-contributors. The following copyright applies to each file in the GEOSX
+Copyrights and patents in the GEOS project are retained by individual
+contributors. The following copyright applies to each file in the GEOS
 distribution, unless otherwise stated in the file:
 
- * Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
- * Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2018-2020 TotalEnergies
- * Copyright (c) 2019-     GEOSX Contributors
+ * Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
+ * Copyright (c) 2018-2024 Total, S.A
+ * Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
+ * Copyright (c) 2018-2024 Chevron 
+ * Copyright (c) 2019-     GEOS/GEOSX Contributors
  * All rights reserved
 
-No copyright assignment is required to contribute to GEOSX.  See the
+No copyright assignment is required to contribute to GEOS.  See the
 toplevel CONTRIBUTORS file for a list of contributors.
 
 

examples/ObjectCatalog/Base.hpp

@@ -2,10 +2,11 @@
  * ------------------------------------------------------------------------------------------------------------
  * SPDX-License-Identifier: LGPL-2.1-only
  *
- * Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
- * Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2018-2020 Total, S.A
- * Copyright (c) 2019-     GEOSX Contributors
+ * Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
+ * Copyright (c) 2018-2024 Total, S.A
+ * Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
+ * Copyright (c) 2018-2024 Chevron 
+ * Copyright (c) 2019-     GEOS/GEOSX Contributors
  * All rights reserved
  *
  * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.

examples/ObjectCatalog/Derived1.cpp

@@ -2,10 +2,11 @@
  * ------------------------------------------------------------------------------------------------------------
  * SPDX-License-Identifier: LGPL-2.1-only
  *
- * Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
- * Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2018-2020 Total, S.A
- * Copyright (c) 2019-     GEOSX Contributors
+ * Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
+ * Copyright (c) 2018-2024 Total, S.A
+ * Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
+ * Copyright (c) 2018-2024 Chevron 
+ * Copyright (c) 2019-     GEOS/GEOSX Contributors
  * All rights reserved
  *
  * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.

examples/ObjectCatalog/Derived1.hpp

@@ -2,10 +2,11 @@
  * ------------------------------------------------------------------------------------------------------------
  * SPDX-License-Identifier: LGPL-2.1-only
  *
- * Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
- * Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2018-2020 Total, S.A
- * Copyright (c) 2019-     GEOSX Contributors
+ * Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
+ * Copyright (c) 2018-2024 Total, S.A
+ * Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
+ * Copyright (c) 2018-2024 Chevron 
+ * Copyright (c) 2019-     GEOS/GEOSX Contributors
  * All rights reserved
  *
  * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.

examples/ObjectCatalog/Derived2.cpp

@@ -11,6 +11,7 @@
  * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.
  * ------------------------------------------------------------------------------------------------------------
  */
+
 #include "Derived2.hpp"
 
 

examples/ObjectCatalog/Derived2.hpp

@@ -2,10 +2,11 @@
  * ------------------------------------------------------------------------------------------------------------
  * SPDX-License-Identifier: LGPL-2.1-only
  *
- * Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
- * Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2018-2020 Total, S.A
- * Copyright (c) 2019-     GEOSX Contributors
+ * Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
+ * Copyright (c) 2018-2024 Total, S.A
+ * Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
+ * Copyright (c) 2018-2024 Chevron 
+ * Copyright (c) 2019-     GEOS/GEOSX Contributors
  * All rights reserved
  *
  * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.

examples/ObjectCatalog/main.cpp

@@ -2,10 +2,11 @@
  * ------------------------------------------------------------------------------------------------------------
  * SPDX-License-Identifier: LGPL-2.1-only
  *
- * Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
- * Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
- * Copyright (c) 2018-2020 Total, S.A
- * Copyright (c) 2019-     GEOSX Contributors
+ * Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
+ * Copyright (c) 2018-2024 Total, S.A
+ * Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
+ * Copyright (c) 2018-2024 Chevron 
+ * Copyright (c) 2019-     GEOS/GEOSX Contributors
  * All rights reserved
  *
  * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.

host-configs/LBL/cori-gcc@8.1.0.cmake

@@ -24,11 +24,11 @@ set(MPI_Fortran_COMPILER ${MPI_HOME}/bin/mpifort CACHE PATH "")
 set(MPIEXEC              /usr/bin/srun CACHE PATH "")
 set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "")
 
-set(GEOSX_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-gcc\@8.1.0-release-24-07-20" CACHE PATH "" )
+set(GEOS_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-gcc\@8.1.0-release-24-07-20" CACHE PATH "" )
 
 
-set(GEOSX_LINK_PREPEND_FLAG  "-Wl,--whole-archive"    CACHE STRING "" FORCE)
-set(GEOSX_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
+set(GEOS_LINK_PREPEND_FLAG  "-Wl,--whole-archive"    CACHE STRING "" FORCE)
+set(GEOS_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
 
 set(ENABLE_SPHINX_EXECUTABLE OFF CACHE BOOL "")
 set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "")

host-configs/LBL/cori-intel.cmake

@@ -24,10 +24,10 @@ set(MPI_Fortran_COMPILER "ftn" CACHE PATH "" FORCE)
 set(MPIEXEC              "/usr/bin/srun" CACHE PATH "")
 set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "")
 
-set(GEOSX_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-intel-release-22-07-20" CACHE PATH "" )
+set(GEOS_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-intel-release-22-07-20" CACHE PATH "" )
 
-set(GEOSX_LINK_PREPEND_FLAG  "-Wl,--whole-archive"    CACHE STRING "" FORCE)
-set(GEOSX_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
+set(GEOS_LINK_PREPEND_FLAG  "-Wl,--whole-archive"    CACHE STRING "" FORCE)
+set(GEOS_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
 
 set(ENABLE_SPHINX_EXECUTABLE OFF CACHE BOOL "")
 set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "")

host-configs/LLNL/lassen-base.cmake

@@ -7,8 +7,8 @@
 #
 ###############################################################################
 
-set( GEOSX_BUILD_SHARED_LIBS ON CACHE BOOL "" )
-set( GEOSX_BUILD_OBJ_LIBS OFF CACHE BOOL "" )
+set( GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" )
+set( GEOS_BUILD_OBJ_LIBS OFF CACHE BOOL "" )
 # Fortran
 set(ENABLE_FORTRAN OFF CACHE BOOL "")
 
@@ -54,7 +54,7 @@ if( ${ENABLE_HYPRE_DEVICE} STREQUAL "HIP" OR ${ENABLE_HYPRE_DEVICE} STREQUAL "CU
     set(ENABLE_TRILINOS OFF CACHE BOOL "" FORCE )
 else()
     set(ENABLE_HYPRE OFF CACHE BOOL "" FORCE )
-    set(GEOSX_LA_INTERFACE "Trilinos" CACHE STRING "" FORCE )
+    set(GEOS_LA_INTERFACE "Trilinos" CACHE STRING "" FORCE )
 endif()
 
 # Documentation

host-configs/LLNL/tioga-base.cmake

@@ -19,7 +19,7 @@ set( CAMP_STANDALONE TRUE CACHE BOOL "" )
 set( ENABLE_ROCM ON CACHE BOOL "" FORCE )
 set( ROCM_ROOT "${HIP_ROOT}" CACHE PATH "" )
 
-set( GEOSX_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
+set( GEOS_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
 set( ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "" )
 set( gtest_disable_pthreads ON CACHE BOOL "" )
 

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

@@ -1,22 +1,22 @@
 include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/tioga-cce-15.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/tioga-base.cmake)
 
-set( CONDUIT_DIR "${GEOSX_TPL_DIR}/conduit-0.8.7" CACHE PATH "" )
-set( HDF5_DIR "${GEOSX_TPL_DIR}/hdf5-1.14.1-2" CACHE PATH "" )
+set( CONDUIT_DIR "${GEOS_TPL_DIR}/conduit-0.8.7" CACHE PATH "" )
+set( HDF5_DIR "${GEOS_TPL_DIR}/hdf5-1.14.1-2" CACHE PATH "" )
 
 set( BLAS_DIR "/opt/rocm-5.4.3/" CACHE PATH "" )
 
-set( PUGIXML_DIR "${GEOSX_TPL_DIR}/pugixml-1.13" CACHE PATH "" )
-set( FMT_DIR "${GEOSX_TPL_DIR}/fmt-10.0.0" CACHE PATH "" )
-set( SUITESPARSE_DIR "${GEOSX_TPL_DIR}/suite-sparse-5.10.1" CACHE PATH "" )
+set( PUGIXML_DIR "${GEOS_TPL_DIR}/pugixml-1.13" CACHE PATH "" )
+set( FMT_DIR "${GEOS_TPL_DIR}/fmt-10.0.0" CACHE PATH "" )
+set( SUITESPARSE_DIR "${GEOS_TPL_DIR}/suite-sparse-5.10.1" CACHE PATH "" )
 
 # HYPRE options
 set( ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "" )
 set( ENABLE_HYPRE_MIXINT FALSE CACHE STRING "" )
-set( HYPRE_DIR "${GEOSX_TPL_DIR}/hypre-develop" CACHE PATH "" )
+set( HYPRE_DIR "${GEOS_TPL_DIR}/hypre-develop" CACHE PATH "" )
 
 set( ENABLE_CALIPER ON CACHE BOOL "" FORCE )
-set( CALIPER_DIR "${GEOSX_TPL_DIR}/caliper-2.8.0" CACHE PATH "" )
+set( CALIPER_DIR "${GEOS_TPL_DIR}/caliper-2.8.0" CACHE PATH "" )
 
 # haven't build I/O TPLs on tioga yet
 set( ENABLE_SILO OFF CACHE BOOL "" FORCE )

host-configs/ORNL/ascent-gcc@8.1.1.cmake

@@ -21,7 +21,7 @@ set(ESSL_LIBRARIES /sw/ascent/essl/6.2.0-20190419/essl/6.2/lib64/libesslsmpcuda.
                    /sw/ascent/xl/16.1.1-3/lib/libxlf90_r.so.1
                    ${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcublas.so
                    ${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcudart.so
-		   ${GEOSX_TPL_ROOT_DIR}/liblapackforessl.a
+		   ${GEOS_TPL_ROOT_DIR}/liblapackforessl.a
                    /sw/ascent/xl/16.1.1-3/xlC/16.1.1/lib/libxl.a
                    CACHE PATH "")
 

host-configs/ORNL/frontier-base.cmake

@@ -18,7 +18,7 @@ set( CAMP_STANDALONE TRUE CACHE BOOL "" )
 set( ENABLE_ROCM ON CACHE BOOL "" FORCE )
 set( ROCM_ROOT "${HIP_ROOT}" CACHE PATH "" )
 
-set( GEOSX_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
+set( GEOS_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
 
 set( ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "" )
 set( gtest_disable_pthreads ON CACHE BOOL "" )
@@ -31,8 +31,8 @@ set( ENABLE_DOCS OFF CACHE BOOL "" FORCE )
 set( ENABLE_SCOTCH OFF CACHE BOOL "" FORCE )
 set( ENABLE_SUPERLU_DIST OFF CACHE BOOL "" FORCE )
 
-set( GEOSX_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE )
-set( GEOSX_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
+set( GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE )
+set( GEOS_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
 
 set( CMAKE_CXX_STANDARD 17 CACHE STRING "" )
 set( BLT_CXX_STD c++17 CACHE STRING "" )

host-configs/ORNL/frontier-cce@15.0.0.cmake

@@ -3,17 +3,17 @@ set(CCE_VERSION 15.0.0)
 include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/ORNL/frontier-cce@${CCE_VERSION}.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/frontier-base.cmake)
 
-set( CONDUIT_DIR "${GEOSX_TPL_DIR}/conduit-0.8.7" CACHE PATH "" )
-set( HDF5_DIR "${GEOSX_TPL_DIR}/hdf5-1.12.2" CACHE PATH "" )
+set( CONDUIT_DIR "${GEOS_TPL_DIR}/conduit-0.8.7" CACHE PATH "" )
+set( HDF5_DIR "${GEOS_TPL_DIR}/hdf5-1.12.2" CACHE PATH "" )
 
 set( ENABLE_SILO FALSE CACHE BOOL "" )
 set( ENABLE_VTK FALSE CACHE BOOL "" )
 
 set( BLAS_DIR "/opt/rocm-${ROCM_VERSION}/" CACHE PATH "" )
 
-set( PUGIXML_DIR "${GEOSX_TPL_DIR}/pugixml-1.11.4" CACHE PATH "" )
-set( FMT_DIR "${GEOSX_TPL_DIR}/fmt-8.0.1" CACHE PATH "" )
-set( SUITESPARSE_DIR "${GEOSX_TPL_DIR}/suite-sparse-5.10.1" CACHE PATH "" )
+set( PUGIXML_DIR "${GEOS_TPL_DIR}/pugixml-1.11.4" CACHE PATH "" )
+set( FMT_DIR "${GEOS_TPL_DIR}/fmt-8.0.1" CACHE PATH "" )
+set( SUITESPARSE_DIR "${GEOS_TPL_DIR}/suite-sparse-5.10.1" CACHE PATH "" )
 
 # HYPRE options
 set( ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "" )
@@ -22,4 +22,4 @@ set( ENABLE_HYPRE_MIXINT TRUE CACHE STRING "" )
 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 "" )
 
 set( ENABLE_CALIPER ON CACHE BOOL "" FORCE )
-set( CALIPER_DIR "${GEOSX_TPL_DIR}/caliper-2.8.0" CACHE PATH "" )
+set( CALIPER_DIR "${GEOS_TPL_DIR}/caliper-2.8.0" CACHE PATH "" )

host-configs/Stanford/sherlock-base.cmake

@@ -43,8 +43,8 @@ set(ENABLE_CALIPER ON CACHE BOOL "")
 if( ${ENABLE_HYPRE_DEVICE} STREQUAL "CUDA" )
   set(ENABLE_PETSC OFF CACHE BOOL "")
   set(ENABLE_TRILINOS OFF CACHE BOOL "")
-  set(GEOSX_LA_INTERFACE "Hypre" CACHE STRING "")
+  set(GEOS_LA_INTERFACE "Hypre" CACHE STRING "")
 endif()
 
-set(GEOSX_TPL_DIR /home/groups/tchelepi/geosx/thirdPartyLibs/install-${CONFIG_NAME}-release CACHE PATH "")
+set(GEOS_TPL_DIR /home/groups/tchelepi/geosx/thirdPartyLibs/install-${CONFIG_NAME}-release CACHE PATH "")
 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

@@ -21,7 +21,7 @@ set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" C
 set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "")
 
 # LAI options
-set(GEOSX_LA_INTERFACE "Hypre" CACHE STRING "" FORCE)
+set(GEOS_LA_INTERFACE "Hypre" CACHE STRING "" FORCE)
 set(ENABLE_HYPRE ON CACHE BOOL "" FORCE)
 set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "" FORCE)
 set(ENABLE_PETSC OFF CACHE BOOL "" FORCE)

host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10-cuda11.7.1-sm70.cmake

@@ -21,7 +21,7 @@ set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" C
 set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "")
 
 # LAI options
-set(GEOSX_LA_INTERFACE "Hypre" CACHE STRING "" FORCE)
+set(GEOS_LA_INTERFACE "Hypre" CACHE STRING "" FORCE)
 set(ENABLE_HYPRE ON CACHE BOOL "" FORCE)
 set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "" FORCE)
 set(ENABLE_PETSC OFF CACHE BOOL "" FORCE)

host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake

@@ -40,5 +40,5 @@ set(LAPACK_LIBRARIES "${OPENBLAS_ROOT}/lib/libopenblas.so" CACHE STRING "")
 set(ENABLE_VALGRIND OFF CACHE BOOL "")
 set(ENABLE_CALIPER ON CACHE BOOL "")
 
-set(GEOSX_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE)
+set(GEOS_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE)
 include(${CMAKE_CURRENT_LIST_DIR}/../tpls.cmake)

host-configs/TOTAL/pangea3-gcc8.4.1-openmpi-4.1.2.cmake

@@ -4,9 +4,9 @@
 set(CONFIG_NAME "pangea3-gcc8.4.1-ompi-4.1.2" CACHE PATH "")
 
 # Set up the tpls
-set(GEOSX_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE)
-if (NOT DEFINED GEOSX_TPL_DIR)
-  message(FATAL_ERROR "You must set GEOSX_TPL_DIR with -D GEOSX_TPL_DIR=")
+set(GEOS_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE)
+if (NOT DEFINED GEOS_TPL_DIR)
+  message(FATAL_ERROR "You must set GEOS_TPL_DIR with -D GEOS_TPL_DIR=")
 endif ()
 
 
@@ -77,7 +77,7 @@ set(ENABLE_MATHPRESSO OFF CACHE BOOL "")
 # Silo configure script doesn't recognize systype
 set(SILO_BUILD_TYPE powerpc64-unknown-linux-gnu CACHE STRING "")
 
-set(GEOSX_BUILD_SHARED_LIBS OFF CACHE BOOL "")
+set(GEOS_BUILD_SHARED_LIBS OFF CACHE BOOL "")
 set(ENABLE_PVTPackage ON CACHE BOOL "")
 
 set(ENABLE_CALIPER ON CACHE BOOL "")
@@ -98,7 +98,7 @@ endif()
 
 set(ENABLE_DOXYGEN OFF CACHE PATH "")
 
-set(PETSC_OMP_DIR ${GEOSX_TPL_ROOT_DIR}/omp-links-for-petsc CACHE STRING "")
+set(PETSC_OMP_DIR ${GEOS_TPL_ROOT_DIR}/omp-links-for-petsc CACHE STRING "")
 
 # PETSc doesn't seem to work correctly with clang.
 set(ENABLE_PETSC OFF CACHE BOOL "")

host-configs/TOTAL/pecan-CPU.cmake

@@ -21,7 +21,7 @@ set(ENABLE_HYPRE ON CACHE BOOL "" FORCE )
 set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "" FORCE)
 set(ENABLE_CALIPER ON CACHE BOOL "")
 
-set(ENABLE_GEOSX_PTP ON CACHE BOOL "" FORCE)
+set(ENABLE_GEOS_PTP ON CACHE BOOL "" FORCE)
 
 set(ENABLE_MKL ON CACHE BOOL "")
 set(INTEL_ROOT "/apps/intel/2019/u5/compilers_and_libraries_2019.5.281/linux" )
@@ -33,5 +33,5 @@ set(MKL_LIBRARIES ${MKL_ROOT}/lib/intel64/libmkl_intel_lp64.so
                   ${INTEL_ROOT}/compiler/lib/intel64_lin/libiomp5.so
                   CACHE STRING "")
 
-set(GEOSX_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE)
+set(GEOS_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE)
 include(${CMAKE_CURRENT_LIST_DIR}/../tpls.cmake)

host-configs/apple/darwin-clang.cmake

@@ -20,7 +20,7 @@ set(ENABLE_OPENMP "OFF" CACHE PATH "" FORCE)
 
 set(ENABLE_CALIPER "OFF" CACHE PATH "" FORCE )
 
-#set(GEOSX_BUILD_OBJ_LIBS ON CACHE BOOL "" FORCE)
+#set(GEOS_BUILD_OBJ_LIBS ON CACHE BOOL "" FORCE)
 
 set( BLAS_LIBRARIES /usr/local/opt/openblas/lib/libblas.dylib CACHE PATH "" FORCE )
 set( LAPACK_LIBRARIES /usr/local/opt/openblas/lib/liblapack.dylib CACHE PATH "" FORCE )
@@ -30,9 +30,9 @@ set(ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE)
 #set( DOXYGEN_EXECUTABLE /usr/local/bin/doxygen CACHE PATH "" FORCE )
 #set( SPHINX_EXECUTABLE /usr/local/bin/sphinx-build CACHE PATH "" FORCE )
 
-set(GEOSX_TPL_DIR "/usr/local/GEOSX/GEOSX_TPL" CACHE PATH "" FORCE )
-if(NOT ( EXISTS "${GEOSX_TPL_DIR}" AND IS_DIRECTORY "${GEOSX_TPL_DIR}" ) )
-    set(GEOSX_TPL_DIR "${CMAKE_SOURCE_DIR}/../../thirdPartyLibs/install-darwin-clang-release" CACHE PATH "" FORCE )
+set(GEOS_TPL_DIR "/usr/local/GEOSX/GEOS_TPL" CACHE PATH "" FORCE )
+if(NOT ( EXISTS "${GEOS_TPL_DIR}" AND IS_DIRECTORY "${GEOS_TPL_DIR}" ) )
+    set(GEOS_TPL_DIR "${CMAKE_SOURCE_DIR}/../../thirdPartyLibs/install-darwin-clang-release" CACHE PATH "" FORCE )
 endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/tpls.cmake)