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

remove RESQML support from GEOS #2969

Merged
merged 4 commits into from
Jun 12, 2024
Merged

remove RESQML support from GEOS #2969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7132ce3
remove RESQML support from GEOS
Jan 31, 2024
217f0e4
Merge branch 'develop' into fix/deleteFesapi
Jun 3, 2024
cf5650f
tpls tag
CusiniM Jun 11, 2024
619144d
Merge branch 'develop' into fix/deleteFesapi
CusiniM Jun 12, 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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"GEOS_TPL_TAG": "264-338"
"GEOS_TPL_TAG": "258-347"
}
},
"runArgs": [
Expand Down
1 change: 0 additions & 1 deletion host-configs/LLNL/lassen-base.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
2 changes: 0 additions & 2 deletions host-configs/LLNL/quartz-base.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions host-configs/tpls.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
18 changes: 0 additions & 18 deletions src/cmake/thirdparty/SetupGeosxThirdParty.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand Down