From f306f78737b1ea5b231cde3a84fe2feb29f8c07c Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Thu, 1 Oct 2020 15:55:57 +0200 Subject: [PATCH 1/2] Delete assignment operator of WellContributionsOCLContainer, too --- opm/simulators/linalg/bda/WellContributionsOCLContainer.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opm/simulators/linalg/bda/WellContributionsOCLContainer.hpp b/opm/simulators/linalg/bda/WellContributionsOCLContainer.hpp index 0120c4881..08d496141 100644 --- a/opm/simulators/linalg/bda/WellContributionsOCLContainer.hpp +++ b/opm/simulators/linalg/bda/WellContributionsOCLContainer.hpp @@ -58,10 +58,10 @@ namespace bda void applyMSWells(cl::Buffer& x, cl::Buffer& y); public: - WellContributionsOCLContainer() {}; + WellContributionsOCLContainer() {} ~WellContributionsOCLContainer(); - WellContributionsOCLContainer(const WellContributionsOCLContainer&) = delete; - + WellContributionsOCLContainer(const WellContributionsOCLContainer&) = delete; + WellContributionsOCLContainer& operator=(const WellContributionsOCLContainer&) = delete; void apply(cl::Buffer& x, cl::Buffer& y); void init(Opm::WellContributions &wellContribs, int N, int Nb); void copy_to_gpu(Opm::WellContributions &wellContribs, int *toOrder_); From 684b58564c291ab27f726f186f780c2ad5c52d62 Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Thu, 1 Oct 2020 15:56:50 +0200 Subject: [PATCH 2/2] use auto in for-loop as at other occasions. --- opm/simulators/linalg/bda/WellContributionsOCLContainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/simulators/linalg/bda/WellContributionsOCLContainer.cpp b/opm/simulators/linalg/bda/WellContributionsOCLContainer.cpp index 2b13bf79b..da8386528 100644 --- a/opm/simulators/linalg/bda/WellContributionsOCLContainer.cpp +++ b/opm/simulators/linalg/bda/WellContributionsOCLContainer.cpp @@ -146,7 +146,7 @@ namespace bda event.waitForEvents(events); // actually apply MultisegmentWells - for(Opm::MultisegmentWellContribution *well: multisegments){ + for(auto well: multisegments){ well->setReordering(toOrder.data(), true); well->apply(x_msw.data(), y_msw.data()); }