diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-10-25 09:49:12 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-10-25 09:49:12 -0700 |
| commit | 7a2fe4f3c115eeb9bfb8d48268be53111ffd40e3 (patch) | |
| tree | 2a7f2b4e26783359ab965c6aa84efbe1c2e04529 /Source/Parallelization/WarpXRegrid.cpp | |
| parent | 8e94555632b0282219d702938fff9fe6f9cf260f (diff) | |
| parent | 398166af23cfadfbf989f73c9e973518ed7aca3c (diff) | |
| download | WarpX-7a2fe4f3c115eeb9bfb8d48268be53111ffd40e3.tar.gz WarpX-7a2fe4f3c115eeb9bfb8d48268be53111ffd40e3.tar.zst WarpX-7a2fe4f3c115eeb9bfb8d48268be53111ffd40e3.zip | |
fix merge conflicts with dev
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())); |