From a5659429efa75be2b5417f2e285105e187fdcb0b Mon Sep 17 00:00:00 2001
From: Fanny CHOPOT <fanny.chopot.ocre@cea.fr>
Date: Mon, 18 Jun 2018 10:46:23 +0200
Subject: [PATCH] verification convergence de k_n et mise en commentaire des
fichiers-films
---
src/main.cpp | 9 ++++-----
src/scheme/FiniteVolumesEulerUnknowns.hpp | 12 +++++++++++-
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 76e2d0319..185991619 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 007f548e4..ce20a9948 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];
});
--
GitLab