renamed AcousticSolver -> MeshLessAcousticSolver

experimental/CMakeLists.txt

@@ -9,7 +9,7 @@ include_directories(${PASTIS_SOURCE_DIR}/packages/rang/include)
 add_library(
   PastisExperimental
   RawKokkosAcousticSolver.cpp
-  AcousticSolver.cpp
+  MeshLessAcousticSolver.cpp
   )
 
 

experimental/AcousticSolver.cpp → experimental/MeshLessAcousticSolver.cpp

-#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);

experimental/AcousticSolver.hpp → experimental/MeshLessAcousticSolver.hpp

-#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

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();