Skip to content
Snippets Groups Projects
Commit 2d79d705 authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Few preparation clean-up

parent 558ef016
No related branches found
No related tags found
No related merge requests found
#ifndef ACOUSTIC_SOLVER_HPP
#define ACOUSTIC_SOLVER_HPP
namespace RawKokkosAcousticSolver
{
void SodAcousticSolver(const long int& nj);
}
#endif // ACOUSTIC_SOLVER_HPP
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../packages/kokkos EXCLUDE_FROM_ALL)
include_directories(${Kokkos_INCLUDE_DIRS_RET}) include_directories(${Kokkos_INCLUDE_DIRS_RET})
include_directories(${PASTIS_SOURCE_DIR}/packages/rang/include) include_directories(${PASTIS_SOURCE_DIR}/packages/rang/include)
...@@ -9,7 +8,7 @@ include_directories(${PASTIS_SOURCE_DIR}/packages/rang/include) ...@@ -9,7 +8,7 @@ include_directories(${PASTIS_SOURCE_DIR}/packages/rang/include)
add_library( add_library(
PastisExperimental PastisExperimental
AcousticSolver.cpp RawKokkosAcousticSolver.cpp
) )
#include <AcousticSolver.hpp> #include <RawKokkosAcousticSolver.hpp>
#include <Kokkos_Core.hpp> #include <Kokkos_Core.hpp>
#include <rang.hpp> #include <rang.hpp>
namespace RawKokkosAcousticSolver namespace RawKokkos
{ {
inline double e(double rho, double p, double gamma) inline double e(double rho, double p, double gamma)
...@@ -114,7 +114,7 @@ void computeExplicitFluxes(const Kokkos::View<double*>& xr, ...@@ -114,7 +114,7 @@ void computeExplicitFluxes(const Kokkos::View<double*>& xr,
} }
void SodAcousticSolver(const long int& nj) void AcousticSolver(const long int& nj)
{ {
Kokkos::View<double*> xj("xj", nj); Kokkos::View<double*> xj("xj", nj);
Kokkos::View<double*> rhoj("rhoj", nj); Kokkos::View<double*> rhoj("rhoj", nj);
......
#ifndef RAW_KOKKOS_ACOUSTIC_SOLVER_HPP
#define RAW_KOKKOS_ACOUSTIC_SOLVER_HPP
namespace RawKokkos
{
void AcousticSolver(const long int& nj);
}
#endif // RAW_KOKKOS_ACOUSTIC_SOLVER_HPP
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <SignalManager.hpp> #include <SignalManager.hpp>
#include <ConsoleManager.hpp> #include <ConsoleManager.hpp>
#include <AcousticSolver.hpp> #include <RawKokkosAcousticSolver.hpp>
#include <CLI/CLI.hpp> #include <CLI/CLI.hpp>
#include <cassert> #include <cassert>
...@@ -75,7 +75,7 @@ int main(int argc, char *argv[]) ...@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
Kokkos::Timer timer; Kokkos::Timer timer;
timer.reset(); timer.reset();
RawKokkosAcousticSolver::SodAcousticSolver(number); RawKokkos::AcousticSolver(number);
double count_time = timer.seconds(); double count_time = timer.seconds();
std::cout << "* Execution time: " << rang::style::bold << count_time << rang::style::reset << '\n'; std::cout << "* Execution time: " << rang::style::bold << count_time << rang::style::reset << '\n';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment