Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"GEOS_TPL_TAG": "349-1014"
"GEOS_TPL_TAG": "357-1039"
}
},
"runArgs": [
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ on:
ENABLE_HYPRE_DEVICE:
required: false
type: string
ENABLE_HYPREDRV:
required: false
type: string
ENABLE_TRILINOS:
required: false
type: string
Expand Down Expand Up @@ -648,10 +651,17 @@ jobs:
script_args+=(--enable-hypre "${{ inputs.ENABLE_HYPRE }}")
fi

# Hypredrive
ENABLE_HYPREDRV=${{ inputs.ENABLE_HYPREDRV }}
if [ ! -z "${{ inputs.ENABLE_HYPREDRV }}" ]; then
script_args+=(--enable-hypredrv "${{ inputs.ENABLE_HYPREDRV }}")
fi

# Trilinos
ENABLE_TRILINOS=${{ inputs.ENABLE_TRILINOS }}
docker_args+=(-e ENABLE_HYPRE=${ENABLE_HYPRE:-OFF})
docker_args+=(-e ENABLE_HYPRE_DEVICE=${ENABLE_HYPRE_DEVICE:-CPU})
docker_args+=(-e ENABLE_HYPREDRV=${ENABLE_HYPREDRV:-OFF})
docker_args+=(-e ENABLE_TRILINOS=${ENABLE_TRILINOS:-ON})
docker_args+=(-e GEOS_BUILD_SHARED_LIBS=${{ inputs.BUILD_SHARED_LIBS }})

Expand Down
2 changes: 1 addition & 1 deletion .integrated_tests.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
baselines:
bucket: geosx
baseline: integratedTests/baseline_integratedTests-pr3972-17154-316e6d8
baseline: integratedTests/baseline_integratedTests-pr4108-17194-fec5349

allow_fail:
all: ''
Expand Down
13 changes: 12 additions & 1 deletion BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,36 @@ This file is designed to track changes to the integrated test baselines.
Any developer who updates the baseline ID in the .integrated_tests.yaml file is expected to create an entry in this file with the pull request number, date, and their justification for rebaselining.
These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).

PR #3972 (2026-08-DD) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4108-17194-fec5349.tar.gz>
=====================
Add MGR tests to ATS

PR #3972 (2026-07-28) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3972-17154-316e6d8.tar.gz>
Well model refactor . Integrated test update due to schema changes
=====================
Well model refactor . Integrated test update due to schema changes

PR #3836 (2026-05-20) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3836-17046-2e89f64.tar.gz>
=====================
Added statistics `Group` objects for each statistics `Task` instance

PR #4040 (2026-06-16) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4040-16993-1393f80.tar.gz>
=====================
Move relperm driver to use new constitutive driver framework

PR #3705 (2026-06-12) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3705-16862-2b262bf.tar.gz>
=====================
Implement compositional enthalpy model

PR #4074 (2026-06-10) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4074-16937-bf66240.tar.gz>
=====================
Change triaxial driver to use restart for checks

PR #4067 (2026-06-10) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4067-16928-3038f6b.tar.gz>
=====================
Add Coulomb friction/cohesion input from vtk mesh

PR #4068 (2026-06-09) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4068-16828-c74157c.tar.gz>
=====================
Add MPI runs for smoke tests with surfaceGenerator

PR #4062 (2026-05-26) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4062-16784-6d8782e.tar.gz>
Expand Down
4 changes: 4 additions & 0 deletions host-configs/tpls.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ if(EXISTS ${GEOS_TPL_DIR}/hypre)
set(HYPRE_DIR ${GEOS_TPL_DIR}/hypre CACHE PATH "" FORCE)
endif()

if(EXISTS ${GEOS_TPL_DIR}/hypredrive)
set(HYPREDRV_DIR ${GEOS_TPL_DIR}/hypredrive CACHE PATH "" FORCE)
endif()

if(EXISTS ${GEOS_TPL_DIR}/scotch)
set(SCOTCH_DIR ${GEOS_TPL_DIR}/scotch CACHE PATH "" FORCE)
endif()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ decks = [
restart_step=28,
check_step=38,
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
TestDeck(
name="deadoil_3ph_staircase_3d_mgr",
description=
"hypre MGR variant (exercises the hypredrive path when available)",
partitions=((1, 1, 1), (2, 2, 2)),
restart_step=28,
check_step=38,
restartcheck_params=RestartcheckParameters(atol=1e-6, rtol=1e-5)),
TestDeck(
name="deadoil_3ph_staircase_hybrid_3d",
description=
Expand All @@ -85,6 +93,14 @@ decks = [
restart_step=28,
check_step=38,
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
TestDeck(
name="deadoil_3ph_staircase_hybrid_3d_mgr",
description=
"hypre MGR variant (exercises the hypredrive path when available)",
partitions=((1, 1, 1), (2, 2, 2)),
restart_step=28,
check_step=38,
restartcheck_params=RestartcheckParameters(atol=1e-6, rtol=1e-5)),
TestDeck(
name="deadoil_3ph_staircase_obl_3d",
description=
Expand All @@ -93,6 +109,14 @@ decks = [
restart_step=28,
check_step=38,
restartcheck_params=RestartcheckParameters(**restartcheck_params)),
TestDeck(
name="deadoil_3ph_staircase_obl_3d_mgr",
description=
"hypre MGR variant (exercises the hypredrive path when available)",
partitions=((1, 1, 1), (2, 2, 2)),
restart_step=28,
check_step=38,
restartcheck_params=RestartcheckParameters(atol=1e-6, rtol=1e-5)),
TestDeck(
name="deadoil_2ph_staircase_gravity_segregation_3d",
description=
Expand Down
Loading
Loading