diff --git a/src/main.cpp b/src/main.cpp index e9db133da38122340acbc45578b80374093cf328..ea00be269b92e94efb1499f48a4553c962dd0f72 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -705,7 +705,7 @@ int main(int argc, char *argv[]) const Kokkos::View<const Rd*> xj = mesh_data.xj(); const Kokkos::View<const double*> rhoj = unknowns.rhoj(); double h = std::sqrt(1. - (tmax*tmax)/(50./9.)); - std::ofstream fout("rho"); + std::ofstream fout("rho_montee"); fout.precision(15); for (size_t j=0; j<mesh.numberOfCells(); ++j) { //fout << xj[j][0] << ' ' << rhoj[j] << ' ' << std::sqrt((3.*((xj[j][0]*xj[j][0])/(h*h)) + 100.)/100.)/h << '\n'; // kidder @@ -716,7 +716,7 @@ int main(int argc, char *argv[]) { // gnuplot output for pression const Kokkos::View<const Rd*> xj = mesh_data.xj(); const Kokkos::View<const double*> pj = unknowns.pj(); - std::ofstream fout("p"); + std::ofstream fout("p_montee"); fout.precision(15); for (size_t j=0; j<mesh.numberOfCells(); ++j) { fout << xj[j][0] << ' ' << pj[j] << '\n'; @@ -726,7 +726,7 @@ int main(int argc, char *argv[]) { // gnuplot output for pression total (no split) const Kokkos::View<const Rd*> xj = mesh_data.xj(); const Kokkos::View<const double*> PTj = unknowns.PTj(); - std::ofstream fout("pT"); + std::ofstream fout("pT_montee"); fout.precision(15); for (size_t j=0; j<mesh.numberOfCells(); ++j) { fout << xj[j][0] << ' ' << PTj[j] << '\n'; @@ -736,7 +736,7 @@ int main(int argc, char *argv[]) { // gnuplot output for internal energy const Kokkos::View<const Rd*> xj = mesh_data.xj(); const Kokkos::View<const double*> ej = unknowns.ej(); - std::ofstream fout("e"); + std::ofstream fout("e_montee"); fout.precision(15); for (size_t j=0; j<mesh.numberOfCells(); ++j) { fout << xj[j][0] << ' ' << ej[j] << '\n'; @@ -747,7 +747,7 @@ int main(int argc, char *argv[]) const Kokkos::View<const Rd*> xj = mesh_data.xj(); const Kokkos::View<const Rd*> uj = unknowns.uj(); double pi = 4.*std::atan(1.); - std::ofstream fout("u"); + std::ofstream fout("u_montee"); fout.precision(15); for (size_t j=0; j<mesh.numberOfCells(); ++j) { diff --git a/src/mesh/Mesh.hpp b/src/mesh/Mesh.hpp index 383c562b09cc2a6432f5de0e6f26bc852ee84e3f..ef331b12fd2bae711834c868f8710dda42aa67a4 100644 --- a/src/mesh/Mesh.hpp +++ b/src/mesh/Mesh.hpp @@ -83,7 +83,7 @@ public: m_xmax("xmax", 1) { double a = -1.; - double b = 2.; + double b = 2.5; m_x0[0][0] = a; m_xmax[0][0] = b; const double delta_x = (b-a)/connectivity.numberOfCells(); diff --git a/src/scheme/FiniteVolumesEulerUnknowns.hpp b/src/scheme/FiniteVolumesEulerUnknowns.hpp index 96278145bda4f445b14d73fbc2864671bccdb72a..b7ba56098c34816cd476696c88da7803a4475b4a 100644 --- a/src/scheme/FiniteVolumesEulerUnknowns.hpp +++ b/src/scheme/FiniteVolumesEulerUnknowns.hpp @@ -353,7 +353,7 @@ public: Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j){ // Differents k (xi) //m_kj[j] = xj[j][0]; - //m_kj[j] = 0.014; + m_kj[j] = 0.014; // TAC @@ -392,11 +392,11 @@ 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]; - + m_kj[j] = 0.00014*m_kj[j]; + */ }); @@ -408,8 +408,8 @@ public: m_uL[0] = zero; m_uR[0] = zero; - m_kL[0] = 0.; - m_kR[0] = 0.; + m_kL[0] = 0.014; + m_kR[0] = 0.014; Kokkos::parallel_for(m_mesh.numberOfCells(), KOKKOS_LAMBDA(const int& j){