OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename ISTLSolverGpu to ISTLSolverGpuBridge

Browse Source
This commit is contained in:
Razvan Nane
2024-11-11 15:02:01 +01:00
parent 3c5414102d
commit 23e24a8cca
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists_files.cmake
View File

@@ -312,7 +312,7 @@ if(USE_GPU_BRIDGE)
opm/simulators/linalg/gpubridge/Misc.cpp
opm/simulators/linalg/gpubridge/WellContributions.cpp
opm/simulators/linalg/gpubridge/MultisegmentWellContribution.cpp
opm/simulators/linalg/ISTLSolverGpu.cpp)
opm/simulators/linalg/ISTLSolverGpuBridge.cpp)
if(OPENCL_FOUND)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/BlockedMatrix.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/openclBILU0.cpp)
@@ -1053,7 +1053,7 @@ if (USE_GPU_BRIDGE)
opm/simulators/linalg/gpubridge/rocm/rocsparseWellContributions.hpp
opm/simulators/linalg/gpubridge/rocm/rocsparseMatrix.hpp
opm/simulators/linalg/gpubridge/WellContributions.hpp
opm/simulators/linalg/ISTLSolverGpu.hpp
opm/simulators/linalg/ISTLSolverGpuBridge.hpp
)
endif()

2
opm/simulators/flow/BlackoilModelNldd.hpp
View File

@@ -39,7 +39,7 @@
#include <opm/simulators/linalg/extractMatrix.hpp>
#if COMPILE_GPU_BRIDGE
#include <opm/simulators/linalg/ISTLSolverGpu.hpp>
#include <opm/simulators/linalg/ISTLSolverGpuBridge.hpp>
#else
#include <opm/simulators/linalg/ISTLSolver.hpp>
#endif

4
opm/simulators/linalg/FlowLinearSolverParameters.hpp
View File

@@ -32,7 +32,7 @@
namespace Opm {
template <class TypeTag>
class ISTLSolverGpu;
class ISTLSolverGpuBridge;
template <class TypeTag>
class ISTLSolver;
@@ -52,7 +52,7 @@ template<class TypeTag>
struct LinearSolverBackend<TypeTag, TTag::FlowIstlSolverParams>
{
#if COMPILE_GPU_BRIDGE
using type = ISTLSolverGpu<TypeTag>;
using type = ISTLSolverGpuBridge<TypeTag>;
#else
using type = ISTLSolver<TypeTag>;
#endif

2
opm/simulators/linalg/ISTLSolverGpu.cpp → opm/simulators/linalg/ISTLSolverGpuBridge.cpp
View File

@@ -21,7 +21,7 @@
#include <config.h>
#include <opm/common/TimingMacros.hpp>
#include <opm/simulators/linalg/ISTLSolverGpu.hpp>
#include <opm/simulators/linalg/ISTLSolverGpuBridge.hpp>
#include <dune/istl/schwarz.hh>

8
opm/simulators/linalg/ISTLSolverGpu.hpp → opm/simulators/linalg/ISTLSolverGpuBridge.hpp
View File

@@ -100,7 +100,7 @@ private:
/// as a block-structured matrix (one block for all cell variables) for a fixed
/// number of cell variables np .
template <class TypeTag>
class ISTLSolverGpu : public ISTLSolver<TypeTag>
class ISTLSolverGpuBridge : public ISTLSolver<TypeTag>
{
protected:
using ParentType = ISTLSolver<TypeTag>;
@@ -134,7 +134,7 @@ public:
/// \param[in] simulator The opm-models simulator object
/// \param[in] parameters Explicit parameters for solver setup, do not
/// read them from command line parameters.
ISTLSolverGpu(const Simulator& simulator, const FlowLinearSolverParameters& parameters)
ISTLSolverGpuBridge(const Simulator& simulator, const FlowLinearSolverParameters& parameters)
: ParentType(simulator, parameters)
{
initializeGpu();
@@ -142,7 +142,7 @@ public:
/// Construct a system solver.
/// \param[in] simulator The opm-models simulator object
explicit ISTLSolverGpu(const Simulator& simulator)
explicit ISTLSolverGpuBridge(const Simulator& simulator)
: ParentType(simulator)
{
initializeGpu();
@@ -237,7 +237,7 @@ public:
return ParentType::solve(x);
}
OPM_TIMEBLOCK(istlSolverGpuSolve);
OPM_TIMEBLOCK(istlSolverGpuBridgeSolve);
this->solveCount_ += 1;
// Write linear system if asked for.
const int verbosity = this->prm_[this->activeSolverNum_].template get<int>("verbosity", 0);