From d3c0879b06eeb4359f84e7351887b673e288966b Mon Sep 17 00:00:00 2001
From: Fanny CHOPOT <fanny.chopot.ocre@cea.fr>
Date: Mon, 7 May 2018 17:05:46 +0200
Subject: [PATCH] corrections de Stephane et Emmanuel pour E
---
src/main.cpp | 2 +-
src/mesh/Mesh.hpp | 8 ++++----
src/scheme/FiniteVolumesDiffusion.hpp | 7 ++++++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 84cdf276d..be703b899 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
while((t<tmax) and (iteration<itermax)) {
//double dt = 0.4*acoustic_solver.acoustic_dt(Vj, cj);
- double dt = 0.4*finite_volumes_diffusion.diffusion_dt(rhoj, kj);
+ double dt = 0.8*finite_volumes_diffusion.diffusion_dt(rhoj, kj);
if (t+dt>tmax) {
dt=tmax-t;
diff --git a/src/mesh/Mesh.hpp b/src/mesh/Mesh.hpp
index 9de8bc118..a5ce53cca 100644
--- a/src/mesh/Mesh.hpp
+++ b/src/mesh/Mesh.hpp
@@ -50,7 +50,7 @@ public:
// pas constant
-
+ /*
Mesh(const Connectivity& connectivity)
: m_connectivity(connectivity),
m_xr("xr", connectivity.numberOfNodes())
@@ -60,11 +60,11 @@ public:
m_xr[r][0] = r*delta_x;
});
}
-
+*/
// pas non constant
- /*
+
Mesh(const Connectivity& connectivity)
: m_connectivity(connectivity),
m_xr("xr", connectivity.numberOfNodes())
@@ -85,7 +85,7 @@ public:
}
});
}
- */
+
~Mesh()
{
diff --git a/src/scheme/FiniteVolumesDiffusion.hpp b/src/scheme/FiniteVolumesDiffusion.hpp
index c9aeb725d..04558707e 100644
--- a/src/scheme/FiniteVolumesDiffusion.hpp
+++ b/src/scheme/FiniteVolumesDiffusion.hpp
@@ -127,9 +127,14 @@ private:
}
m_Gl(l) = (1./face_nb_cells(l))*Fl(l)*sum;
-
});
+ // C'est juste un test, mais ca devrait marcher
+ m_Gl(0) = 0;
+ m_Gl(m_mesh.numberOfFaces()-1) = 0;
+ // m_Gl(0) = 0.5*m_Gl(0);
+ // m_Gl(m_mesh.numberOfFaces()-1) = 0.5*m_Gl(m_mesh.numberOfFaces()-1);
+
return m_Gl ;
}
--
GitLab