From cef7ec68d617f210a1acadf564c916866252b7e7 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sat, 18 May 2019 19:55:49 +0200 Subject: [PATCH] Change CUDAWrappers::MatrixFree::point_type to Point --- examples/step-64/step-64.cu | 2 +- include/deal.II/matrix_free/cuda_matrix_free.h | 3 +-- include/deal.II/matrix_free/cuda_matrix_free.templates.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/step-64/step-64.cu b/examples/step-64/step-64.cu index 26b742ce01..abc67f1696 100644 --- a/examples/step-64/step-64.cu +++ b/examples/step-64/step-64.cu @@ -100,7 +100,7 @@ namespace Step64 { const unsigned int pos = CUDAWrappers::local_q_point_id( cell, gpu_data, n_dofs_1d, n_q_points); - const Tensor<1, dim> q_point = + const Point q_point = CUDAWrappers::get_quadrature_point(cell, gpu_data, n_dofs_1d); diff --git a/include/deal.II/matrix_free/cuda_matrix_free.h b/include/deal.II/matrix_free/cuda_matrix_free.h index b1d4f349df..304278e6e4 100644 --- a/include/deal.II/matrix_free/cuda_matrix_free.h +++ b/include/deal.II/matrix_free/cuda_matrix_free.h @@ -78,8 +78,7 @@ namespace CUDAWrappers { public: using jacobian_type = Tensor<2, dim, Tensor<1, dim, Number>>; - // TODO this should really be a CUDAWrappers::Point - using point_type = Tensor<1, dim, Number>; + using point_type = Point; /** * Parallelization scheme used: parallel_in_elem (parallelism at the level diff --git a/include/deal.II/matrix_free/cuda_matrix_free.templates.h b/include/deal.II/matrix_free/cuda_matrix_free.templates.h index 81a4e45d2a..19e2f5a3aa 100644 --- a/include/deal.II/matrix_free/cuda_matrix_free.templates.h +++ b/include/deal.II/matrix_free/cuda_matrix_free.templates.h @@ -362,7 +362,7 @@ namespace CUDAWrappers transpose_in_place(q_points_host, n_cells, padding_length); alloc_and_copy(&data->q_points[color], - ArrayView>( + ArrayView>( q_points_host.data(), q_points_host.size()), n_cells * padding_length); } -- 2.39.5