diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 4df342044e9..db4250aeb26 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "264-338" + "GEOS_TPL_TAG": "258-347" } }, "runArgs": [ diff --git a/host-configs/LLNL/lassen-base.cmake b/host-configs/LLNL/lassen-base.cmake index 72747c4f7d8..0aa8696dac3 100644 --- a/host-configs/LLNL/lassen-base.cmake +++ b/host-configs/LLNL/lassen-base.cmake @@ -43,7 +43,6 @@ set(ESSL_LIBRARIES /usr/tcetmp/packages/essl/essl-6.3.0.2/lib64/libesslsmpcuda.s # TPL set(ENABLE_PAPI OFF CACHE BOOL "") set(SILO_BUILD_TYPE powerpc64-unknown-linux-gnu CACHE STRING "") -set(ENABLE_FESAPI OFF CACHE BOOL "" FORCE) # GEOSX specific options set(ENABLE_PVTPackage ON CACHE BOOL "") diff --git a/host-configs/LLNL/quartz-base.cmake b/host-configs/LLNL/quartz-base.cmake index e01eb428fc4..5501677af1c 100644 --- a/host-configs/LLNL/quartz-base.cmake +++ b/host-configs/LLNL/quartz-base.cmake @@ -41,8 +41,6 @@ set(YAPF_EXECUTABLE /usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/pyt set(SPHINX_EXECUTABLE /usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/python/bin/sphinx-build CACHE PATH "" FORCE) -set(ENABLE_FESAPI OFF CACHE BOOL "" FORCE) - # caliper set(ENABLE_CALIPER ON CACHE BOOL "" FORCE) set(ENABLE_CALIPER_HYPRE ON CACHE BOOL "" FORCE) diff --git a/host-configs/tpls.cmake b/host-configs/tpls.cmake index e0a7b0f1146..239774a66db 100644 --- a/host-configs/tpls.cmake +++ b/host-configs/tpls.cmake @@ -56,10 +56,6 @@ if(EXISTS ${GEOSX_TPL_DIR}/fmt) set(FMT_DIR ${GEOSX_TPL_DIR}/fmt CACHE PATH "" FORCE) endif() -if(EXISTS ${GEOSX_TPL_DIR}/fesapi) - set(FESAPI_DIR ${GEOSX_TPL_DIR}/fesapi CACHE PATH "" FORCE) -endif() - # # Math TPLs # diff --git a/src/cmake/thirdparty/SetupGeosxThirdParty.cmake b/src/cmake/thirdparty/SetupGeosxThirdParty.cmake index 7706da01a5b..9fa1eab84c4 100644 --- a/src/cmake/thirdparty/SetupGeosxThirdParty.cmake +++ b/src/cmake/thirdparty/SetupGeosxThirdParty.cmake @@ -900,24 +900,6 @@ if(NOT ENABLE_${upper_LAI}) endif() option(GEOSX_LA_INTERFACE_${upper_LAI} "${upper_LAI} LA interface is selected" ON) -################################ -# Fesapi -################################ -# if(DEFINED FESAPI_DIR) -# message(STATUS "FESAPI_DIR = ${FESAPI_DIR}") - -# find_and_import(NAME FesapiCpp -# INCLUDE_DIRECTORIES ${FESAPI_DIR}/include -# LIBRARY_DIRECTORIES ${FESAPI_DIR}/lib -# HEADER fesapi/nsDefinitions.h -# LIBRARIES FesapiCpp -# DEPENDS hdf5) - -# set(FESAPI_DIR ON CACHE BOOL "") -# set(thirdPartyLibs ${thirdPartyLibs} FesapiCpp) -# else() - message(STATUS "Not using Fesapi") -# endif() message(STATUS "thirdPartyLibs = ${thirdPartyLibs}")