Merge branch 'navier-stokes' of gitlab.delpinux.fr:code/pastis into navier-stokes

src/scheme/FiniteVolumesDiffusion.hpp

@@ -76,11 +76,11 @@ private:
   Kokkos::View<Rd**>  // Fonction qui calcule F_jr 
   computeFjr(const Kokkos::View<const Rd**>& Cjr,
 	     const Kokkos::View<const Rd*>& uj,
-	     const Kokkos::View<const Rd*>& xj,
 	     const Kokkos::View<const double*>& kj) {
     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) {
@@ -130,12 +130,12 @@ private:
   KOKKOS_INLINE_FUNCTION
   void computeExplicitFluxes(const Kokkos::View<const Rd*>& xr,
 			     const Kokkos::View<const Rd*>& xj,
-			     const Kokkos::View<const double*>& kj,
 			     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);
+    Fjr = computeFjr(Cjr, uj, kj);
     Kokkos::View<Rd**> Gjr = m_Gjr; 
     Gjr = computeGjr(uj, Fjr);
   }
@@ -162,9 +162,9 @@ public:
   KOKKOS_INLINE_FUNCTION
   double diffusion_dt(const Kokkos::View<const double*>& Vj,
 		      const Kokkos::View<const double*>& rhoj,
-		      const Kokkos::View<const Rd*>& xj,
 		      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)));
@@ -187,6 +187,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();