diff options
| author |  Andrew Myers <atmyers@lbl.gov>
| 2019-09-12 15:48:32 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-09-12 15:48:32 -0700 |
| commit | 569c9a98c3cbaffe418ce094c74e760e9ba216d6 (patch) | |
| tree | fa5172edcbf40bb823a901507cc2f7488c631405 /Source/Parallelization/WarpXRegrid.cpp | |
| parent | 74f9d3b9611561317812bf4ae3d7b842437b54f0 (diff) | |
| parent | 0acb8ea5b9278c79d5d2eb697c94acc794bf8bad (diff) | |
| download | WarpX-569c9a98c3cbaffe418ce094c74e760e9ba216d6.tar.gz WarpX-569c9a98c3cbaffe418ce094c74e760e9ba216d6.tar.zst WarpX-569c9a98c3cbaffe418ce094c74e760e9ba216d6.zip | |
Merge branch 'dev' into pml_exchange_gpu
Diffstat (limited to 'Source/Parallelization/WarpXRegrid.cpp')
| -rw-r--r-- | Source/Parallelization/WarpXRegrid.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Parallelization/WarpXRegrid.cpp b/Source/Parallelization/WarpXRegrid.cpp index 9b3baafe1..5441755f5 100644 --- a/Source/Parallelization/WarpXRegrid.cpp +++ b/Source/Parallelization/WarpXRegrid.cpp @@ -18,7 +18,7 @@ WarpX::LoadBalance () const Real nprocs = ParallelDescriptor::NProcs(); const int nmax = static_cast<int>(std::ceil(nboxes/nprocs*load_balance_knapsack_factor)); const DistributionMapping newdm = (load_balance_with_sfc) - ? DistributionMapping::makeSFC(*costs[lev], false) + ? DistributionMapping::makeSFC(*costs[lev], false) : DistributionMapping::makeKnapSack(*costs[lev], nmax); RemakeLevel(lev, t_new[lev], boxArray(lev), newdm); } @@ -33,11 +33,11 @@ WarpX::RemakeLevel (int lev, Real time, const BoxArray& ba, const DistributionMa { if (ParallelDescriptor::NProcs() == 1) return; -#ifdef WARPX_DO_ELECTROSTATIC +#ifdef WARPX_DO_ELECTROSTATIC AMREX_ALWAYS_ASSERT(masks[lev] == nullptr); AMREX_ALWAYS_ASSERT(gather_masks[lev] == nullptr); #endif // WARPX_DO_ELECTROSTATIC - + // Fine patch const auto& period = Geom(lev).periodicity(); @@ -203,7 +203,7 @@ WarpX::RemakeLevel (int lev, Real time, const BoxArray& ba, const DistributionMa auto pmf = std::unique_ptr<iMultiFab>(new iMultiFab(current_buffer_masks[lev]->boxArray(), dm, current_buffer_masks[lev]->nComp(), ng)); // pmf->ParallelCopy(*current_buffer_masks[lev], 0, 0, current_buffer_masks[lev]->nComp(), ng, ng); - current_buffer_masks[lev] = std::move(pmf); + current_buffer_masks[lev] = std::move(pmf); } if (gather_buffer_masks[lev]) { @@ -211,7 +211,7 @@ WarpX::RemakeLevel (int lev, Real time, const BoxArray& ba, const DistributionMa auto pmf = std::unique_ptr<iMultiFab>(new iMultiFab(gather_buffer_masks[lev]->boxArray(), dm, gather_buffer_masks[lev]->nComp(), ng)); // pmf->ParallelCopy(*gather_buffer_masks[lev], 0, 0, gather_buffer_masks[lev]->nComp(), ng, ng); - gather_buffer_masks[lev] = std::move(pmf); + gather_buffer_masks[lev] = std::move(pmf); } } |