diff --git a/src/main.cpp b/src/main.cpp index 76e2d0319c4a1b7dc302a347a91c7454562bc1e3..185991619e0a0ad2be2651a3434a84c034854653 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -160,7 +160,7 @@ int main(int argc, char *argv[]) double c = 0.; c = finite_volumes_diffusion.conservatif(unknowns); - + /* // Ecriture des valeurs initiales dans un fichier const Kokkos::View<const Rd*> xj = mesh_data.xj(); @@ -249,16 +249,15 @@ 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(); - + */ while((t<tmax) and (iteration<itermax)) { diff --git a/src/scheme/FiniteVolumesEulerUnknowns.hpp b/src/scheme/FiniteVolumesEulerUnknowns.hpp index 007f548e47252145ba3ee8c4b1c65c4ecc3c0ca3..ce20a99488818315962db956c15343c1f587785b 100644 --- a/src/scheme/FiniteVolumesEulerUnknowns.hpp +++ b/src/scheme/FiniteVolumesEulerUnknowns.hpp @@ -287,6 +287,9 @@ public: // Re = 28 // m_kj[j]=0.05; + // Re = 100 + //m_kj[j] = 0.014; + // Re = 500 //m_kj[j] = 0.0028; @@ -295,7 +298,13 @@ public: // Re = 2000 //m_kj[j] = 0.0007; - + + // Re = 10 000 + m_kj[j] = 0.00014; + + // Re = 100 000 + //m_kj[j] = 0.000014; + } else { m_kj[j]=0. ; } @@ -305,6 +314,7 @@ public: // k regulier int n = 1.; m_kj[j] = std::exp(1.)*std::exp(-1./(1.-( (xj[j][0]-(0.7+0.1/n)) / (0.1/n) )*( (xj[j][0]-(0.7+0.1/n)) / (0.1/n) ))) * (xj[j][0]>0.7)*(xj[j][0]<0.7+0.1/n) + std::exp(1.)*std::exp(-1./(1.-( (xj[j][0]-(0.9-0.1/n)) / (0.1/n) )*( (xj[j][0]-(0.9-0.1/n)) / (0.1/n) ))) * (xj[j][0]>0.9-0.1/n)*(xj[j][0]<0.9) + (xj[j][0]>0.7+0.1/n)*(xj[j][0]<0.9-0.1/n); + m_kj[j] = 0.014*m_kj[j]; });