diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-10-28 16:19:16 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-10-28 16:19:16 -0700 |
| commit | 99823aa7fe9cd7d9ea402d551efc30e7c41c59f1 (patch) | |
| tree | cba11dc88b17f8701e06b650258c10142ca70195 /Source/Parallelization/WarpXRegrid.cpp | |
| parent | 5df58955e32bbd1e2499e484ab50144ec10a9e94 (diff) | |
| parent | f326192ee5140278c6061b1171b98c6a0f932320 (diff) | |
| download | WarpX-99823aa7fe9cd7d9ea402d551efc30e7c41c59f1.tar.gz WarpX-99823aa7fe9cd7d9ea402d551efc30e7c41c59f1.tar.zst WarpX-99823aa7fe9cd7d9ea402d551efc30e7c41c59f1.zip | |
resolve merge conflicts
Diffstat (limited to 'Source/Parallelization/WarpXRegrid.cpp')
| -rw-r--r-- | Source/Parallelization/WarpXRegrid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Parallelization/WarpXRegrid.cpp b/Source/Parallelization/WarpXRegrid.cpp index 5441755f5..2ae167283 100644 --- a/Source/Parallelization/WarpXRegrid.cpp +++ b/Source/Parallelization/WarpXRegrid.cpp @@ -91,7 +91,7 @@ WarpX::RemakeLevel (int lev, Real time, const BoxArray& ba, const DistributionMa // Aux patch - if (lev == 0) + if (lev == 0 && Bfield_aux[0][0]->ixType() == Bfield_fp[0][0]->ixType()) { for (int idim = 0; idim < 3; ++idim) { Bfield_aux[lev][idim].reset(new MultiFab(*Bfield_fp[lev][idim], amrex::make_alias, 0, Bfield_aux[lev][idim]->nComp())); |