From ef645a9e14a0b7273dc1269578e2526870afa720 Mon Sep 17 00:00:00 2001 From: Sushma Yellapragada Date: Mon, 22 Jun 2026 19:05:29 -0500 Subject: [PATCH 1/3] Remove PVTPackage submodule from .gitmodules Removed submodule entry for PVTPackage since the documentation says we don't need it anymore - https://geosx-geosx.readthedocs-hosted.com/en/latest/docs/sphinx/QuickStart.html#download Fixes #4089 --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 59e5fe8aebf..bfdd57bbd4a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "src/cmake/blt"] path = src/cmake/blt url = ../../LLNL/blt.git -[submodule "src/coreComponents/constitutive/PVTPackage"] - path = src/coreComponents/constitutive/PVTPackage - url = ../../GEOS-DEV/PVTPackage.git [submodule "src/coreComponents/fileIO/coupling/hdf5_interface"] path = src/coreComponents/fileIO/coupling/hdf5_interface url = ../../GEOS-DEV/hdf5_interface.git From 4b263ae4d483d78248c0db65623b1953e85204c0 Mon Sep 17 00:00:00 2001 From: Dickson Kachuma Date: Wed, 24 Jun 2026 15:16:04 -0500 Subject: [PATCH 2/3] Remove pvt package references --- .devcontainer/devcontainer.json | 5 ----- .github/CODEOWNERS | 1 - .gitlab-ci.yml | 2 -- .readthedocs.yml | 5 ----- host-configs/LBL/cori-gcc@8.1.0.cmake | 2 -- host-configs/LBL/cori-intel.cmake | 2 -- host-configs/LBL/corigpu-gcc.cmake | 2 -- host-configs/ORNL/ascent-gcc@8.1.1.cmake | 2 -- host-configs/ORNL/frontier-base.cmake | 1 - host-configs/apple/macOS_base.cmake | 2 -- scripts/check_code_rules.sh | 1 - scripts/test_submodule_updated.sh | 2 -- src/coreComponents/CMakeLists.txt | 2 +- src/coreComponents/constitutive/PVTPackage | 1 - src/docs/doxygen/Doxyfile.in | 1 - src/docs/sphinx/QuickStart.rst | 2 +- .../developerGuide/KeyComponents/index_KeyComponents.rst | 2 -- 17 files changed, 2 insertions(+), 33 deletions(-) delete mode 160000 src/coreComponents/constitutive/PVTPackage diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 692ecc9d08e..52e35a666de 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -37,11 +37,6 @@ "permissions": { "contents": "write" } - }, - "GEOS-DEV/PVTPackage": { - "permissions": { - "contents": "write" - } } }, "openFiles": [] diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 539befdf706..76e06963839 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -50,7 +50,6 @@ /src/coreComponents/constitutive/docs @jhuang2601 @dkachuma @joshua-white /src/coreComponents/constitutive/fluid @dkachuma @jafranc @joshua-white /src/coreComponents/constitutive/permeability @dkachuma @jhuang2601 @jafranc -/src/coreComponents/constitutive/pvtPackage @dkachuma @jafranc @joshua-white /src/coreComponents/constitutive/relativePermeability @dkachuma @jafranc @joshua-white /src/coreComponents/constitutive/solid @rrsettgast @jhuang2601 @OmarDuran @joshua-white /src/coreComponents/constitutive/thermalConductivity @dkachuma @jhuang2601 @joshua-white diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 033f29acf68..9bfbc2e27f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,6 @@ stages: # Change submodule paths to absolute github paths (default is relative to GEOS gitlab path) - git submodule set-url src/coreComponents/LvArray https://github.com/GEOS-DEV/LvArray.git - git submodule set-url src/cmake/blt https://github.com/LLNL/blt.git - - git submodule set-url src/coreComponents/constitutive/PVTPackage https://github.com/GEOS-DEV/PVTPackage.git - git submodule set-url integratedTests git@github.com:GEOS-DEV/integratedTests.git - git submodule set-url src/coreComponents/fileIO/coupling/hdf5_interface https://github.com/GEOS-DEV/hdf5_interface.git @@ -28,7 +27,6 @@ stages: # Update submodules - git submodule update --init --recursive src/cmake/blt - git submodule update --init --recursive src/coreComponents/LvArray - - git submodule update --init --recursive src/coreComponents/constitutive/PVTPackage - git submodule update --init --recursive integratedTests - git submodule update --init --recursive src/coreComponents/fileIO/coupling/hdf5_interface diff --git a/.readthedocs.yml b/.readthedocs.yml index 5f3f5d49dbf..dd41729598b 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -38,8 +38,3 @@ sphinx: # Optionally build your docs in additional formats such as PDF and ePub formats: - pdf - -submodules: - include: - - src/coreComponents/constitutive/PVTPackage - recursive: true diff --git a/host-configs/LBL/cori-gcc@8.1.0.cmake b/host-configs/LBL/cori-gcc@8.1.0.cmake index b0a50872aa3..1a067b473f7 100644 --- a/host-configs/LBL/cori-gcc@8.1.0.cmake +++ b/host-configs/LBL/cori-gcc@8.1.0.cmake @@ -32,8 +32,6 @@ set(ENABLE_DOXYGEN OFF CACHE BOOL "") set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") -set(ENABLE_PVTPackage ON CACHE BOOL "") - set(ENABLE_CALIPER ON CACHE BOOL "") set(ENABLE_ADIAK ON CACHE BOOL "") set(ENABLE_PAPI ON CACHE BOOL "") diff --git a/host-configs/LBL/cori-intel.cmake b/host-configs/LBL/cori-intel.cmake index f9ff8ec447c..ed83952ba62 100644 --- a/host-configs/LBL/cori-intel.cmake +++ b/host-configs/LBL/cori-intel.cmake @@ -33,8 +33,6 @@ set(ENABLE_XML_UPDATES OFF CACHE BOOL "") set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "") -set(ENABLE_PVTPackage ON CACHE BOOL "") - set(ENABLE_CALIPER ON CACHE BOOL "") set(ENABLE_ADIAK ON CACHE BOOL "") set(ENABLE_PAPI ON CACHE BOOL "") diff --git a/host-configs/LBL/corigpu-gcc.cmake b/host-configs/LBL/corigpu-gcc.cmake index 9e0f9066f8b..d7f6e333ff3 100644 --- a/host-configs/LBL/corigpu-gcc.cmake +++ b/host-configs/LBL/corigpu-gcc.cmake @@ -6,8 +6,6 @@ set(ENABLE_MATHPRESSO OFF CACHE BOOL "") # Silo configure script doesn't recognize systype #set(SILO_BUILD_TYPE powerpc64-unknown-linux-gnu CACHE STRING "") -set(ENABLE_PVTPackage ON CACHE BOOL "") - set(ENABLE_CALIPER ON CACHE BOOL "") set(ENABLE_PAPI OFF CACHE BOOL "") diff --git a/host-configs/ORNL/ascent-gcc@8.1.1.cmake b/host-configs/ORNL/ascent-gcc@8.1.1.cmake index dcbdf329c40..ff4948578d2 100644 --- a/host-configs/ORNL/ascent-gcc@8.1.1.cmake +++ b/host-configs/ORNL/ascent-gcc@8.1.1.cmake @@ -6,8 +6,6 @@ set(ENABLE_MATHPRESSO OFF CACHE BOOL "") # Silo configure script doesn't recognize systype set(SILO_BUILD_TYPE powerpc64-unknown-linux-gnu CACHE STRING "") -set(ENABLE_PVTPackage ON CACHE BOOL "") - set(ENABLE_PETSC OFF CACHE BOOL "" FORCE) set(ENABLE_CALIPER ON CACHE BOOL "") diff --git a/host-configs/ORNL/frontier-base.cmake b/host-configs/ORNL/frontier-base.cmake index 7337dbf387b..597dad9a022 100644 --- a/host-configs/ORNL/frontier-base.cmake +++ b/host-configs/ORNL/frontier-base.cmake @@ -1,7 +1,6 @@ set( ENABLE_MATHPRESSO OFF CACHE BOOL "" ) set( ENABLE_PAMELA ON CACHE BOOL "" ) -set( ENABLE_PVTPackage ON CACHE BOOL "" ) set( ENABLE_PETSC OFF CACHE BOOL "" FORCE ) diff --git a/host-configs/apple/macOS_base.cmake b/host-configs/apple/macOS_base.cmake index 6d56f70755c..73dab00be6e 100644 --- a/host-configs/apple/macOS_base.cmake +++ b/host-configs/apple/macOS_base.cmake @@ -15,8 +15,6 @@ set(MPIEXEC "${HOMEBREW_DIR}/bin/mpirun" CACHE PATH "") set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "" FORCE) -set(ENABLE_PVTPackage ON CACHE BOOL "" FORCE) - set(ENABLE_CUDA "OFF" CACHE PATH "" FORCE) set(ENABLE_OPENMP "OFF" CACHE PATH "" FORCE) diff --git a/scripts/check_code_rules.sh b/scripts/check_code_rules.sh index 8a9ed6dd931..5c739e0d906 100755 --- a/scripts/check_code_rules.sh +++ b/scripts/check_code_rules.sh @@ -87,7 +87,6 @@ FILEPATH_EXCLUDE_PATTERNS=( "MpiWrapper.cpp" "BufferOps_inline.hpp" "BufferOps.hpp" - "PVTPackage" "hdf5_interface" ) diff --git a/scripts/test_submodule_updated.sh b/scripts/test_submodule_updated.sh index f88b346dbb7..97f8a0c63b7 100755 --- a/scripts/test_submodule_updated.sh +++ b/scripts/test_submodule_updated.sh @@ -11,7 +11,6 @@ git lfs uninstall &> /dev/null #git submodule update --init integratedTests git submodule update --init src/cmake/blt git submodule update --init src/coreComponents/LvArray -git submodule update --init src/coreComponents/constitutive/PVTPackage git submodule update --init src/coreComponents/fileIO/coupling/hdf5_interface git submodule update --init src/coreComponents/constitutive/HPCReact @@ -31,7 +30,6 @@ declare -Ar main_branches=( ["LvArray"]="origin/develop" ["integratedTests"]="origin/develop" ["hdf5_interface"]="origin/master" - ["PVTPackage"]="origin/develop" ["HPCReact"]="origin/main" ) diff --git a/src/coreComponents/CMakeLists.txt b/src/coreComponents/CMakeLists.txt index b74e728c754..e3b5aa75866 100644 --- a/src/coreComponents/CMakeLists.txt +++ b/src/coreComponents/CMakeLists.txt @@ -73,7 +73,7 @@ else() endif() geosx_add_code_checks( PREFIX coreComponents - EXCLUDES cmake constitutive/PVTPackage constitutive/HPCReact ) + EXCLUDES constitutive/HPCReact ) if( ENABLE_UNCRUSTIFY ) add_test( NAME testUncrustifyCheck diff --git a/src/coreComponents/constitutive/PVTPackage b/src/coreComponents/constitutive/PVTPackage deleted file mode 160000 index 5f0e203391c..00000000000 --- a/src/coreComponents/constitutive/PVTPackage +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f0e203391c83d2c64830501438c5fd1bfcb622b diff --git a/src/docs/doxygen/Doxyfile.in b/src/docs/doxygen/Doxyfile.in index cc9821e305c..07101aa47ad 100644 --- a/src/docs/doxygen/Doxyfile.in +++ b/src/docs/doxygen/Doxyfile.in @@ -821,7 +821,6 @@ RECURSIVE = YES EXCLUDE = @PROJECT_SOURCE_DIR@/coreComponents/dataRepository/BufferOps_inline.hpp \ @PROJECT_SOURCE_DIR@/coreComponents/common/MpiWrapper.hpp \ @PROJECT_SOURCE_DIR@/coreComponents/common/GEOS_RAJA_Interface.hpp \ - @PROJECT_SOURCE_DIR@/coreComponents/constitutive/PVTPackage \ @PROJECT_SOURCE_DIR@/coreComponents/constitutive/HPCReact # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or diff --git a/src/docs/sphinx/QuickStart.rst b/src/docs/sphinx/QuickStart.rst index 7305fea884c..5f54af43189 100644 --- a/src/docs/sphinx/QuickStart.rst +++ b/src/docs/sphinx/QuickStart.rst @@ -182,7 +182,7 @@ See the previous section for tips on ensuring your SSH is working properly. Previous versions also included the PVTPackage which is no longer required. This may cause the ``git submodule update`` command to fail. In that case, run ``git submodule deinit integratedTests`` and/or ``git submodule deinit src/coreComponents/constitutive/PVTPackage`` before ``git submodule update``. -This submodule is not required for building GEOS. +These submodules are not required for building GEOS. .. code-block:: sh diff --git a/src/docs/sphinx/developerGuide/KeyComponents/index_KeyComponents.rst b/src/docs/sphinx/developerGuide/KeyComponents/index_KeyComponents.rst index 68899719971..b4a3bfc7700 100644 --- a/src/docs/sphinx/developerGuide/KeyComponents/index_KeyComponents.rst +++ b/src/docs/sphinx/developerGuide/KeyComponents/index_KeyComponents.rst @@ -28,6 +28,4 @@ The main code components are described here. ./../../../../coreComponents/constitutive/docs/constitutiveDeveloperGuide.rst - ./../../../../coreComponents/constitutive/PVTPackage/docs/main.rst - ./AddingNewSolver From 4cfbacebdab742c48fae1e19ae13543bd75d3af4 Mon Sep 17 00:00:00 2001 From: Dickson Kachuma Date: Thu, 25 Jun 2026 08:36:44 -0500 Subject: [PATCH 3/3] Remove cmake from code checks --- src/coreComponents/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreComponents/CMakeLists.txt b/src/coreComponents/CMakeLists.txt index e3b5aa75866..663020ab21c 100644 --- a/src/coreComponents/CMakeLists.txt +++ b/src/coreComponents/CMakeLists.txt @@ -73,7 +73,7 @@ else() endif() geosx_add_code_checks( PREFIX coreComponents - EXCLUDES constitutive/HPCReact ) + EXCLUDES cmake constitutive/HPCReact ) if( ENABLE_UNCRUSTIFY ) add_test( NAME testUncrustifyCheck