From f1fa9d053cfe05bd1236530e258ccdc6933b3cd0 Mon Sep 17 00:00:00 2001 From: Omar Duran Date: Thu, 30 Oct 2025 11:03:10 -0700 Subject: [PATCH 1/3] wip: Add Clang warning flag to suppress 64-to-32 bit conversion warnings --- src/cmake/GeosxOptions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmake/GeosxOptions.cmake b/src/cmake/GeosxOptions.cmake index fe3adabcc4b..ebc45c3e929 100644 --- a/src/cmake/GeosxOptions.cmake +++ b/src/cmake/GeosxOptions.cmake @@ -147,7 +147,7 @@ message( "CMAKE_CXX_COMPILER_ID = ${CMAKE_CXX_COMPILER_ID}" ) blt_append_custom_compiler_flag( FLAGS_VAR CMAKE_CXX_FLAGS DEFAULT "${OpenMP_CXX_FLAGS}" ) blt_append_custom_compiler_flag( FLAGS_VAR CMAKE_CXX_FLAGS GNU "-Wpedantic -pedantic-errors -Wshadow -Wfloat-equal -Wcast-align -Wcast-qual" - CLANG "-Wpedantic -pedantic-errors -Wshadow -Wfloat-equal -Wno-cast-align -Wcast-qual" + CLANG "-Wpedantic -pedantic-errors -Wshadow -Wfloat-equal -Wno-cast-align -Wcast-qual -Wno-shorten-64-to-32" ) blt_append_custom_compiler_flag( FLAGS_VAR CMAKE_CXX_FLAGS_DEBUG From 4fd50e185b3bad54a639e75e6fcdaaf0b4e1c4e5 Mon Sep 17 00:00:00 2001 From: Omar Duran Date: Thu, 30 Oct 2025 14:04:11 -0700 Subject: [PATCH 2/3] wip: rebaselines --- .integrated_tests.yaml | 2 +- BASELINE_NOTES.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml index f690dc3b864..1b81dfbde3c 100644 --- a/.integrated_tests.yaml +++ b/.integrated_tests.yaml @@ -1,6 +1,6 @@ baselines: bucket: geosx - baseline: integratedTests/baseline_integratedTests-pr3880-14441-1132122 + baseline: integratedTests/baseline_integratedTests-pr3765-14502-dd8f391 allow_fail: all: '' diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md index a74b0fa7210..0dc5cb0742d 100644 --- a/BASELINE_NOTES.md +++ b/BASELINE_NOTES.md @@ -6,6 +6,10 @@ 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 #3765 (2025-10-30) +===================== +Adding boundary fields to handle Dirichlet conditions in compositional MFD. + PR #3880 (2025-10-13) ===================== Fix a bug introduced in #3485: mass that is used in accumulation term was not updated with porosity change after mechanics leading to always converged sequential outer loop. From 7514bb14debb047ee8ab826cdeea988dd1ea822a Mon Sep 17 00:00:00 2001 From: Omar Duran Date: Thu, 30 Oct 2025 14:22:53 -0700 Subject: [PATCH 3/3] Revert "wip: rebaselines" This reverts commit 4fd50e185b3bad54a639e75e6fcdaaf0b4e1c4e5. --- .integrated_tests.yaml | 2 +- BASELINE_NOTES.md | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml index 1b81dfbde3c..f690dc3b864 100644 --- a/.integrated_tests.yaml +++ b/.integrated_tests.yaml @@ -1,6 +1,6 @@ baselines: bucket: geosx - baseline: integratedTests/baseline_integratedTests-pr3765-14502-dd8f391 + baseline: integratedTests/baseline_integratedTests-pr3880-14441-1132122 allow_fail: all: '' diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md index 0dc5cb0742d..a74b0fa7210 100644 --- a/BASELINE_NOTES.md +++ b/BASELINE_NOTES.md @@ -6,10 +6,6 @@ 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 #3765 (2025-10-30) -===================== -Adding boundary fields to handle Dirichlet conditions in compositional MFD. - PR #3880 (2025-10-13) ===================== Fix a bug introduced in #3485: mass that is used in accumulation term was not updated with porosity change after mechanics leading to always converged sequential outer loop.