From f9e20c3f35f519b5322abda244d197f564d23500 Mon Sep 17 00:00:00 2001 From: Fanny CHOPOT <fanny.chopot.ocre@cea.fr> Date: Fri, 1 Jun 2018 08:53:50 +0200 Subject: [PATCH] prise en compte du mouvement du maillage dans les animations --- src/main.cpp | 10 +++++----- src/scheme/FiniteVolumesEulerUnknowns.hpp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index c8b6fe135..2225d80d2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) const Kokkos::View<const double*> Vj = mesh_data.Vj(); const Kokkos::View<const Rd**> Cjr = mesh_data.Cjr(); - const double tmax=0.5; + const double tmax=0.2; double t=0.; int itermax=std::numeric_limits<int>::max(); @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) Kokkos::View<double*> gammaj = unknowns.gammaj(); Kokkos::View<double*> cj = unknowns.cj(); Kokkos::View<double*> kj = unknowns.kj(); - + Kokkos::View<Rd*> uj = unknowns.uj(); BlockPerfectGas block_eos(rhoj, ej, pj, gammaj, cj); double c = 0.; @@ -188,7 +188,7 @@ int main(int argc, char *argv[]) t += dt_euler; // ETAPE 2 DU SPLITTING - DIFFUSION - + /* double dt_diff = 0.4*finite_volumes_diffusion.diffusion_dt(rhoj, kj, cj); if (dt_euler <= dt_diff) { @@ -205,7 +205,7 @@ int main(int argc, char *argv[]) t_diff += dt_diff; } } - + */ // DIFFUSION PURE /* @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) //fout << ligne << ' ' << std::fixed << t << '\n'; for (size_t j = 0; j<mesh.numberOfCells(); ++j) { getline(fint, ligne); - fout << ligne << ' ' << std::fixed << rhoj[j] << '\n'; + fout << ligne << ' ' << std::fixed << xj[j][0] << ' ' << std::fixed << rhoj[j] << '\n'; } fint.close(); fout.close(); diff --git a/src/scheme/FiniteVolumesEulerUnknowns.hpp b/src/scheme/FiniteVolumesEulerUnknowns.hpp index 34e9e84a8..3579c7d7a 100644 --- a/src/scheme/FiniteVolumesEulerUnknowns.hpp +++ b/src/scheme/FiniteVolumesEulerUnknowns.hpp @@ -192,7 +192,7 @@ public: Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j){ if (xj[j][0]<0.5) { - m_rhoj[j]=1; + m_rhoj[j]=1.; } else { m_rhoj[j]=0.125; } @@ -242,9 +242,9 @@ public: m_kj[j]=0.; } else { if (xj[j][0]<0.9){ - m_kj[j]=0.5; - } else { m_kj[j]=0.; + } else { + m_kj[j]=0. ; } } }); -- GitLab