From 7132ce319a7bdcdff0d2ad5e8560bd2df2966724 Mon Sep 17 00:00:00 2001
From: Lionel Untereiner <lionel.untereiner@geosiris.com>
Date: Wed, 31 Jan 2024 11:08:28 +0100
Subject: [PATCH 1/2] remove RESQML support from GEOS

---
 host-configs/LLNL/lassen-base.cmake            |  1 -
 host-configs/LLNL/quartz-base.cmake            |  2 --
 host-configs/tpls.cmake                        |  4 ----
 .../thirdparty/SetupGeosxThirdParty.cmake      | 18 ------------------
 4 files changed, 25 deletions(-)

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 f5ff404044c..1d3855c7b30 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 08e605d79bf..cc9aa2c7f12 100644
--- a/host-configs/tpls.cmake
+++ b/host-configs/tpls.cmake
@@ -48,10 +48,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 e6ce967a316..463cd81f0bb 100644
--- a/src/cmake/thirdparty/SetupGeosxThirdParty.cmake
+++ b/src/cmake/thirdparty/SetupGeosxThirdParty.cmake
@@ -877,24 +877,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}")
 

From cf5650f9faf89ef694b3a44d72a4f04817bf1acd Mon Sep 17 00:00:00 2001
From: Matteo Cusini <49037133+CusiniM@users.noreply.github.com>
Date: Wed, 12 Jun 2024 00:05:23 +0100
Subject: [PATCH 2/2] tpls tag

---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index dda45adc958..db4250aeb26 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "GEOS_TPL_TAG": "263-252"
+            "GEOS_TPL_TAG": "258-347"
         }
     },
     "runArgs": [