Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
5 changes: 0 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@
"permissions": {
"contents": "write"
}
},
"GEOS-DEV/PVTPackage": {
"permissions": {
"contents": "write"
}
}
},
"openFiles": []
Expand Down
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions host-configs/LBL/cori-gcc@8.1.0.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
2 changes: 0 additions & 2 deletions host-configs/LBL/cori-intel.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
2 changes: 0 additions & 2 deletions host-configs/LBL/corigpu-gcc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")

Expand Down
2 changes: 0 additions & 2 deletions host-configs/ORNL/ascent-gcc@8.1.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
1 change: 0 additions & 1 deletion host-configs/ORNL/frontier-base.cmake
Original file line number Diff line number Diff line change
@@ -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 )

Expand Down
2 changes: 0 additions & 2 deletions host-configs/apple/macOS_base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 0 additions & 1 deletion scripts/check_code_rules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ FILEPATH_EXCLUDE_PATTERNS=(
"MpiWrapper.cpp"
"BufferOps_inline.hpp"
"BufferOps.hpp"
"PVTPackage"
"hdf5_interface"
)

Expand Down
2 changes: 0 additions & 2 deletions scripts/test_submodule_updated.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -31,7 +30,6 @@ declare -Ar main_branches=(
["LvArray"]="origin/develop"
["integratedTests"]="origin/develop"
["hdf5_interface"]="origin/master"
["PVTPackage"]="origin/develop"
["HPCReact"]="origin/main"
)

Expand Down
2 changes: 1 addition & 1 deletion src/coreComponents/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/coreComponents/constitutive/PVTPackage
Submodule PVTPackage deleted from 5f0e20
1 change: 0 additions & 1 deletion src/docs/doxygen/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/docs/sphinx/QuickStart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,4 @@ The main code components are described here.

./../../../../coreComponents/constitutive/docs/constitutiveDeveloperGuide.rst

./../../../../coreComponents/constitutive/PVTPackage/docs/main.rst

./AddingNewSolver
Loading