OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 09:22:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

changed: use unique_ptr for MultisegmentWellContributions

Browse Source 
less manual pointer management is always good
This commit is contained in:
Arne Morten Kvarving committed 2021-11-11 13:15:29 +01:00
1 parent 5bfac05827
commit 2b0508af8b
3 files changed
+27 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/simulators/linalg/bda/WellContributions.cpp
+23 -12
View File
@@ -54,10 +54,6 @@ WellContributions::WellContributions(std::string accelerator_mode, bool useWellC
WellContributions::~WellContributions() WellContributions::~WellContributions()
{ {
// delete MultisegmentWellContributions
for (auto ms: multisegments) {
delete ms;
}
multisegments.clear(); multisegments.clear();
#if HAVE_CUDA #if HAVE_CUDA
@@ -121,7 +117,7 @@ void WellContributions::apply_mswells(cl::Buffer d_x, cl::Buffer d_y){
events.clear(); events.clear();
// actually apply MultisegmentWells // actually apply MultisegmentWells
for(Opm::MultisegmentWellContribution *well: multisegments){ for (auto& well : multisegments) {
well->setReordering(h_toOrder, reorder); well->setReordering(h_toOrder, reorder);
well->apply(h_x, h_y); well->apply(h_x, h_y);
} }
@@ -253,15 +249,30 @@ void WellContributions::alloc()
} }
} }
void WellContributions::addMultisegmentWellContribution(unsigned int dim_, unsigned int dim_wells_, void WellContributions::addMultisegmentWellContribution(unsigned int dim_,
unsigned int Mb, unsigned int dim_wells_,
std::vector<double> &Bvalues, std::vector<unsigned int> &BcolIndices, std::vector<unsigned int> &BrowPointers, unsigned int Mb,
unsigned int DnumBlocks, double *Dvalues, UMFPackIndex *DcolPointers, UMFPackIndex *DrowIndices, std::vector<double>& Bvalues,
std::vector<double> &Cvalues) std::vector<unsigned int>& BcolIndices,
std::vector<unsigned int>& BrowPointers,
unsigned int DnumBlocks,
double* Dvalues,
UMFPackIndex* DcolPointers,
UMFPackIndex* DrowIndices,
std::vector<double>& Cvalues)
{ {
assert(dim==dim_); assert(dim==dim_);
MultisegmentWellContribution *well = new MultisegmentWellContribution(dim_, dim_wells_, Mb, Bvalues, BcolIndices, BrowPointers, DnumBlocks, Dvalues, DcolPointers, DrowIndices, Cvalues); multisegments.push_back(std::make_unique<MultisegmentWellContribution>(dim_,
multisegments.emplace_back(well); dim_wells_,
Mb,
Bvalues,
BcolIndices,
BrowPointers,
DnumBlocks,
Dvalues,
DcolPointers,
DrowIndices,
Cvalues));
++num_ms_wells; ++num_ms_wells;
} }
opm/simulators/linalg/bda/WellContributions.cu
+2 -2
View File
@@ -177,7 +177,7 @@ void WellContributions::apply(double *d_x, double *d_y)
cudaStreamSynchronize(stream); cudaStreamSynchronize(stream);
// actually apply MultisegmentWells // actually apply MultisegmentWells
for (MultisegmentWellContribution *well : multisegments) { for (auto& well : multisegments) {
well->apply(h_x, h_y); well->apply(h_x, h_y);
} }
@@ -222,7 +222,7 @@ void WellContributions::addMatrixGpu(MatrixType type, int *colIndices, double *v
void WellContributions::setCudaStream(cudaStream_t stream_) void WellContributions::setCudaStream(cudaStream_t stream_)
{ {
this->stream = stream_; this->stream = stream_;
for (MultisegmentWellContribution *well : multisegments) { for (auto& well : multisegments) {
well->setCudaStream(stream_); well->setCudaStream(stream_);
} }
} }
opm/simulators/linalg/bda/WellContributions.hpp
+2 -1
View File
@@ -29,6 +29,7 @@
#include <opm/simulators/linalg/bda/openclKernels.hpp> #include <opm/simulators/linalg/bda/openclKernels.hpp>
#endif #endif
#include <memory>
#include <vector> #include <vector>
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp> #include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
@@ -89,7 +90,7 @@ private:
double *h_x = nullptr; double *h_x = nullptr;
double *h_y = nullptr; double *h_y = nullptr;
std::vector<MultisegmentWellContribution*> multisegments; std::vector<std::unique_ptr<MultisegmentWellContribution>> multisegments;
#if HAVE_OPENCL #if HAVE_OPENCL
cl::Context *context; cl::Context *context;