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

Fixes compilation with CUDA but without OpenCL.

Browse Source 
Using statements should not be in namespaces anyway...
This commit is contained in:
Markus Blatt 2021-05-28 16:03:40 +02:00
parent d3437d77b1
commit 6ffde47096
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,8 @@ void WellContributions::setOpenCLEnv(cl::Context *context_, cl::CommandQueue *qu
this->queue = queue_; this->queue = queue_;
} }
void WellContributions::setKernel(stdwell_apply_kernel_type *kernel_, stdwell_apply_no_reorder_kernel_type *kernel_no_reorder_){ void WellContributions::setKernel(bda::stdwell_apply_kernel_type *kernel_,
bda::stdwell_apply_no_reorder_kernel_type *kernel_no_reorder_){
this->kernel = kernel_; this->kernel = kernel_;
this->kernel_no_reorder = kernel_no_reorder_; this->kernel_no_reorder = kernel_no_reorder_;
} }

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

@ -40,9 +40,6 @@
namespace Opm namespace Opm
{ {
using bda::stdwell_apply_kernel_type;
using bda::stdwell_apply_no_reorder_kernel_type;
/// This class serves to eliminate the need to include the WellContributions into the matrix (with --matrix-add-well-contributions=true) for the cusparseSolver /// This class serves to eliminate the need to include the WellContributions into the matrix (with --matrix-add-well-contributions=true) for the cusparseSolver
/// If the --matrix-add-well-contributions commandline parameter is true, this class should not be used /// If the --matrix-add-well-contributions commandline parameter is true, this class should not be used
/// So far, StandardWell and MultisegmentWell are supported /// So far, StandardWell and MultisegmentWell are supported
@ -97,8 +94,8 @@ private:
#if HAVE_OPENCL #if HAVE_OPENCL
cl::Context *context; cl::Context *context;
cl::CommandQueue *queue; cl::CommandQueue *queue;
stdwell_apply_kernel_type *kernel; bda::stdwell_apply_kernel_type *kernel;
stdwell_apply_no_reorder_kernel_type *kernel_no_reorder; bda::stdwell_apply_no_reorder_kernel_type *kernel_no_reorder;
std::vector<cl::Event> events; std::vector<cl::Event> events;
std::unique_ptr<cl::Buffer> d_Cnnzs_ocl, d_Dnnzs_ocl, d_Bnnzs_ocl; std::unique_ptr<cl::Buffer> d_Cnnzs_ocl, d_Dnnzs_ocl, d_Bnnzs_ocl;
@ -150,7 +147,8 @@ public:
#endif #endif
#if HAVE_OPENCL #if HAVE_OPENCL
void setKernel(stdwell_apply_kernel_type *kernel_, stdwell_apply_no_reorder_kernel_type *kernel_no_reorder_); void setKernel(bda::stdwell_apply_kernel_type *kernel_,
bda::stdwell_apply_no_reorder_kernel_type *kernel_no_reorder_);
void setOpenCLEnv(cl::Context *context_, cl::CommandQueue *queue_); void setOpenCLEnv(cl::Context *context_, cl::CommandQueue *queue_);
/// Since the rows of the matrix are reordered, the columnindices of the matrixdata is incorrect /// Since the rows of the matrix are reordered, the columnindices of the matrixdata is incorrect