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

renamed AcousticSolver -> MeshLessAcousticSolver

parent 8c57f675
Branches
Tags
No related merge requests found
...@@ -9,7 +9,7 @@ include_directories(${PASTIS_SOURCE_DIR}/packages/rang/include) ...@@ -9,7 +9,7 @@ include_directories(${PASTIS_SOURCE_DIR}/packages/rang/include)
add_library( add_library(
PastisExperimental PastisExperimental
RawKokkosAcousticSolver.cpp RawKokkosAcousticSolver.cpp
AcousticSolver.cpp MeshLessAcousticSolver.cpp
) )
#include <AcousticSolver.hpp> #include <MeshLessAcousticSolver.hpp>
#include <rang.hpp> #include <rang.hpp>
#include <memory> #include <memory>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
typedef const double my_double; typedef const double my_double;
struct AcousticSolver::ReduceMin { struct MeshLessAcousticSolver::ReduceMin {
private: private:
const Kokkos::View<my_double*> x_; const Kokkos::View<my_double*> x_;
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
KOKKOS_INLINE_FUNCTION KOKKOS_INLINE_FUNCTION
double AcousticSolver:: double MeshLessAcousticSolver::
acoustic_dt(const Kokkos::View<const double*>& Vj, acoustic_dt(const Kokkos::View<const double*>& Vj,
const Kokkos::View<const double*>& cj) const const Kokkos::View<const double*>& cj) const
{ {
...@@ -64,7 +64,7 @@ acoustic_dt(const Kokkos::View<const double*>& Vj, ...@@ -64,7 +64,7 @@ acoustic_dt(const Kokkos::View<const double*>& Vj,
KOKKOS_INLINE_FUNCTION KOKKOS_INLINE_FUNCTION
void AcousticSolver::computeExplicitFluxes(const Kokkos::View<const double*>& xr, void MeshLessAcousticSolver::computeExplicitFluxes(const Kokkos::View<const double*>& xr,
const Kokkos::View<const double*>& xj, const Kokkos::View<const double*>& xj,
const Kokkos::View<const double*>& rhoj, const Kokkos::View<const double*>& rhoj,
const Kokkos::View<const double*>& uj, const Kokkos::View<const double*>& uj,
...@@ -105,7 +105,7 @@ void AcousticSolver::computeExplicitFluxes(const Kokkos::View<const double*>& xr ...@@ -105,7 +105,7 @@ void AcousticSolver::computeExplicitFluxes(const Kokkos::View<const double*>& xr
} }
AcousticSolver::AcousticSolver(const long int& nj) MeshLessAcousticSolver::MeshLessAcousticSolver(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 ACOUSTIC_SOLVER_HPP #ifndef MESH_LESS_ACOUSTIC_SOLVER_HPP
#define ACOUSTIC_SOLVER_HPP #define MESH_LESS_ACOUSTIC_SOLVER_HPP
#include <Kokkos_Core.hpp> #include <Kokkos_Core.hpp>
class AcousticSolver class MeshLessAcousticSolver
{ {
private: private:
...@@ -25,7 +25,7 @@ private: ...@@ -25,7 +25,7 @@ private:
struct ReduceMin; struct ReduceMin;
public: public:
AcousticSolver(const long int& nj); MeshLessAcousticSolver(const long int& nj);
}; };
#endif // ACOUSTIC_SOLVER_HPP #endif // MESH_LESS_ACOUSTIC_SOLVER_HPP
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <ConsoleManager.hpp> #include <ConsoleManager.hpp>
#include <RawKokkosAcousticSolver.hpp> #include <RawKokkosAcousticSolver.hpp>
#include <AcousticSolver.hpp> #include <MeshLessAcousticSolver.hpp>
#include <CLI/CLI.hpp> #include <CLI/CLI.hpp>
#include <cassert> #include <cassert>
...@@ -76,18 +76,18 @@ int main(int argc, char *argv[]) ...@@ -76,18 +76,18 @@ int main(int argc, char *argv[])
Kokkos::DefaultExecutionSpace::print_configuration(std::cout); Kokkos::DefaultExecutionSpace::print_configuration(std::cout);
std::map<std::string, double> method_cost_map; std::map<std::string, double> method_cost_map;
// { {
// Kokkos::Timer timer; Kokkos::Timer timer;
// timer.reset(); timer.reset();
// RawKokkos::AcousticSolver(number); RawKokkos::AcousticSolver(number);
// method_cost_map["RawKokkos"] = timer.seconds(); method_cost_map["RawKokkos"] = timer.seconds();
// } }
{ {
Kokkos::Timer timer; Kokkos::Timer timer;
timer.reset(); timer.reset();
AcousticSolver acoustic_solver(number); MeshLessAcousticSolver acoustic_solver(number);
method_cost_map["Class"] = timer.seconds(); method_cost_map["MeshLessAcousticSolver"] = timer.seconds();
} }
Kokkos::finalize(); Kokkos::finalize();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment