diff options
| author |  RevathiJambunathan <revanathan@gmail.com>
| 2019-06-21 09:57:17 -0700 |
|---|---|---|
| committer | RevathiJambunathan <revanathan@gmail.com>
| 2019-06-21 09:57:17 -0700 |
| commit | a6893cfe5562b0bf5ecb147de0cd32ec063d2c2f (patch) | |
| tree | ab5f24538b7bf12e72e5b9ff556d28f54bc25063 /Source | |
| parent | cfe1d5beca648cb6abcdbe32e9c884b68dcc627e (diff) | |
| parent | e4fa67f9f9accf1a442786060d76e3f9338528c1 (diff) | |
| download | WarpX-a6893cfe5562b0bf5ecb147de0cd32ec063d2c2f.tar.gz WarpX-a6893cfe5562b0bf5ecb147de0cd32ec063d2c2f.tar.zst WarpX-a6893cfe5562b0bf5ecb147de0cd32ec063d2c2f.zip | |
Merge branch 'dev' of https://github.com/ECP-WarpX/WarpX into SliceGeneration_with_yt_compliance_for_viz
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/BoundaryConditions/PML.H | 7 | ||||
| -rw-r--r-- | Source/Utils/WarpXMovingWindow.cpp | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/Source/BoundaryConditions/PML.H b/Source/BoundaryConditions/PML.H index 25dfc7996..0cf367284 100644 --- a/Source/BoundaryConditions/PML.H +++ b/Source/BoundaryConditions/PML.H @@ -62,13 +62,6 @@ namespace amrex { virtual void destroy (SigmaBox* fab) const final { delete fab; } -#ifdef AMREX_USE_GPU - virtual SigmaBox* createDeviceAlias (SigmaBox const& src) const final - { - return const_cast<SigmaBox*>(&src); - } - virtual void destroyDeviceAlias (SigmaBox* fab) const final {} -#endif virtual FabFactory<SigmaBox>* clone () const { return new FabFactory<SigmaBox>(*this); } diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp index ae781f9aa..06a7d2614 100644 --- a/Source/Utils/WarpXMovingWindow.cpp +++ b/Source/Utils/WarpXMovingWindow.cpp @@ -214,7 +214,7 @@ WarpX::shiftMF (MultiFab& mf, const Geometry& geom, int num_shift, int dir) AMREX_ALWAYS_ASSERT(ng.min() >= num_shift); - MultiFab tmpmf(ba, dm, nc, ng, MFInfo().SetDeviceFab(false)); + MultiFab tmpmf(ba, dm, nc, ng); MultiFab::Copy(tmpmf, mf, 0, 0, nc, ng); tmpmf.FillBoundary(geom.periodicity()); |