From aeebb3727ffdf8135c4a09d1ae0f1b45643ac212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Del=20Pino?= <stephane.delpino44@gmail.com>
Date: Tue, 24 Apr 2018 11:54:46 +0200
Subject: [PATCH] fixes compilation issues
---
src/scheme/FiniteVolumesDiffusion.hpp | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/scheme/FiniteVolumesDiffusion.hpp b/src/scheme/FiniteVolumesDiffusion.hpp
index d86dcff3f..5442e184d 100644
--- a/src/scheme/FiniteVolumesDiffusion.hpp
+++ b/src/scheme/FiniteVolumesDiffusion.hpp
@@ -81,6 +81,7 @@ private:
const Kokkos::View<const unsigned int**>& cell_nodes = m_connectivity.cellNodes();
const Kokkos::View<const unsigned short*> cell_nb_nodes
= m_connectivity.cellNbNodes();
+ const Kokkos::View<const Rd*> xj = m_mesh_data.xj();
Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j) {
for (int r=0; r<cell_nb_nodes[j]; ++r) {
@@ -132,7 +133,8 @@ private:
const Kokkos::View<const Rd*>& xj,
const Kokkos::View<const double*>& rhoj,
const Kokkos::View<const Rd*>& uj,
- const Kokkos::View<const Rd**>& Cjr) {
+ const Kokkos::View<const Rd**>& Cjr,
+ const Kokkos::View<const double*>& kj) {
Kokkos::View<Rd**> Fjr = m_Fjr;
Fjr = computeFjr(Cjr, uj, xr, kj);
Kokkos::View<Rd**> Gjr = m_Gjr;
@@ -140,11 +142,12 @@ private:
}
Kokkos::View<Rd**> m_Fjr;
+ Kokkos::View<Rd**> m_Gjr;
Kokkos::View<double*> m_CFL;
public:
- DiffusionSolver(MeshData& mesh_data,
- UnknownsType& unknowns)
+ FiniteVolumesDiffusion(MeshData& mesh_data,
+ UnknownsType& unknowns)
: m_mesh_data(mesh_data),
m_mesh(mesh_data.mesh()),
m_connectivity(m_mesh.connectivity()),
@@ -162,6 +165,7 @@ public:
const Kokkos::View<const Rd*>& xr,
const Kokkos::View<const Rd*>& kj) const {
Kokkos::View<double*> dt_j("dt_j", m_mesh.numberOfCells());
+ const Kokkos::View<const Rd*> xj = m_mesh_data.xj();
Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j){
m_CFL(j) = rhoj(j)*Vj(j)*min(xj(j+1)-xj(j), xj(j)-xj(j-1))*(2./(kj(j+1) + 2*kj(j) + kj(j-1)));
@@ -184,6 +188,8 @@ public:
Kokkos::View<double*> ej = unknowns.ej();
Kokkos::View<double*> gammaj = unknowns.gammaj();
+ const Kokkos::View<const double*> kj = unknowns.kj();
+
const Kokkos::View<const Rd*> xj = m_mesh_data.xj();
const Kokkos::View<const double*> Vj = m_mesh_data.Vj();
const Kokkos::View<const Rd**> Cjr = m_mesh_data.Cjr();
@@ -193,6 +199,7 @@ public:
computeExplicitFluxes(xr, xj, rhoj, uj, Cjr);
const Kokkos::View<const Rd**> Fjr = m_Fjr;
+ const Kokkos::View<const Rd**> Gjr = m_Gjr;
const Kokkos::View<const unsigned short*> cell_nb_nodes
= m_connectivity.cellNbNodes();
const Kokkos::View<const unsigned int**>& cell_nodes
--
GitLab