Skip to content
Snippets Groups Projects
Commit a9da2bd1 authored by Fanny CHOPOT's avatar Fanny CHOPOT
Browse files

correction k regulier et ajout suite de fonctions k_n

parent ce8e30bf
No related branches found
No related tags found
No related merge requests found
......@@ -326,7 +326,7 @@ int main(int argc, char *argv[])
++iteration;
std::cout << "temps t : " << t << std::endl;
/*
// ECRITURE DANS UN FICHIER
if ((std::fmod(t,0.01) < 0.0001) or (t == tmax)) {
......@@ -545,6 +545,7 @@ int main(int argc, char *argv[])
riffout.close();
}
*/
// ENTROPY TEST
//finite_volumes_diffusion.entropie(unknowns);
......
......@@ -276,31 +276,35 @@ public:
//m_kj[j] = 0.5;
// Sod
double haut = 0.0028; // Re = 500
// k non regulier
/*
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
//m_kj[j] = 0.0028;
// Re = 1000
//m_kj[j] = 0.0014;
// Re = 2000
//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. ;
}
}
*/
// 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);
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment