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/Utils/WarpXTagging.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/Utils/WarpXTagging.cpp')
| -rw-r--r-- | Source/Utils/WarpXTagging.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Utils/WarpXTagging.cpp b/Source/Utils/WarpXTagging.cpp index 4a8b25439..739ed0d53 100644 --- a/Source/Utils/WarpXTagging.cpp +++ b/Source/Utils/WarpXTagging.cpp @@ -19,8 +19,8 @@ WarpX::ErrorEst (int lev, TagBoxArray& tags, Real /*time*/, int /*ngrow*/) const Real* problo = Geom(lev).ProbLo(); const Real* dx = Geom(lev).CellSize(); -#ifdef _OPENMP -#pragma omp parallel +#ifdef AMREX_USE_OMP +#pragma omp parallel if (amrex::Gpu::notInLaunchRegion()) #endif for (MFIter mfi(tags); mfi.isValid(); ++mfi) { @@ -38,4 +38,3 @@ WarpX::ErrorEst (int lev, TagBoxArray& tags, Real /*time*/, int /*ngrow*/) } } } - |