From 8cfd476bd9c95dfd20c65f5a26778bccbfdd42cc Mon Sep 17 00:00:00 2001 From: Fanny CHOPOT <fanny.chopot.ocre@cea.fr> Date: Mon, 25 Jun 2018 09:54:42 +0200 Subject: [PATCH] correction membre source pour equation E avec transfert thermique en diffusion pure --- src/scheme/FiniteVolumesDiffusion.hpp | 4 ++-- src/scheme/FiniteVolumesEulerUnknowns.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scheme/FiniteVolumesDiffusion.hpp b/src/scheme/FiniteVolumesDiffusion.hpp index 7b0ffa5e5..0fb6058a1 100644 --- a/src/scheme/FiniteVolumesDiffusion.hpp +++ b/src/scheme/FiniteVolumesDiffusion.hpp @@ -216,7 +216,7 @@ private: const Kokkos::View<const double*>& Vl = m_mesh_data.Vl(); const Kokkos::View<const double*>& Vj = m_mesh_data.Vj(); - + Kokkos::parallel_for(m_mesh.numberOfFaces(), KOKKOS_LAMBDA(const int& l) { Rd sum = zero; double sum2 = 0.; @@ -431,7 +431,7 @@ public: // test k non cst pour diff pure uj[j] += std::exp(-t)*(dt*inv_mj[j])*Vj(j)*(std::sin(pi*xj[j][0])*(pi*pi*xj[j][0]-1.) - std::cos(xj[j][0]*pi)*pi); - Ej[j] -= ((pi*pi*0.5*(std::sin(pi*xj[j][0])*std::sin(pi*xj[j][0])-std::cos(pi*xj[j][0])*std::cos(pi*xj[j][0])) + pi*pi*pi*std::cos(xj[j][0])*std::sin(xj[j][0]))*(std::exp(-2.*t)-1.) - pi*0.5*std::exp(-2.*t)*std::cos(xj[j][0])*std::sin(xj[j][0]) + (1.+ xj[j][0])*( (2*pi*pi*pi*std::cos(xj[j][0])*std::sin(xj[j][0])-4*std::pow(pi,4)*(std::sin(xj[j][0])*std::sin(xj[j][0])-std::cos(xj[j][0])*std::cos(xj[j][0])))*(std::exp(-2.*t)-1.) + pi*pi*0.5*std::exp(-2.*t)*(std::sin(xj[j][0])*std::sin(xj[j][0])-std::cos(xj[j][0])*std::cos(xj[j][0]))))*(dt*inv_mj[j])*Vj(j); + Ej[j] -= ((pi*pi*0.5*(std::sin(pi*xj[j][0])*std::sin(pi*xj[j][0])-std::cos(pi*xj[j][0])*std::cos(pi*xj[j][0])) + xj[j][0]*pi*pi*pi*std::cos(pi*xj[j][0])*std::sin(pi*xj[j][0]))*(std::exp(-2.*t)-1.) - pi*0.5*std::exp(-2.*t)*std::cos(pi*xj[j][0])*std::sin(pi*xj[j][0]) + (1.+xj[j][0])*((3.*pi*pi*pi*std::cos(pi*xj[j][0])*std::sin(pi*xj[j][0])-xj[j][0]*pi*pi*pi*pi*(std::sin(pi*xj[j][0])*std::sin(pi*xj[j][0])-std::cos(pi*xj[j][0])*std::cos(pi*xj[j][0])))*(std::exp(-2.*t)-1.)+0.5*pi*pi*std::exp(-2.*t)*(std::sin(pi*xj[j][0])*std::sin(pi*xj[j][0])-std::cos(pi*xj[j][0])*std::cos(pi*xj[j][0]))))*(dt*inv_mj[j])*Vj(j); // ajout second membre pour kidder (k = 0.5) //Ej[j] -= (dt*inv_mj[j])*Vj(j)*((0.5*t*t)/(((50./9.)-t*t)*((50./9.)-t*t))); diff --git a/src/scheme/FiniteVolumesEulerUnknowns.hpp b/src/scheme/FiniteVolumesEulerUnknowns.hpp index 334450d06..b1750d2d5 100644 --- a/src/scheme/FiniteVolumesEulerUnknowns.hpp +++ b/src/scheme/FiniteVolumesEulerUnknowns.hpp @@ -459,7 +459,7 @@ public: m_Tj[j] = 2 - 0.5*std::sin(pi*xj[j][0])*std::sin(pi*xj[j][0]); // k = x }); - // Conditions aux bords de Dirichlet sur u et k + // Conditions aux bords de Dirichlet sur T et nu m_TL[0] = 2.; m_TR[0] = 2.; -- GitLab