Skip to content
Snippets Groups Projects
Commit aeebb372 authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

fixes compilation issues

parent 00f62504
No related branches found
No related tags found
No related merge requests found
...@@ -81,6 +81,7 @@ private: ...@@ -81,6 +81,7 @@ private:
const Kokkos::View<const unsigned int**>& cell_nodes = m_connectivity.cellNodes(); const Kokkos::View<const unsigned int**>& cell_nodes = m_connectivity.cellNodes();
const Kokkos::View<const unsigned short*> cell_nb_nodes const Kokkos::View<const unsigned short*> cell_nb_nodes
= m_connectivity.cellNbNodes(); = m_connectivity.cellNbNodes();
const Kokkos::View<const Rd*> xj = m_mesh_data.xj();
Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j) { Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j) {
for (int r=0; r<cell_nb_nodes[j]; ++r) { for (int r=0; r<cell_nb_nodes[j]; ++r) {
...@@ -132,7 +133,8 @@ private: ...@@ -132,7 +133,8 @@ private:
const Kokkos::View<const Rd*>& xj, const Kokkos::View<const Rd*>& xj,
const Kokkos::View<const double*>& rhoj, const Kokkos::View<const double*>& rhoj,
const Kokkos::View<const Rd*>& uj, 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; Kokkos::View<Rd**> Fjr = m_Fjr;
Fjr = computeFjr(Cjr, uj, xr, kj); Fjr = computeFjr(Cjr, uj, xr, kj);
Kokkos::View<Rd**> Gjr = m_Gjr; Kokkos::View<Rd**> Gjr = m_Gjr;
...@@ -140,10 +142,11 @@ private: ...@@ -140,10 +142,11 @@ private:
} }
Kokkos::View<Rd**> m_Fjr; Kokkos::View<Rd**> m_Fjr;
Kokkos::View<Rd**> m_Gjr;
Kokkos::View<double*> m_CFL; Kokkos::View<double*> m_CFL;
public: public:
DiffusionSolver(MeshData& mesh_data, FiniteVolumesDiffusion(MeshData& mesh_data,
UnknownsType& unknowns) UnknownsType& unknowns)
: m_mesh_data(mesh_data), : m_mesh_data(mesh_data),
m_mesh(mesh_data.mesh()), m_mesh(mesh_data.mesh()),
...@@ -162,6 +165,7 @@ public: ...@@ -162,6 +165,7 @@ public:
const Kokkos::View<const Rd*>& xr, const Kokkos::View<const Rd*>& xr,
const Kokkos::View<const Rd*>& kj) const { const Kokkos::View<const Rd*>& kj) const {
Kokkos::View<double*> dt_j("dt_j", m_mesh.numberOfCells()); 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){ 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))); 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: ...@@ -184,6 +188,8 @@ public:
Kokkos::View<double*> ej = unknowns.ej(); Kokkos::View<double*> ej = unknowns.ej();
Kokkos::View<double*> gammaj = unknowns.gammaj(); 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 Rd*> xj = m_mesh_data.xj();
const Kokkos::View<const double*> Vj = m_mesh_data.Vj(); const Kokkos::View<const double*> Vj = m_mesh_data.Vj();
const Kokkos::View<const Rd**> Cjr = m_mesh_data.Cjr(); const Kokkos::View<const Rd**> Cjr = m_mesh_data.Cjr();
...@@ -193,6 +199,7 @@ public: ...@@ -193,6 +199,7 @@ public:
computeExplicitFluxes(xr, xj, rhoj, uj, Cjr); computeExplicitFluxes(xr, xj, rhoj, uj, Cjr);
const Kokkos::View<const Rd**> Fjr = m_Fjr; 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 const Kokkos::View<const unsigned short*> cell_nb_nodes
= m_connectivity.cellNbNodes(); = m_connectivity.cellNbNodes();
const Kokkos::View<const unsigned int**>& cell_nodes const Kokkos::View<const unsigned int**>& cell_nodes
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment