diff --git a/src/mesh/Mesh.hpp b/src/mesh/Mesh.hpp index 04f018e340ad7fb9956556739c301fdc6b8911e0..238a2adb4058c9a564f8f88bd344eb4d27ac8217 100644 --- a/src/mesh/Mesh.hpp +++ b/src/mesh/Mesh.hpp @@ -48,16 +48,35 @@ public: return m_xr; } - Mesh(const Connectivity& connectivity) - : m_connectivity(connectivity), - m_xr("xr", connectivity.numberOfNodes()) + // pas constant + + Mesh(const Connectivity& connectivity) + : m_connectivity(connectivity), + m_xr("xr", connectivity.numberOfNodes()) { const double delta_x = 1./connectivity.numberOfCells(); Kokkos::parallel_for(connectivity.numberOfNodes(), KOKKOS_LAMBDA(const int& r){ - m_xr[r][0] = r*delta_x; + m_xr[r][0] = r*delta_x; }); } + // pas non constant + + //Mesh(const Connectivity& connectivity) + // : m_connectivity(connectivity), + // m_xr("xr", connectivity.numberOfNodes()) + //{ + // const double delta_x = 1./connectivity.numberOfCells(); + // Kokkos::parallel_for(connectivity.numberOfNodes(), KOKKOS_LAMBDA(const int& r){ + // if (r%2 == 0) { + // m_xr[r][0] = r*delta_x; + // } + // else { + // m_xr[r][0] = (r*2+1)*0.5*delta_x; + // } + // }); + //} + ~Mesh() { ; diff --git a/src/scheme/FiniteVolumesDiffusion.hpp b/src/scheme/FiniteVolumesDiffusion.hpp index a9215d59410373e49daabbe3be1b31fcd0719b59..1af81019ebb395d508b6ab34097e3579801f4a69 100644 --- a/src/scheme/FiniteVolumesDiffusion.hpp +++ b/src/scheme/FiniteVolumesDiffusion.hpp @@ -206,8 +206,8 @@ public: for (int ll=0; ll<cell_nb_faces(j); ++ll) { minVl = std::min(minVl, Vl(cell_faces(j, ll))); } - // k=1 => (kj(j+1) + 2*kj(j) + kj(j-1)) = 4 - dt_j[j]= 0.5*rhoj(j)*Vj(j)*(2./4.)*minVl; + // k=2 => (kj(j+1) + 2*kj(j) + kj(j-1)) = 8 + dt_j[j]= 0.5*rhoj(j)*Vj(j)*(2./8.)*minVl; }); // for (int j=0; j<m_mesh.numberOfCells(); ++j) {