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

tentative avec ur solveur de Riemann dans d_x u, SIGFPE

parent 75128932
Branches
No related tags found
No related merge requests found
...@@ -73,7 +73,7 @@ public: ...@@ -73,7 +73,7 @@ public:
return m_xmax; return m_xmax;
} }
/*
// pas constant // pas constant
Mesh(const Connectivity& connectivity) Mesh(const Connectivity& connectivity)
...@@ -91,7 +91,7 @@ public: ...@@ -91,7 +91,7 @@ public:
m_xr[r][0] = a + r*delta_x; m_xr[r][0] = a + r*delta_x;
}); });
} }
*/
// pas non constant // pas non constant
/* /*
...@@ -125,7 +125,7 @@ public: ...@@ -125,7 +125,7 @@ public:
// pas aleatoire // pas aleatoire
/*
Mesh(const Connectivity& connectivity) Mesh(const Connectivity& connectivity)
: m_connectivity(connectivity), : m_connectivity(connectivity),
m_xr("xr", connectivity.numberOfNodes()), m_xr("xr", connectivity.numberOfNodes()),
...@@ -160,7 +160,7 @@ public: ...@@ -160,7 +160,7 @@ public:
//std::exit(0); //std::exit(0);
} }
*/
~Mesh() ~Mesh()
......
...@@ -393,7 +393,7 @@ public: ...@@ -393,7 +393,7 @@ public:
PTj(j) = pj(j) - kj(j)*2.*sum/sum1; PTj(j) = pj(j) - kj(j)*2.*sum/sum1;
} }
*/ */
/*
// Calcul de PT (2eme essai, symetrisation) // Calcul de PT (2eme essai, symetrisation)
const Kokkos::View<const unsigned int**>& face_cells = m_connectivity.faceCells(); const Kokkos::View<const unsigned int**>& face_cells = m_connectivity.faceCells();
const Kokkos::View<const unsigned short*> face_nb_cells const Kokkos::View<const unsigned short*> face_nb_cells
...@@ -422,10 +422,22 @@ public: ...@@ -422,10 +422,22 @@ public:
PTj(j) = pj(j) + kj(j)*(t/((50./9.)-t*t)); PTj(j) = pj(j) + kj(j)*(t/((50./9.)-t*t));
//PTj(j) = pj(j) - kj(j)*(uR[0][0]-uj[j][0])/Vl(m_mesh.numberOfFaces()-1); //PTj(j) = pj(j) - kj(j)*(uR[0][0]-uj[j][0])/Vl(m_mesh.numberOfFaces()-1);
} else { } else {
//PTj(j) = pj(j) - kj(j)*(stock[1]-stock[0])/Vj(j);
PTj(j) = pj(j) - kj(j)*(stock[1]-stock[0])/Vj(j); PTj(j) = pj(j) - kj(j)*(stock[1]-stock[0])/Vj(j);
} }
*/
// Calcul de PT (3eme essai, avec uR du solveur de Riemann)
Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j) {
if (j == 0) {
//PTj(j) = pj(j) - kj(j)*(uj[j][0]-uL[0][0])/Vl(0);
PTj(j) = pj(j) + kj(j)*(t/((50./9.)-t*t));
} else if (j == m_mesh.numberOfCells()-1) {
PTj(j) = pj(j) + kj(j)*(t/((50./9.)-t*t));
//PTj(j) = pj(j) - kj(j)*(uR[0][0]-uj[j][0])/Vl(m_mesh.numberOfFaces()-1);
} else {
PTj(j) = pj(j) - kj(j)*(ur[cell_nodes(j,1)][0]-ur[cell_nodes(j,0)][0])/Vj(j);
}
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment