From 4ee2de44648757a767f48d76393b816d9b7f4715 Mon Sep 17 00:00:00 2001
From: Dave Grote <grote1@llnl.gov>
Date: Tue, 3 Sep 2019 16:25:25 -0700
Subject: In current deposition, allowed more flexible centering

---
 Source/WarpX.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'Source/WarpX.cpp')

diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index 517fb2332..a34e7c97c 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -1011,6 +1011,19 @@ WarpX::UpperCorner(const Box& bx, int lev)
 #endif
 }
 
+std::array<Real,3>
+WarpX::LowerCornerWithCentering(const Box& bx, int lev)
+{
+    std::array<Real,3> corner = LowerCorner(bx, lev);
+    std::array<Real,3> dx = CellSize(lev);
+    if (!bx.type(0)) corner[0] += 0.5*dx[0];
+#if (AMREX_SPACEDIM == 3)
+    if (!bx.type(1)) corner[1] += 0.5*dx[1];
+#endif
+    if (!bx.type(2)) corner[2] += 0.5*dx[2];
+    return corner;
+}
+
 IntVect
 WarpX::RefRatio (int lev)
 {
-- 
cgit v1.2.3


From 0b20cd13ba04d99fe6a35e49b124bb58571bee5a Mon Sep 17 00:00:00 2001
From: Dave Grote <grote1@llnl.gov>
Date: Wed, 4 Sep 2019 09:31:03 -0700
Subject: Bug fix in LowerCornerWithCentering for 2D

---
 Source/WarpX.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Source/WarpX.cpp')

diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index a34e7c97c..aeb0175bd 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -1019,8 +1019,10 @@ WarpX::LowerCornerWithCentering(const Box& bx, int lev)
     if (!bx.type(0)) corner[0] += 0.5*dx[0];
 #if (AMREX_SPACEDIM == 3)
     if (!bx.type(1)) corner[1] += 0.5*dx[1];
-#endif
     if (!bx.type(2)) corner[2] += 0.5*dx[2];
+#else
+    if (!bx.type(1)) corner[2] += 0.5*dx[2];
+#endif
     return corner;
 }
 
-- 
cgit v1.2.3