From 3e5d06eaa9a83ec48396723a8a58823de0f0005b Mon Sep 17 00:00:00 2001 From: Fanny CHOPOT <fanny.chopot.ocre@cea.fr> Date: Fri, 27 Apr 2018 13:36:32 +0200 Subject: [PATCH] test avec k = 2 et rho = 1, OK --- src/main.cpp | 4 +++- src/scheme/FiniteVolumesDiffusion.hpp | 4 ++-- src/scheme/FiniteVolumesEulerUnknowns.hpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e4df1a5e7..e9745cc6f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -184,10 +184,12 @@ int main(int argc, char *argv[]) double pi = 4.*std::atan(1.); std::ofstream fout("comparaison u"); for (size_t j=0; j<mesh.numberOfCells(); ++j) { - fout << xj[j][0] << ' ' << uj[j][0] << ' ' << std::sin(pi*xj[j][0])*std::exp(-pi*pi*0.2) <<'\n'; + fout << xj[j][0] << ' ' << uj[j][0] << ' ' << std::sin(pi*xj[j][0])*std::exp(-2.*pi*pi*0.2) <<'\n'; } } + + } Kokkos::finalize(); diff --git a/src/scheme/FiniteVolumesDiffusion.hpp b/src/scheme/FiniteVolumesDiffusion.hpp index 74e59d14f..a9215d594 100644 --- a/src/scheme/FiniteVolumesDiffusion.hpp +++ b/src/scheme/FiniteVolumesDiffusion.hpp @@ -100,9 +100,9 @@ private: //Fl(l) = ((kj(cell_nodes(j,r)) + kj(cell_nodes(j-1,r)))/(2*Vl(j))) //* ((uj(j,r),Cjr(j,r))+ (uj(j-1,r),Cjr(j-1,r))) ; //tensorProduct(uj(j,r),Cjr(j,r)) ? - // k = 1 + // k = 2 - m_Fl(l)= (1./Vl(l))*sum; + m_Fl(l)= (2./Vl(l))*sum; }); diff --git a/src/scheme/FiniteVolumesEulerUnknowns.hpp b/src/scheme/FiniteVolumesEulerUnknowns.hpp index 6d019c0c0..14e248ac5 100644 --- a/src/scheme/FiniteVolumesEulerUnknowns.hpp +++ b/src/scheme/FiniteVolumesEulerUnknowns.hpp @@ -222,7 +222,7 @@ void initializeSod() }); Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j){ - m_kj[j] = 1; + m_kj[j] = 2; }); } -- GitLab