Skip to content

fix: flash unit test on CUDA builds #4117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bd713 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: flash unit test on CUDA builds #4117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9576d7e
Draft
Aug 13, 2026
47bf32c
Adjusted matrix size
Aug 14, 2026
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
3 changes: 2 additions & 1 deletion ...ents/constitutive/fluid/multifluid/compositional/functions/NegativeTwoPhaseFlash_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,8 @@ void NegativeTwoPhaseFlash::computeDerivatives(
}

// Solve linear system
solveLinearSystem( A.toSlice(), X.toSlice() );
bool const solveStatus = solveLinearSystem( A.toSlice(), X.toSlice() );
GEOS_ERROR_IF( !solveStatus, "Failed to solve for the derivatives." );

// Fill in the derivatives
for( integer i = 0; i < numComps; ++i )
Expand Down
3 changes: 2 additions & 1 deletion src/coreComponents/constitutive/fluid/multifluid/compositional/functions/StabilityTest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@ struct StabilityTest
}

// Solve linear system
solveLinearSystem( A.toSlice(), X.toSlice() );
bool const solveStatus = solveLinearSystem( A.toSlice(), X.toSlice() );
GEOS_ERROR_IF( !solveStatus, "Failed to solve for the derivatives." );

for( integer idof = 0; idof < numDofs; ++idof )
{
Expand Down
25 changes: 16 additions & 9 deletions src/coreComponents/constitutive/fluid/multifluid/compositional/functions/Utilities.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#define GEOS_CONSTITUTIVE_FLUID_MULTIFLUID_COMPOSITIONAL_FUNCTIONS_UTILITIES_HPP_

#include "constitutive/fluid/multifluid/MultiFluidConstants.hpp"
#include "denseLinearAlgebra/interfaces/blaslapack/BlasLapackLA.hpp"
#include "denseLinearAlgebra/denseLASolvers.hpp"

namespace geos
{
Expand Down Expand Up @@ -166,14 +166,21 @@ GEOS_HOST_DEVICE
static bool solveLinearSystem( arraySlice2d< real64, USD > const & A,
arraySlice2d< real64, USD > const & X )
{
#if defined(GEOS_DEVICE_COMPILE)
GEOS_UNUSED_VAR( A );
GEOS_UNUSED_VAR( X );
return false;
#else
BlasLapackLA::solveLinearSystem( A, X );
return true;
#endif
// The flash and stability-test systems are A: N x N and X: N x (N+1).
// denseLinearAlgebra::solve is GEOS_HOST_DEVICE but needs both dimensions at compile time.
switch( A.size( 0 ) )
{
case 2: return denseLinearAlgebra::solve< 2, 3 >( A, X );
case 3: return denseLinearAlgebra::solve< 3, 4 >( A, X );
case 4: return denseLinearAlgebra::solve< 4, 5 >( A, X );
case 5: return denseLinearAlgebra::solve< 5, 6 >( A, X );
case 6: return denseLinearAlgebra::solve< 6, 7 >( A, X );
case 7: return denseLinearAlgebra::solve< 7, 8 >( A, X );
case 8: return denseLinearAlgebra::solve< 8, 9 >( A, X );
case 9: return denseLinearAlgebra::solve< 9, 10 >( A, X );
case 10: return denseLinearAlgebra::solve< 10, 11 >( A, X );
default: return false;
}
}

} // namespace compositional
Expand Down
10 changes: 5 additions & 5 deletions src/coreComponents/denseLinearAlgebra/denseLASolvers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ inline
bool solve( MATRIX_TYPE & A, RHS_TYPE & b, SOL_TYPE && x )
{
static_assert( N > 0, "N must be greater than 0." );
static_assert( N < 10, "N cannot be larger than 9" );
static_assert( N < 11, "N cannot be larger than 10" );
LvArray::tensorOps::internal::checkSizes< N, N >( A );
LvArray::tensorOps::internal::checkSizes< N >( b );
LvArray::tensorOps::internal::checkSizes< N >( x );
Expand Down Expand Up @@ -587,9 +587,9 @@ inline
bool solve( MATRIX_TYPE & A, SOL_TYPE && X )
{
static_assert( N > 0, "N must be greater than 0." );
static_assert( N < 10, "N cannot be larger than 9" );
static_assert( N < 11, "N cannot be larger than 10" );
static_assert( M > 0, "M must be greater than 0." );
static_assert( M < 10, "M cannot be larger than 9" );
static_assert( M < 12, "M cannot be larger than 11" );
LvArray::tensorOps::internal::checkSizes< N, N >( A );
LvArray::tensorOps::internal::checkSizes< N, M >( X );

Expand Down Expand Up @@ -656,9 +656,9 @@ inline
bool solve( MATRIX_TYPE & A, RHS_TYPE & B, SOL_TYPE && X )
{
static_assert( N > 0, "N must be greater than 0." );
static_assert( N < 10, "N cannot be larger than 9" );
static_assert( N < 11, "N cannot be larger than 10" );
static_assert( M > 0, "M must be greater than 0." );
static_assert( M < 10, "M cannot be larger than 9" );
static_assert( M < 12, "M cannot be larger than 11" );
LvArray::tensorOps::internal::checkSizes< N, N >( A );
LvArray::tensorOps::internal::checkSizes< N, M >( B );
LvArray::tensorOps::internal::checkSizes< N, M >( X );
Expand Down
Loading