LSP

Author: MSABuschmann

source/integrators/integrator.cpp

@@ -1,9 +1,9 @@
 #include "integrator.h"
 #include "level_data.h"
 
-namespace sledgehamr{
+namespace sledgehamr {
 
-/** @brief Wrapper function to advance a level by one time step. This function 
+/** @brief Wrapper function to advance a level by one time step. This function
  *         selects and swaps data appropriately in particular regarding to the
  *         shadow level.
  * @param   lev Level to be advanced.
@@ -14,10 +14,10 @@ void Integrator::Advance(const int lev) {
         std::swap(sim->grid_old[lev], sim->grid_new[lev]);
     }
 
-    const double dt   = lev < 0 ? sim->dt[0]*2.         : sim->dt[lev];
-    const double dx   = lev < 0 ? sim->dx[0]*2.         : sim->dx[lev];
-    LevelData& mf_old = lev < 0 ? sim->shadow_level_tmp : sim->grid_old[lev];
-    LevelData& mf_new = lev < 0 ? sim->shadow_level     : sim->grid_new[lev];
+    const double dt = lev < 0 ? sim->dt[0] * 2. : sim->dt[lev];
+    const double dx = lev < 0 ? sim->dx[0] * 2. : sim->dx[lev];
+    LevelData &mf_old = lev < 0 ? sim->shadow_level_tmp : sim->grid_old[lev];
+    LevelData &mf_new = lev < 0 ? sim->shadow_level : sim->grid_new[lev];
 
     sim->level_synchronizer->FillPatch(lev, mf_old.t, mf_old);
     Integrate(mf_old, mf_new, lev, dt, dx);
@@ -36,29 +36,31 @@ void Integrator::Advance(const int lev) {
  */
 std::string Integrator::Name(IntegratorType type) {
     switch (type) {
-        case AmrexRkButcherTableau:
-            return "User-defined RK Butcher Tableau";
-        case AmrexForwardEuler:
-            return "Forward Euler";
-        case AmrexTrapezoid:
-            return "Trapezoid Method";
-        case AmrexSsprk3:
-            return "SSPRK3 (AMReX implementation)";
-        case AmrexRk4:
-            return "RK4";
-        case Lsssprk3:
-            return "SSPRK3 (Low-storage sledgehamr implementation)";
-        case RknButcherTableau:
-            return "User-defined RKN Butcher Tableau";
-        case Rkn4:
-            return "4th order RKN";
-        case Rkn5:
-            return "5th order RKN";
-        default:
-            return "Unkown!";
+    case AmrexRkButcherTableau:
+        return "User-defined RK Butcher Tableau";
+    case AmrexForwardEuler:
+        return "Forward Euler";
+    case AmrexTrapezoid:
+        return "Trapezoid Method";
+    case AmrexSsprk3:
+        return "SSPRK3 (AMReX implementation)";
+    case AmrexRk4:
+        return "RK4";
+    case Lsssprk3:
+        return "SSPRK3 (Low-storage sledgehamr implementation)";
+    case Leapfrog:
+        return "Leapfrog (kick-drift-kick)";
+    case RknButcherTableau:
+        return "User-defined RKN Butcher Tableau";
+    case Rkn4:
+        return "4th order RKN";
+    case Rkn5:
+        return "5th order RKN";
+    default:
+        return "Unkown!";
     }
 }
 
-void Integrator::DebugMessage(amrex::MultiFab& mf, std::string msg) { }
+void Integrator::DebugMessage(amrex::MultiFab &mf, std::string msg) {}
 
-};  // namespace sledgehamr
+}; // namespace sledgehamr

source/integrators/integrator.h

@@ -1,8 +1,8 @@
 #ifndef SLEDGEHAMR_INTEGRATOR_H_
 #define SLEDGEHAMR_INTEGRATOR_H_
 
-#include "sledgehamr.h"
 #include "level_data.h"
+#include "sledgehamr.h"
 
 namespace sledgehamr {
 
@@ -16,6 +16,7 @@ enum IntegratorType {
     AmrexSsprk3 = 3,
     AmrexRk4 = 4,
     Lsssprk3 = 10,
+    Leapfrog = 11,
     RknButcherTableau = 20,
     Rkn4 = 21,
     Rkn5 = 22
@@ -28,10 +29,10 @@ class Sledgehamr;
  */
 class Integrator {
   public:
-    Integrator(Sledgehamr* owner) : sim(owner) {};
+    Integrator(Sledgehamr *owner) : sim(owner){};
     virtual void Advance(const int lev);
     static std::string Name(IntegratorType type);
-    static void DebugMessage(amrex::MultiFab& mf, std::string msg);
+    static void DebugMessage(amrex::MultiFab &mf, std::string msg);
 
   protected:
     /** @brief Purely virtual function that advances one level by one time step
@@ -42,12 +43,12 @@ class Integrator {
      * @param   dt      Time step size.
      * @param   dx      Grid spacing.
      */
-    virtual void Integrate(LevelData& mf_old, LevelData& mf_new, const int lev,
+    virtual void Integrate(LevelData &mf_old, LevelData &mf_new, const int lev,
                            const double dt, const double dx) = 0;
 
     /** @brief Pointer to the simulation.
      */
-    Sledgehamr* sim;
+    Sledgehamr *sim;
 };
 
 }; // namespace sledgehamr