From 282ec3edd8a5ae240cbab880ceaeb2643d2d3967 Mon Sep 17 00:00:00 2001 From: DENEL Bertrand Date: Thu, 23 Apr 2026 17:54:11 -0500 Subject: [PATCH] Draft --- .../linearAlgebra/unitTests/testHypredrive.cpp | 6 +++--- .../linearAlgebra/utilities/LinearSolverParameters.hpp | 2 +- .../physicsSolvers/LinearSolverParameters.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/coreComponents/linearAlgebra/unitTests/testHypredrive.cpp b/src/coreComponents/linearAlgebra/unitTests/testHypredrive.cpp index 25e3de8b2ab..c004631a83d 100644 --- a/src/coreComponents/linearAlgebra/unitTests/testHypredrive.cpp +++ b/src/coreComponents/linearAlgebra/unitTests/testHypredrive.cpp @@ -375,7 +375,7 @@ TEST( HypredriveYaml, UsesAuthoritativeFileWhenProvided ) LinearSolverParameters params; params.solverType = LinearSolverParameters::SolverType::direct; params.preconditionerType = LinearSolverParameters::PreconditionerType::none; - params.hypredriveInputFile = authoritativeFile; + params.hypredriveInputFile = Path( authoritativeFile.c_str() ); hypre::hypredrive::InputArgsParseTarget target; ASSERT_TRUE( hypre::hypredrive::buildInputArgsParseTarget( params, target ) ); @@ -455,7 +455,7 @@ TEST( HypredriveLogging, PrintsStatisticsSummaryWhenHandleIsDestroyed ) } LinearSolverParameters params; - params.hypredriveInputFile = authoritativeFile; + params.hypredriveInputFile = Path( authoritativeFile.c_str() ); HypreMatrix matrix; testing::computeIdentity( MPI_COMM_GEOS, 4, matrix ); @@ -599,7 +599,7 @@ TEST( HypredriveSolverReuse, RecreatesHandleWhenAuthoritativeYamlChanges ) } LinearSolverParameters params; - params.hypredriveInputFile = authoritativeFile; + params.hypredriveInputFile = Path( authoritativeFile.c_str() ); HypreMatrix matrix; testing::computeIdentity( MPI_COMM_GEOS, 4, matrix ); diff --git a/src/coreComponents/linearAlgebra/utilities/LinearSolverParameters.hpp b/src/coreComponents/linearAlgebra/utilities/LinearSolverParameters.hpp index 9988198ffbc..d9c6a954a54 100644 --- a/src/coreComponents/linearAlgebra/utilities/LinearSolverParameters.hpp +++ b/src/coreComponents/linearAlgebra/utilities/LinearSolverParameters.hpp @@ -79,7 +79,7 @@ struct LinearSolverParameters SolverType solverType = SolverType::direct; ///< Solver type PreconditionerType preconditionerType = PreconditionerType::iluk; ///< Preconditioner type - string hypredriveInputFile; ///< Optional authoritative hypredrive YAML file + Path hypredriveInputFile; ///< Optional authoritative hypredrive YAML file /// Direct solver parameters: used for SuperLU_Dist interface through hypre and PETSc struct Direct diff --git a/src/coreComponents/physicsSolvers/LinearSolverParameters.cpp b/src/coreComponents/physicsSolvers/LinearSolverParameters.cpp index 6160164edbc..4ae2a849af0 100644 --- a/src/coreComponents/physicsSolvers/LinearSolverParameters.cpp +++ b/src/coreComponents/physicsSolvers/LinearSolverParameters.cpp @@ -912,7 +912,7 @@ void LinearSolverParametersInput::print() const tableData.addRow( "Preconditioner type", m_parameters.preconditionerType ); if( !m_parameters.hypredriveInputFile.empty() ) { - tableData.addRow( "hypredrive input file", m_parameters.hypredriveInputFile ); + tableData.addRow( "hypredrive input file", string_view( m_parameters.hypredriveInputFile ) ); } tableData.addRow( "Stop if error", m_parameters.stopIfError ); if( m_parameters.solverType == LinearSolverParameters::SolverType::direct )