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

avoid including MultisegmentWellContribution in WellContributions.hpp

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-04-16 20:50:09 +02:00
parent d3b22323f1
commit 7eba120662
5 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/simulators/linalg/bda/WellContributions.cpp
View File

@ -18,11 +18,12 @@
*/ */
#include <config.h> // CMake #include <config.h> // CMake
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/WellContributions.hpp> #include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
#include <opm/simulators/linalg/bda/opencl/openclWellContributions.hpp> #include <opm/simulators/linalg/bda/opencl/openclWellContributions.hpp>
@ -36,8 +37,9 @@
#include <opm/simulators/linalg/bda/rocsparseWellContributions.hpp> #include <opm/simulators/linalg/bda/rocsparseWellContributions.hpp>
#endif #endif
namespace Opm namespace Opm {
{
WellContributions::~WellContributions() = default;
std::unique_ptr<WellContributions> std::unique_ptr<WellContributions>
WellContributions::create(const std::string& accelerator_mode, bool useWellConn) WellContributions::create(const std::string& accelerator_mode, bool useWellConn)

8
opm/simulators/linalg/bda/WellContributions.hpp
View File

@ -23,14 +23,14 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
#if HAVE_SUITESPARSE_UMFPACK #if HAVE_SUITESPARSE_UMFPACK
#include<umfpack.h> #include<umfpack.h>
#endif #endif
#include <dune/common/version.hh> #include <dune/common/version.hh>
namespace Opm namespace Opm {
{
class MultisegmentWellContribution;
/// This class serves to eliminate the need to include the WellContributions into the matrix (with --matrix-add-well-contributions=true) for the cusparseSolver or openclSolver. /// This class serves to eliminate the need to include the WellContributions into the matrix (with --matrix-add-well-contributions=true) for the cusparseSolver or openclSolver.
/// If the --matrix-add-well-contributions commandline parameter is true, this class should still be used, but be empty. /// If the --matrix-add-well-contributions commandline parameter is true, this class should still be used, but be empty.
@ -89,7 +89,7 @@ public:
void alloc(); void alloc();
/// Empty destructor. /// Empty destructor.
virtual ~WellContributions() = default; virtual ~WellContributions();
/// Indicate how large the blocks of the StandardWell (C and B) are /// Indicate how large the blocks of the StandardWell (C and B) are
/// \param[in] dim number of columns /// \param[in] dim number of columns

13
opm/simulators/linalg/bda/cuda/cuWellContributions.cu
View File

@ -19,14 +19,15 @@
#include <config.h> // CMake #include <config.h> // CMake
#include <opm/simulators/linalg/bda/cuda/cuWellContributions.hpp>
#include "opm/simulators/linalg/bda/cuda/cuWellContributions.hpp"
#include "opm/simulators/linalg/bda/cuda/cuda_header.hpp"
#include <cuda_runtime.h>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
#include <opm/simulators/linalg/bda/cuda/cuda_header.hpp>
#include <cuda_runtime.h>
namespace Opm namespace Opm
{ {

2
opm/simulators/linalg/bda/opencl/openclWellContributions.cpp
View File

@ -18,12 +18,12 @@
*/ */
#include <config.h> // CMake #include <config.h> // CMake
#include <opm/simulators/linalg/bda/opencl/openclWellContributions.hpp> #include <opm/simulators/linalg/bda/opencl/openclWellContributions.hpp>
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
namespace Opm namespace Opm
{ {

2
opm/simulators/linalg/bda/rocsparseWellContributions.cpp
View File

@ -39,10 +39,10 @@
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
#include <hip/hip_runtime.h> #include <hip/hip_runtime.h>
#define HIP_CHECK(stat) \ #define HIP_CHECK(stat) \
{ \ { \
if(stat != hipSuccess) \ if(stat != hipSuccess) \