From ce8e30bf76f8bd5f2b117aaed0fb996de0a68c8c Mon Sep 17 00:00:00 2001
From: Fanny CHOPOT <fanny.chopot.ocre@cea.fr>
Date: Wed, 13 Jun 2018 14:22:09 +0200
Subject: [PATCH] ajout cas k regulier
---
src/main.cpp | 9 +++++----
src/scheme/FiniteVolumesEulerUnknowns.hpp | 14 ++++++++++++--
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 6325e25b9..bd60e1b5b 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 4d7285575..93db2b278 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. ;
}
--
GitLab