diff --git a/src/main.cpp b/src/main.cpp index 6325e25b9ce7f4d9c4df53411a87afe44b36db32..bd60e1b5b32e2b5af03263710544ed3539fabeec 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -249,12 +249,13 @@ int main(int argc, char *argv[]) std::ofstream diff("diffinter"); diff.precision(5); for (size_t j=0; j<mesh.numberOfCells(); ++j) { - //diff << std::fixed << xj[j][0] << ' ' << std::fixed << kj[j] << '\n'; - if (kj[j]>0.) { + diff << std::fixed << xj[j][0] << ' ' << std::fixed << kj[j] << '\n'; + /* if (kj[j]>0.) { diff << std::fixed << xj[j][0] << ' ' << std::fixed << 4. << '\n'; } else { diff << std::fixed << xj[j][0] << ' ' << std::fixed << -0.1 << '\n'; } + */ } diff.close(); @@ -542,9 +543,9 @@ int main(int argc, char *argv[]) } riffint.close(); riffout.close(); - + } - + // ENTROPY TEST //finite_volumes_diffusion.entropie(unknowns); diff --git a/src/scheme/FiniteVolumesEulerUnknowns.hpp b/src/scheme/FiniteVolumesEulerUnknowns.hpp index 4d7285575823452a3fd3bda1bfec6981f03ef701..93db2b27880c0cc2084c87016648d5f3ec71a201 100644 --- a/src/scheme/FiniteVolumesEulerUnknowns.hpp +++ b/src/scheme/FiniteVolumesEulerUnknowns.hpp @@ -274,11 +274,16 @@ public: Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j){ //m_kj[j] = xj[j][0]; //m_kj[j] = 0.5; - + + // Sod + double haut = 0.0028; // Re = 500 if (xj[j][0]<0.7) { m_kj[j]=0.; } else { if (xj[j][0]<0.9){ + + // k non regulier + // Re = 28 // m_kj[j]=0.05; // Re = 500 @@ -286,7 +291,12 @@ public: // Re = 1000 //m_kj[j] = 0.0014; // Re = 2000 - m_kj[j] = 0.0007; + //m_kj[j] = 0.0007; + + // k regulier + + m_kj[j] = (haut*std::exp(100))*std::exp(-1./(0.1*0.1-(xj[j][0]-0.8)*(xj[j][0]-0.8))); + } else { m_kj[j]=0. ; }