From 14d7add0c060048858e988994b83157b95cf9625 Mon Sep 17 00:00:00 2001 From: Fanny CHOPOT <fanny.chopot.ocre@cea.fr> Date: Thu, 3 May 2018 08:56:54 +0200 Subject: [PATCH] =?UTF-8?q?correction=20moyenne=20de=20k=20par=20st=C3=A9p?= =?UTF-8?q?hane?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mesh/Mesh.hpp | 17 ++++++++++------- src/scheme/FiniteVolumesDiffusion.hpp | 5 ++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/mesh/Mesh.hpp b/src/mesh/Mesh.hpp index 1061d0afd..b2a8c9b10 100644 --- a/src/mesh/Mesh.hpp +++ b/src/mesh/Mesh.hpp @@ -57,7 +57,7 @@ public: // const double delta_x = 1./connectivity.numberOfCells(); // Kokkos::parallel_for(connectivity.numberOfNodes(), KOKKOS_LAMBDA(const int& r){ // m_xr[r][0] = r*delta_x; - // }); + // }); //} // pas non constant @@ -79,13 +79,16 @@ public: // pas non constant avec fonction x^2 - Mesh(const Connectivity& connectivity) - : m_connectivity(connectivity), - m_xr("xr", connectivity.numberOfNodes()) + 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)*(r*delta_x); + const double delta_x = 1./connectivity.numberOfCells(); + Kokkos::parallel_for(connectivity.numberOfNodes(), KOKKOS_LAMBDA(const int& r){ + m_xr[r][0] = r*delta_x; + }); + Kokkos::parallel_for(connectivity.numberOfNodes(), KOKKOS_LAMBDA(const int& r){ + m_xr[r][0] = m_xr[r][0]*m_xr[r][0]; }); } diff --git a/src/scheme/FiniteVolumesDiffusion.hpp b/src/scheme/FiniteVolumesDiffusion.hpp index adc46f041..789dfa04e 100644 --- a/src/scheme/FiniteVolumesDiffusion.hpp +++ b/src/scheme/FiniteVolumesDiffusion.hpp @@ -100,9 +100,8 @@ private: } // k = x - - m_Fl(l) = ((sum2*0.5)/Vl(l))*sum; - + // m_Fl(l) = ((sum2*0.5)/Vl(l))*sum; + m_Fl(l) = ((sum2/face_nb_cells(l))/Vl(l))*sum; // k = 2 //m_Fl(l)= (2./Vl(l))*sum; -- GitLab