From 7a8e79f62c5424e14b48af23f4fba592bc8a7218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Del=20Pino?= <stephane.delpino44@gmail.com> Date: Mon, 26 Mar 2018 18:08:20 +0200 Subject: [PATCH] renamed AcousticSolver -> MeshLessAcousticSolver --- experimental/CMakeLists.txt | 2 +- ...icSolver.cpp => MeshLessAcousticSolver.cpp} | 10 +++++----- ...icSolver.hpp => MeshLessAcousticSolver.hpp} | 10 +++++----- main.cpp | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) rename experimental/{AcousticSolver.cpp => MeshLessAcousticSolver.cpp} (95%) rename experimental/{AcousticSolver.hpp => MeshLessAcousticSolver.hpp} (79%) diff --git a/experimental/CMakeLists.txt b/experimental/CMakeLists.txt index 1625c89b3..52ff12b08 100644 --- a/experimental/CMakeLists.txt +++ b/experimental/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${PASTIS_SOURCE_DIR}/packages/rang/include) add_library( PastisExperimental RawKokkosAcousticSolver.cpp - AcousticSolver.cpp + MeshLessAcousticSolver.cpp ) diff --git a/experimental/AcousticSolver.cpp b/experimental/MeshLessAcousticSolver.cpp similarity index 95% rename from experimental/AcousticSolver.cpp rename to experimental/MeshLessAcousticSolver.cpp index 84f17ac60..edf67693c 100644 --- a/experimental/AcousticSolver.cpp +++ b/experimental/MeshLessAcousticSolver.cpp @@ -1,4 +1,4 @@ -#include <AcousticSolver.hpp> +#include <MeshLessAcousticSolver.hpp> #include <rang.hpp> #include <memory> @@ -7,7 +7,7 @@ typedef const double my_double; -struct AcousticSolver::ReduceMin { +struct MeshLessAcousticSolver::ReduceMin { private: const Kokkos::View<my_double*> x_; @@ -44,7 +44,7 @@ public: KOKKOS_INLINE_FUNCTION -double AcousticSolver:: +double MeshLessAcousticSolver:: acoustic_dt(const Kokkos::View<const double*>& Vj, const Kokkos::View<const double*>& cj) const { @@ -64,7 +64,7 @@ acoustic_dt(const Kokkos::View<const double*>& Vj, 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*>& rhoj, const Kokkos::View<const double*>& uj, @@ -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*> rhoj("rhoj", nj); diff --git a/experimental/AcousticSolver.hpp b/experimental/MeshLessAcousticSolver.hpp similarity index 79% rename from experimental/AcousticSolver.hpp rename to experimental/MeshLessAcousticSolver.hpp index 153d64f56..ccdba5838 100644 --- a/experimental/AcousticSolver.hpp +++ b/experimental/MeshLessAcousticSolver.hpp @@ -1,9 +1,9 @@ -#ifndef ACOUSTIC_SOLVER_HPP -#define ACOUSTIC_SOLVER_HPP +#ifndef MESH_LESS_ACOUSTIC_SOLVER_HPP +#define MESH_LESS_ACOUSTIC_SOLVER_HPP #include <Kokkos_Core.hpp> -class AcousticSolver +class MeshLessAcousticSolver { private: @@ -25,7 +25,7 @@ private: struct ReduceMin; public: - AcousticSolver(const long int& nj); + MeshLessAcousticSolver(const long int& nj); }; -#endif // ACOUSTIC_SOLVER_HPP +#endif // MESH_LESS_ACOUSTIC_SOLVER_HPP diff --git a/main.cpp b/main.cpp index f1b143f45..7141464e0 100644 --- a/main.cpp +++ b/main.cpp @@ -7,7 +7,7 @@ #include <ConsoleManager.hpp> #include <RawKokkosAcousticSolver.hpp> -#include <AcousticSolver.hpp> +#include <MeshLessAcousticSolver.hpp> #include <CLI/CLI.hpp> #include <cassert> @@ -76,18 +76,18 @@ int main(int argc, char *argv[]) Kokkos::DefaultExecutionSpace::print_configuration(std::cout); std::map<std::string, double> method_cost_map; - // { - // Kokkos::Timer timer; - // timer.reset(); - // RawKokkos::AcousticSolver(number); - // method_cost_map["RawKokkos"] = timer.seconds(); - // } + { + Kokkos::Timer timer; + timer.reset(); + RawKokkos::AcousticSolver(number); + method_cost_map["RawKokkos"] = timer.seconds(); + } { Kokkos::Timer timer; timer.reset(); - AcousticSolver acoustic_solver(number); - method_cost_map["Class"] = timer.seconds(); + MeshLessAcousticSolver acoustic_solver(number); + method_cost_map["MeshLessAcousticSolver"] = timer.seconds(); } Kokkos::finalize(); -- GitLab