diff options
| author |  Axel Huebl <axel.huebl@plasma.ninja>
| 2021-01-21 11:33:38 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-01-21 11:33:38 -0800 |
| commit | 16ba48a9ae1c28817481007ba93cc20aedba9cf2 (patch) | |
| tree | b39c60ca874eedff8006386ad4593ae94855509d /Source/WarpX.cpp | |
| parent | eef853b9ab231537e2511efa56a415119e791b26 (diff) | |
| download | WarpX-16ba48a9ae1c28817481007ba93cc20aedba9cf2.tar.gz WarpX-16ba48a9ae1c28817481007ba93cc20aedba9cf2.tar.zst WarpX-16ba48a9ae1c28817481007ba93cc20aedba9cf2.zip | |
Define: _OPENMP -> AMREX_USE_OMP (#1520)
* Define: _OPENMP -> AMREX_USE_OMP
Replace the define check of `_OPENMP` with the explicit
backend control of `AMREX_USE_OMP` for parallel constructs.
Doing so avoids that we accidentially turn on OpenMP, e.g. if a dependency
pulls it in for linear algebra, I/O, etc. This can led to confusion if the
user explicitly requested a serial build. Also, we might want to use OpenMP
functionality here and there for auxiliary functions w/o having to use the
AMReX OpenMP backend, i.e. because we compile for GPUs.
* Add missing amrex::Gpu::notInLaunchRegion
Diffstat (limited to 'Source/WarpX.cpp')
| -rw-r--r-- | Source/WarpX.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp index 2464ef369..498e4d02d 100644 --- a/Source/WarpX.cpp +++ b/Source/WarpX.cpp @@ -23,7 +23,7 @@ # include <AMReX_AmrMeshInSituBridge.H> #endif -#ifdef _OPENMP +#ifdef AMREX_USE_OMP # include <omp.h> #endif @@ -1427,7 +1427,7 @@ WarpX::ComputeDivB (amrex::MultiFab& divB, int const dcomp, const Real rmin = GetInstance().Geom(0).ProbLo(0); #endif -#ifdef _OPENMP +#ifdef AMREX_USE_OMP #pragma omp parallel if (Gpu::notInLaunchRegion()) #endif for (MFIter mfi(divB, TilingIfNotGPU()); mfi.isValid(); ++mfi) @@ -1465,7 +1465,7 @@ WarpX::ComputeDivB (amrex::MultiFab& divB, int const dcomp, const Real rmin = GetInstance().Geom(0).ProbLo(0); #endif -#ifdef _OPENMP +#ifdef AMREX_USE_OMP #pragma omp parallel if (Gpu::notInLaunchRegion()) #endif for (MFIter mfi(divB, TilingIfNotGPU()); mfi.isValid(); ++mfi) @@ -1551,8 +1551,8 @@ WarpX::BuildBufferMasks () const Box& dom = Geom(lev).Domain(); const auto& period = Geom(lev).periodicity(); tmp.BuildMask(dom, period, covered, notcovered, physbnd, interior); -#ifdef _OPENMP -#pragma omp parallel +#ifdef AMREX_USE_OMP +#pragma omp parallel if (amrex::Gpu::notInLaunchRegion()) #endif for (MFIter mfi(*bmasks, true); mfi.isValid(); ++mfi) { |