aboutsummaryrefslogtreecommitdiff
path: root/Source/Parallelization
diff options
context:
space:
mode:
authorGravatar MaxThevenet <mthevenet@lbl.gov> 2019-11-19 14:02:09 -0700
committerGravatar MaxThevenet <mthevenet@lbl.gov> 2019-11-19 14:02:09 -0700
commit8cc9c9f3ea3211f2bea112f7ce4f2f4b3a92e640 (patch)
tree284abdcc481909829821e11281028e13813fa50e /Source/Parallelization
parent368d294e811ee03577a466f6bdbe23124c3ccf84 (diff)
parent13f3c87791971c4e72b567410f938a6dade47647 (diff)
downloadWarpX-8cc9c9f3ea3211f2bea112f7ce4f2f4b3a92e640.tar.gz
WarpX-8cc9c9f3ea3211f2bea112f7ce4f2f4b3a92e640.tar.zst
WarpX-8cc9c9f3ea3211f2bea112f7ce4f2f4b3a92e640.zip
fix mege conflicts with dev
Diffstat (limited to 'Source/Parallelization')
-rw-r--r--Source/Parallelization/Make.package1
-rw-r--r--Source/Parallelization/WarpXComm.cpp5
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Parallelization/Make.package b/Source/Parallelization/Make.package
index cabce2da8..065556b33 100644
--- a/Source/Parallelization/Make.package
+++ b/Source/Parallelization/Make.package
@@ -4,6 +4,7 @@ CEXE_sources += GuardCellManager.cpp
CEXE_headers += WarpXSumGuardCells.H
CEXE_headers += WarpXComm_K.H
CEXE_headers += GuardCellManager.H
+CEXE_headers += WarpXComm.H
INCLUDE_LOCATIONS += $(WARPX_HOME)/Source/Parallelization
VPATH_LOCATIONS += $(WARPX_HOME)/Source/Parallelization
diff --git a/Source/Parallelization/WarpXComm.cpp b/Source/Parallelization/WarpXComm.cpp
index 3cc0eb563..2e0cbdfad 100644
--- a/Source/Parallelization/WarpXComm.cpp
+++ b/Source/Parallelization/WarpXComm.cpp
@@ -3,13 +3,12 @@
#include <WarpX.H>
#include <WarpX_f.H>
#include <WarpXSumGuardCells.H>
-#include <Parallelization/InterpolateCurrentFineToCoarse.H>
-#include <Parallelization/InterpolateDensityFineToCoarse.H>
+#include <InterpolateCurrentFineToCoarse.H>
+#include <InterpolateDensityFineToCoarse.H>
#include <algorithm>
#include <cstdlib>
-
using namespace amrex;
void