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

simplify tests

Browse Source
This commit is contained in:
Tobias Meyer Andersen 2025-02-12 11:04:28 +01:00
parent 5181a06219
commit 0b887fdcbc
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
opm/simulators/linalg/gpuistl/GpuBuffer.cpp
View File

@ -199,13 +199,22 @@ template class GpuBuffer<double>;
template class GpuBuffer<float>; template class GpuBuffer<float>;
template class GpuBuffer<int>; template class GpuBuffer<int>;
template <class T>
GpuView<T> make_view(GpuBuffer<T>& buf) {
return GpuView<T>(buf.data(), buf.size());
}
template GpuView<double> make_view(GpuBuffer<double>&);
template GpuView<float> make_view(GpuBuffer<float>&);
template GpuView<int> make_view(GpuBuffer<int>&);
template <class T> template <class T>
GpuView<const T> make_view(const GpuBuffer<T>& buf) { GpuView<const T> make_view(const GpuBuffer<T>& buf) {
return GpuView<const T>(buf.data(), buf.size()); return GpuView<const T>(buf.data(), buf.size());
} }
template GpuView<const double> make_view<double>(const GpuBuffer<double>&); template GpuView<const double> make_view(const GpuBuffer<double>&);
template GpuView<const float> make_view<float>(const GpuBuffer<float>&); template GpuView<const float> make_view(const GpuBuffer<float>&);
template GpuView<const int> make_view<int>(const GpuBuffer<int>&); template GpuView<const int> make_view(const GpuBuffer<int>&);
} // namespace Opm::gpuistl } // namespace Opm::gpuistl

3
opm/simulators/linalg/gpuistl/GpuBuffer.hpp
View File

@ -229,6 +229,9 @@ private:
void assertHasElements() const; void assertHasElements() const;
}; };
template <class T>
GpuView<T> make_view(GpuBuffer<T>&);
template <class T> template <class T>
GpuView<const T> make_view(const GpuBuffer<T>&); GpuView<const T> make_view(const GpuBuffer<T>&);

5
tests/gpuistl/test_gpu_linear_two_phase_material.cu
View File

@ -44,11 +44,10 @@
using Scalar = float; using Scalar = float;
using ValueVector = std::vector<Scalar>; using ValueVector = std::vector<Scalar>;
using GPUBuffer = Opm::gpuistl::GpuBuffer<Scalar>; using GPUBuffer = Opm::gpuistl::GpuBuffer<Scalar>;
using GPUView = Opm::gpuistl::GpuView<const Scalar>; using GPUView = Opm::gpuistl::GpuView<Scalar>;
using TraitsT = Opm::TwoPhaseMaterialTraits<Scalar, 1, 2>; using TraitsT = Opm::TwoPhaseMaterialTraits<Scalar, 1, 2>;
using CPUParams = Opm::PiecewiseLinearTwoPhaseMaterialParams<TraitsT>; using CPUParams = Opm::PiecewiseLinearTwoPhaseMaterialParams<TraitsT>;
using constGPUBufferParams = Opm::PiecewiseLinearTwoPhaseMaterialParams<TraitsT, const GPUBuffer>;
using GPUBufferParams = Opm::PiecewiseLinearTwoPhaseMaterialParams<TraitsT, GPUBuffer>; using GPUBufferParams = Opm::PiecewiseLinearTwoPhaseMaterialParams<TraitsT, GPUBuffer>;
using GPUViewParams = Opm::PiecewiseLinearTwoPhaseMaterialParams<TraitsT, GPUView>; using GPUViewParams = Opm::PiecewiseLinearTwoPhaseMaterialParams<TraitsT, GPUView>;
@ -73,7 +72,7 @@ BOOST_AUTO_TEST_CASE(TestSimpleInterpolation)
cpuParams.setKrnSamples(cx, cy); cpuParams.setKrnSamples(cx, cy);
cpuParams.finalize(); cpuParams.finalize();
constGPUBufferParams gpuBufferParams = Opm::gpuistl::copy_to_gpu<const GPUBuffer>(cpuParams); GPUBufferParams gpuBufferParams = Opm::gpuistl::copy_to_gpu<GPUBuffer>(cpuParams);
GPUViewParams gpuViewParams = Opm::gpuistl::make_view<GPUView>(gpuBufferParams); GPUViewParams gpuViewParams = Opm::gpuistl::make_view<GPUView>(gpuBufferParams);