diff --git a/src/main.cpp b/src/main.cpp index 4fea916dc4a45f3c6ad4b795031d1a1e3cd30e39..b37ac81c4bd53001a1fef10747d60f52e44515a9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) } acoustic_solver.computeNextStep(t,dt_euler, unknowns); t += dt_euler; - /* + // ETAPE 2 DU SPLITTING - DIFFUSION double dt_diff = 0.4*finite_volumes_diffusion.diffusion_dt(rhoj, kj); @@ -196,7 +196,7 @@ int main(int argc, char *argv[]) } std::cout << "diff : " << t_diff << std::endl; } - */ + // DIFFUSION PURE diff --git a/src/mesh/Mesh.hpp b/src/mesh/Mesh.hpp index 88d07408a087b96e98e832d5a189b257fe402e95..d73852a87ef3b8e88744d05f0fda7470d0132707 100644 --- a/src/mesh/Mesh.hpp +++ b/src/mesh/Mesh.hpp @@ -85,8 +85,7 @@ public: } }); } - - */ +*/ ~Mesh() { diff --git a/src/scheme/FiniteVolumesDiffusion.hpp b/src/scheme/FiniteVolumesDiffusion.hpp index b4a794d0f5c254ba72014096d40cccc70ab97736..9f34d06e6ed8fb5be43b10b6927c6767c2898448 100644 --- a/src/scheme/FiniteVolumesDiffusion.hpp +++ b/src/scheme/FiniteVolumesDiffusion.hpp @@ -278,6 +278,10 @@ public: Kokkos::View<double*> kL = unknowns.kL(); Kokkos::View<double*> kR = unknowns.kR(); + Kokkos::View<const Rd*> xr = m_mesh.xr(); + + uR[0] = (-t/((50./9.)-t*t))*xr[m_mesh.numberOfNodes()-1]; + const Kokkos::View<const Rd*> xj = m_mesh_data.xj(); const Kokkos::View<const double*> Vj = m_mesh_data.Vj(); const Kokkos::View<const Rd**> Cjr = m_mesh_data.Cjr(); @@ -307,8 +311,12 @@ public: } uj[j] += (dt*inv_mj[j]) * momentum_fluxes; + Ej[j] += (dt*inv_mj[j]) * energy_fluxes; //uj[j] += std::exp(-t)*(dt*inv_mj[j])*Vj(j)*Sj(j) + (dt*inv_mj[j]) * momentum_fluxes; // test avec k non constant - Ej[j] += (dt*inv_mj[j]) * energy_fluxes; + + // ajout second membre pour kidder (k non constant) + uj[j][0] += (dt*inv_mj[j])*Vj(j)*(t/((50./9.)-t*t)); + Ej[j] -= (dt*inv_mj[j])*Vj(j)*((2*xj[j][0]*t*t)/(((50./9.)-t*t)*((50./9.)-t*t))); }); diff --git a/src/scheme/FiniteVolumesEulerUnknowns.hpp b/src/scheme/FiniteVolumesEulerUnknowns.hpp index 075fedf94608e6329c8da6fda9ead9d81a9a4e80..00c465f1eb612c8a26280e699199e2818e9dd1c4 100644 --- a/src/scheme/FiniteVolumesEulerUnknowns.hpp +++ b/src/scheme/FiniteVolumesEulerUnknowns.hpp @@ -236,14 +236,14 @@ public: }); Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j){ - m_kj[j] = 1.; + m_kj[j] = xj[j][0]; }); // Conditions aux bords de Dirichlet sur u et k m_uL[0] = zero; m_uR[0] = zero; - m_kL[0] = 1.; + m_kL[0] = 0.; m_kR[0] = 1.; }