Skip to content
Snippets Groups Projects
Commit 4317bfc6 authored by Fanny CHOPOT's avatar Fanny CHOPOT
Browse files

Correction bugs

parent f1629840
No related branches found
No related tags found
No related merge requests found
...@@ -76,7 +76,7 @@ private: ...@@ -76,7 +76,7 @@ private:
Kokkos::View<Rd**> // Fonction qui calcule F_jr Kokkos::View<Rd**> // Fonction qui calcule F_jr
computeFjr(const Kokkos::View<const Rd**>& Cjr, computeFjr(const Kokkos::View<const Rd**>& Cjr,
const Kokkos::View<const Rd*>& uj, const Kokkos::View<const Rd*>& uj,
const Kokkos::View<const Rd*>& xr, const Kokkos::View<const Rd*>& xj,
const Kokkos::View<const double*>& kj) { const Kokkos::View<const double*>& kj) {
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
...@@ -141,6 +141,7 @@ private: ...@@ -141,6 +141,7 @@ 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:
...@@ -150,6 +151,7 @@ public: ...@@ -150,6 +151,7 @@ public:
m_mesh(mesh_data.mesh()), m_mesh(mesh_data.mesh()),
m_connectivity(m_mesh.connectivity()), m_connectivity(m_mesh.connectivity()),
m_Fjr("Fjr", m_mesh.numberOfCells(), m_connectivity.maxNbNodePerCell()), m_Fjr("Fjr", m_mesh.numberOfCells(), m_connectivity.maxNbNodePerCell()),
m_Gjr("Gjr", m_mesh.numberOfCells(), m_connectivity.maxNbNodePerCell()),
m_CFL("CFL", m_mesh.numberOfCells()) m_CFL("CFL", m_mesh.numberOfCells())
{ {
; ;
...@@ -160,7 +162,7 @@ public: ...@@ -160,7 +162,7 @@ public:
KOKKOS_INLINE_FUNCTION KOKKOS_INLINE_FUNCTION
double diffusion_dt(const Kokkos::View<const double*>& Vj, double diffusion_dt(const Kokkos::View<const double*>& Vj,
const Kokkos::View<const double*>& rhoj, const Kokkos::View<const double*>& rhoj,
const Kokkos::View<const Rd*>& xr, const Kokkos::View<const Rd*>& xj,
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());
...@@ -174,7 +176,7 @@ public: ...@@ -174,7 +176,7 @@ public:
return dt; return dt;
} }
// Avance la valeur des inconnues pendant un pas de temps dt // A MODIFIER // Avance la valeur des inconnues pendant un pas de temps dt
void computeNextStep(const double& t, const double& dt, void computeNextStep(const double& t, const double& dt,
UnknownsType& unknowns) UnknownsType& unknowns)
{ {
...@@ -194,6 +196,7 @@ public: ...@@ -194,6 +196,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