Merge branch 'dev' into comm

2 files changed, 38 insertions, 4 deletions

diff --git a/Source/Parallelization/WarpXComm.H b/Source/Parallelization/WarpXComm.H
new file mode 100644
index 000000000..81f00088e
--- /dev/null
+++ b/Source/Parallelization/WarpXComm.H
@@ -0,0 +1,33 @@
+#ifndef WARPX_PARALLELIZATION_COMM_H_
+#define WARPX_PARALLELIZATION_COMM_H_
+
+#include <AMReX_MultiFab.H>
+
+/** \brief Fills the values of the current on the coarse patch by
+ *  averaging the values of the current of the fine patch (on the same level).
+ *  Also fills the guards of the coarse patch.
+ *
+ * \param[in]  fine             fine patches to interpolate from
+ * \param[out] coarse           coarse patches to interpolate to
+ * \param[in]  refinement_ratio integer ratio between the two
+ */
+void
+interpolateCurrentFineToCoarse (
+      std::array< amrex::MultiFab const *, 3 > const & fine,
+      std::array< amrex::MultiFab       *, 3 > const & coarse,
+      int const refinement_ratio);
+
+/** \brief Fills the values of the charge density on the coarse patch by
+ *  averaging the values of the charge density of the fine patch (on the same level).
+ *
+ * \param[in]  fine             fine patches to interpolate from
+ * \param[out] coarse           coarse patches to interpolate to
+ * \param[in]  refinement_ratio integer ratio between the two
+ */
+void
+interpolateDensityFineToCoarse (
+     const amrex::MultiFab& fine,
+     amrex::MultiFab& coarse,
+     int const refinement_ratio);
+
+#endif // WARPX_PARALLELIZATION_COMM_H_
diff --git a/Source/Parallelization/WarpXComm.cpp b/Source/Parallelization/WarpXComm.cpp
index f7e9086f9..3cc0eb563 100644
--- a/Source/Parallelization/WarpXComm.cpp
+++ b/Source/Parallelization/WarpXComm.cpp
@@ -1,3 +1,4 @@
+#include <WarpXComm.H>
 #include <WarpXComm_K.H>
 #include <WarpX.H>
 #include <WarpX_f.H>
@@ -546,9 +547,9 @@ WarpX::SyncCurrent ()
 }
 
 void
-WarpX::interpolateCurrentFineToCoarse ( std::array< amrex::MultiFab const *, 3 > const & fine,
-                                        std::array< amrex::MultiFab       *, 3 > const & coarse,
-                                        int const refinement_ratio)
+interpolateCurrentFineToCoarse ( std::array< amrex::MultiFab const *, 3 > const & fine,
+                                 std::array< amrex::MultiFab       *, 3 > const & coarse,
+                                 int const refinement_ratio)
 {
     BL_PROFILE("interpolateCurrentFineToCoarse()");
     BL_ASSERT(refinement_ratio == 2);
@@ -606,7 +607,7 @@ WarpX::SyncRho ()
 }
 
 void
-WarpX::interpolateDensityFineToCoarse (const MultiFab& fine, MultiFab& coarse, int const refinement_ratio)
+interpolateDensityFineToCoarse (const MultiFab& fine, MultiFab& coarse, int const refinement_ratio)
 {
     BL_PROFILE("interpolateDensityFineToCoarse()");
     BL_ASSERT(refinement_ratio == 2);