From db59fc97ef8c17bb42517f332b8bf445485e43f2 Mon Sep 17 00:00:00 2001 From: Maarten Arnst Date: Thu, 26 Dec 2024 07:59:39 +0100 Subject: [PATCH] Fix the implicit by-copy capture of this is deprecated Signed-off-by: Maarten Arnst --- .../Basis/Intrepid2_HCURL_HEX_In_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HCURL_QUAD_In_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HCURL_TET_In_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HCURL_TRI_In_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HDIV_HEX_In_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HDIV_QUAD_In_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HDIV_TET_In_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HDIV_TRI_In_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HGRAD_HEX_Cn_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HGRAD_LINE_Cn_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HGRAD_QUAD_Cn_FEMDef.hpp | 12 ++++++------ .../Basis/Intrepid2_HGRAD_TET_Cn_FEMDef.hpp | 8 ++++---- .../Basis/Intrepid2_HGRAD_TRI_Cn_FEMDef.hpp | 12 ++++++------ .../Basis/Intrepid2_HVOL_HEX_Cn_FEMDef.hpp | 4 ++-- .../Basis/Intrepid2_HVOL_LINE_Cn_FEMDef.hpp | 4 ++-- .../Basis/Intrepid2_HVOL_QUAD_Cn_FEMDef.hpp | 4 ++-- .../Basis/Intrepid2_HVOL_TET_Cn_FEMDef.hpp | 4 ++-- .../Basis/Intrepid2_HVOL_TRI_Cn_FEMDef.hpp | 4 ++-- 18 files changed, 66 insertions(+), 66 deletions(-) diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_HEX_In_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_HEX_In_FEMDef.hpp index 182c05d721b0..806809284cd0 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_HEX_In_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_HEX_In_FEMDef.hpp @@ -630,19 +630,19 @@ namespace Intrepid2 { switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinvLine_ = this->vinvLine_, &vinvBubble_ = this->vinvBubble_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HCURL_HEX_In_FEM::Serial::getValues( output, input, work, this->vinvLine_, this->vinvBubble_ ); + Impl::Basis_HCURL_HEX_In_FEM::Serial::getValues( output, input, work, vinvLine_, vinvBubble_ ); }); break; case OPERATOR_CURL: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinvLine_ = this->vinvLine_, &vinvBubble_ = this->vinvBubble_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HCURL_HEX_In_FEM::Serial::getValues( output, input, work, this->vinvLine_, this->vinvBubble_ ); + Impl::Basis_HCURL_HEX_In_FEM::Serial::getValues( output, input, work, vinvLine_, vinvBubble_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_QUAD_In_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_QUAD_In_FEMDef.hpp index b00248a51fc8..37d857aa203e 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_QUAD_In_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_QUAD_In_FEMDef.hpp @@ -421,19 +421,19 @@ namespace Intrepid2 { switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinvLine_ = this->vinvLine_, &vinvBubble_ = this-> vinvBubble_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HCURL_QUAD_In_FEM::Serial::getValues( output, input, work, this->vinvLine_, this->vinvBubble_ ); + Impl::Basis_HCURL_QUAD_In_FEM::Serial::getValues( output, input, work, vinvLine_, vinvBubble_ ); }); break; case OPERATOR_CURL: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinvLine_ = this->vinvLine_, &vinvBubble_ = this->vinvBubble_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HCURL_QUAD_In_FEM::Serial::getValues( output, input, work, this->vinvLine_, this->vinvBubble_ ); + Impl::Basis_HCURL_QUAD_In_FEM::Serial::getValues( output, input, work, vinvLine_, vinvBubble_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_TET_In_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_TET_In_FEMDef.hpp index 56149a4a1820..c47b2a2a156b 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_TET_In_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_TET_In_FEMDef.hpp @@ -600,19 +600,19 @@ Basis_HCURL_TET_In_FEM::getValues( switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &coeffs_ = this->coeffs_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HCURL_TET_In_FEM::Serial::getValues( output, input, work, this->coeffs_ ); + Impl::Basis_HCURL_TET_In_FEM::Serial::getValues( output, input, work, coeffs_ ); }); break; case OPERATOR_CURL: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &coeffs_ = this->coeffs_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HCURL_TET_In_FEM::Serial::getValues( output, input, work, this->coeffs_ ); + Impl::Basis_HCURL_TET_In_FEM::Serial::getValues( output, input, work, coeffs_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_TRI_In_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_TRI_In_FEMDef.hpp index 6cb65ab386de..83ccf78a9278 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_TRI_In_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HCURL_TRI_In_FEMDef.hpp @@ -489,19 +489,19 @@ namespace Intrepid2 { switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &coeffs_ = this->coeffs_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HCURL_TRI_In_FEM::Serial::getValues( output, input, work, this->coeffs_ ); + Impl::Basis_HCURL_TRI_In_FEM::Serial::getValues( output, input, work, coeffs_ ); }); break; case OPERATOR_CURL: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &coeffs_ = this->coeffs_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HCURL_TRI_In_FEM::Serial::getValues( output, input, work, this->coeffs_ ); + Impl::Basis_HCURL_TRI_In_FEM::Serial::getValues( output, input, work, coeffs_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_HEX_In_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_HEX_In_FEMDef.hpp index 0d5d25113bdb..9d97011885ca 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_HEX_In_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_HEX_In_FEMDef.hpp @@ -544,19 +544,19 @@ namespace Intrepid2 { switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinvLine_ = this->vinvLine_, &vinvBubble_ = this->vinvBubble_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HDIV_HEX_In_FEM::Serial::getValues( output, input, work, this->vinvLine_, this->vinvBubble_ ); + Impl::Basis_HDIV_HEX_In_FEM::Serial::getValues( output, input, work, vinvLine_, vinvBubble_ ); }); break; case OPERATOR_DIV: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinvLine_ = this->vinvLine_, &vinvBubble_ = this->vinvBubble_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HDIV_HEX_In_FEM::Serial::getValues( output, input, work, this->vinvLine_, this->vinvBubble_ ); + Impl::Basis_HDIV_HEX_In_FEM::Serial::getValues( output, input, work, vinvLine_, vinvBubble_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_QUAD_In_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_QUAD_In_FEMDef.hpp index ee5bdc9458c4..e053e76c990d 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_QUAD_In_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_QUAD_In_FEMDef.hpp @@ -415,19 +415,19 @@ namespace Intrepid2 { switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinvLine_ = this->vinvLine_, &vinvBubble_ = this->vinvBubble_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HDIV_QUAD_In_FEM::Serial::getValues( output, input, work, this->vinvLine_, this->vinvBubble_ ); + Impl::Basis_HDIV_QUAD_In_FEM::Serial::getValues( output, input, work, vinvLine_, vinvBubble_ ); }); break; case OPERATOR_DIV: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinvLine_ = this->vinvLine_, &vinvBubble_ = this->vinvBubble_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HDIV_QUAD_In_FEM::Serial::getValues( output, input, work, this->vinvLine_, this->vinvBubble_ ); + Impl::Basis_HDIV_QUAD_In_FEM::Serial::getValues( output, input, work, vinvLine_, vinvBubble_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_TET_In_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_TET_In_FEMDef.hpp index 96e0e7cf2267..c82cc837211b 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_TET_In_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_TET_In_FEMDef.hpp @@ -488,19 +488,19 @@ Basis_HDIV_TET_In_FEM::getValues( switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &coeffs_ = this->coeffs_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HDIV_TET_In_FEM::Serial::getValues( output, input, work, this->coeffs_ ); + Impl::Basis_HDIV_TET_In_FEM::Serial::getValues( output, input, work, coeffs_ ); }); break; case OPERATOR_DIV: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &coeffs_ = this->coeffs_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HDIV_TET_In_FEM::Serial::getValues( output, input, work, this->coeffs_ ); + Impl::Basis_HDIV_TET_In_FEM::Serial::getValues( output, input, work, coeffs_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_TRI_In_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_TRI_In_FEMDef.hpp index 89c86f5274e9..507e2d290120 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_TRI_In_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HDIV_TRI_In_FEMDef.hpp @@ -484,19 +484,19 @@ Basis_HDIV_TRI_In_FEM( const ordinal_type order, switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &coeffs_ = this->coeffs_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HDIV_TRI_In_FEM::Serial::getValues( output, input, work, this->coeffs_ ); + Impl::Basis_HDIV_TRI_In_FEM::Serial::getValues( output, input, work, coeffs_ ); }); break; case OPERATOR_DIV: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &coeffs_ = this->coeffs_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HDIV_TRI_In_FEM::Serial::getValues( output, input, work, this->coeffs_ ); + Impl::Basis_HDIV_TRI_In_FEM::Serial::getValues( output, input, work, coeffs_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_HEX_Cn_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_HEX_Cn_FEMDef.hpp index 36139dfb95f4..8908598c15b8 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_HEX_Cn_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_HEX_Cn_FEMDef.hpp @@ -419,19 +419,19 @@ namespace Intrepid2 { switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_HEX_Cn_FEM::Serial::getValues( output, input, work, this->vinv_ ); + Impl::Basis_HGRAD_HEX_Cn_FEM::Serial::getValues( output, input, work, vinv_ ); }); break; case OPERATOR_GRAD: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_HEX_Cn_FEM::Serial::getValues( output, input, work, this->vinv_ ); + Impl::Basis_HGRAD_HEX_Cn_FEM::Serial::getValues( output, input, work, vinv_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_LINE_Cn_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_LINE_Cn_FEMDef.hpp index 6140c13821cb..24a209424ae4 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_LINE_Cn_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_LINE_Cn_FEMDef.hpp @@ -362,19 +362,19 @@ namespace Intrepid2 { switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_LINE_Cn_FEM::Serial::getValues( output, input, work, this->vinv_ ); + Impl::Basis_HGRAD_LINE_Cn_FEM::Serial::getValues( output, input, work, vinv_ ); }); break; case OPERATOR_GRAD: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_LINE_Cn_FEM::Serial::getValues( output, input, work, this->vinv_ ); + Impl::Basis_HGRAD_LINE_Cn_FEM::Serial::getValues( output, input, work, vinv_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_QUAD_Cn_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_QUAD_Cn_FEMDef.hpp index 9e232352285e..f11aca244836 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_QUAD_Cn_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_QUAD_Cn_FEMDef.hpp @@ -393,27 +393,27 @@ namespace Intrepid2 { switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_QUAD_Cn_FEM::Serial::getValues( output, input, work, this->vinv_ ); + Impl::Basis_HGRAD_QUAD_Cn_FEM::Serial::getValues( output, input, work, vinv_ ); }); break; case OPERATOR_GRAD: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_QUAD_Cn_FEM::Serial::getValues( output, input, work, this->vinv_ ); + Impl::Basis_HGRAD_QUAD_Cn_FEM::Serial::getValues( output, input, work, vinv_ ); }); break; case OPERATOR_CURL: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_QUAD_Cn_FEM::Serial::getValues( output, input, work, this->vinv_ ); + Impl::Basis_HGRAD_QUAD_Cn_FEM::Serial::getValues( output, input, work, vinv_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_TET_Cn_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_TET_Cn_FEMDef.hpp index 44f09ce456eb..7e2072d74656 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_TET_Cn_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_TET_Cn_FEMDef.hpp @@ -458,19 +458,19 @@ Basis_HGRAD_TET_Cn_FEM( const ordinal_type order, using range_type = Kokkos::pair; switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_, basisDegree_ = this->basisDegree_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_TET_Cn_FEM::Serial::getValues( output, input, work, this->vinv_, this->basisDegree_); + Impl::Basis_HGRAD_TET_Cn_FEM::Serial::getValues( output, input, work, vinv_, basisDegree_); }); break; case OPERATOR_GRAD: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_, basisDegree_ = this->basisDegree_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_TET_Cn_FEM::Serial::getValues( output, input, work, this->vinv_, this->basisDegree_); + Impl::Basis_HGRAD_TET_Cn_FEM::Serial::getValues( output, input, work, vinv_, basisDegree_); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_TRI_Cn_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_TRI_Cn_FEMDef.hpp index c7b7a40cfa7b..e6b11aa87140 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_TRI_Cn_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_TRI_Cn_FEMDef.hpp @@ -408,27 +408,27 @@ Basis_HGRAD_TRI_Cn_FEM( const ordinal_type order, using range_type = Kokkos::pair; switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_, basisDegree_ = this->basisDegree_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_TRI_Cn_FEM::Serial::getValues( output, input, work, this->vinv_, this->basisDegree_); + Impl::Basis_HGRAD_TRI_Cn_FEM::Serial::getValues( output, input, work, vinv_, basisDegree_); }); break; case OPERATOR_GRAD: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_, basisDegree_ = this->basisDegree_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_TRI_Cn_FEM::Serial::getValues( output, input, work, this->vinv_, this->basisDegree_); + Impl::Basis_HGRAD_TRI_Cn_FEM::Serial::getValues( output, input, work, vinv_, basisDegree_); }); break; case OPERATOR_CURL: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_, basisDegree_ = this->basisDegree_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type(pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt,pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HGRAD_TRI_Cn_FEM::Serial::getValues( output, input, work, this->vinv_, this->basisDegree_); + Impl::Basis_HGRAD_TRI_Cn_FEM::Serial::getValues( output, input, work, vinv_, basisDegree_); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_HEX_Cn_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_HEX_Cn_FEMDef.hpp index 617eeb9cad84..3d3049c44e03 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_HEX_Cn_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_HEX_Cn_FEMDef.hpp @@ -351,11 +351,11 @@ namespace Intrepid2 { using range_type = Kokkos::pair; switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_, basisDegree_ = this->basisDegree_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HVOL_HEX_Cn_FEM::Serial::getValues( output, input, work, this->vinv_, this->basisDegree_); + Impl::Basis_HVOL_HEX_Cn_FEM::Serial::getValues( output, input, work, vinv_, basisDegree_); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_LINE_Cn_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_LINE_Cn_FEMDef.hpp index dc8f25d3cd7e..38ce394d20eb 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_LINE_Cn_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_LINE_Cn_FEMDef.hpp @@ -325,11 +325,11 @@ namespace Intrepid2 { switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HVOL_LINE_Cn_FEM::Serial::getValues( output, input, work, this->vinv_ ); + Impl::Basis_HVOL_LINE_Cn_FEM::Serial::getValues( output, input, work, vinv_ ); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_QUAD_Cn_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_QUAD_Cn_FEMDef.hpp index f492b6a65f7c..ae18d0ee7369 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_QUAD_Cn_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_QUAD_Cn_FEMDef.hpp @@ -317,11 +317,11 @@ namespace Intrepid2 { using range_type = Kokkos::pair; switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_, basisDegree_ = this->basisDegree_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HVOL_QUAD_Cn_FEM::Serial::getValues( output, input, work, this->vinv_, this->basisDegree_); + Impl::Basis_HVOL_QUAD_Cn_FEM::Serial::getValues( output, input, work, vinv_, basisDegree_); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_TET_Cn_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_TET_Cn_FEMDef.hpp index 7927a1e124f6..3fb8c2454755 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_TET_Cn_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_TET_Cn_FEMDef.hpp @@ -345,11 +345,11 @@ namespace Intrepid2 { using range_type = Kokkos::pair; switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HVOL_TET_Cn_FEM::Serial::getValues( output, input, work, this->vinv_); + Impl::Basis_HVOL_TET_Cn_FEM::Serial::getValues( output, input, work, vinv_); }); break; default: { diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_TRI_Cn_FEMDef.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_TRI_Cn_FEMDef.hpp index aa6f54065ff6..b703fd1d84b9 100644 --- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_TRI_Cn_FEMDef.hpp +++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HVOL_TRI_Cn_FEMDef.hpp @@ -337,11 +337,11 @@ Basis_HVOL_TRI_Cn_FEM( const ordinal_type order, using range_type = Kokkos::pair; switch(operatorType) { case OPERATOR_VALUE: - Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=] (ordinal_type& pt) { + Kokkos::parallel_for (Kokkos::TeamThreadRange (team_member, numPoints), [=, &vinv_ = this->vinv_] (ordinal_type& pt) { auto output = Kokkos::subview( outputValues, Kokkos::ALL(), range_type (pt,pt+1), Kokkos::ALL() ); const auto input = Kokkos::subview( inputPoints, range_type(pt, pt+1), Kokkos::ALL() ); WorkViewType work(workView.data() + sizePerPoint*team_member.team_rank(), sizePerPoint); - Impl::Basis_HVOL_TRI_Cn_FEM::Serial::getValues( output, input, work, this->vinv_); + Impl::Basis_HVOL_TRI_Cn_FEM::Serial::getValues( output, input, work, vinv_); }); break; default: {