Unverified Commit 7416e113 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1147 from akohlmey/fix-omp-intel-neighbor

Resolve neighbor list request conflict with USER-INTEL and USER-OMP
parents 79102458 61e2cd3f
......@@ -532,8 +532,13 @@ void FixIntel::check_neighbor_intel()
_offload_noghost = 0;
}
#endif
// avoid flagging a neighbor list as both USER-INTEL and USER-OMP
if (neighbor->requests[i]->intel)
neighbor->requests[i]->omp = 0;
if (neighbor->requests[i]->skip)
error->all(FLERR, "Cannot yet use hybrid styles with Intel package.");
error->all(FLERR, "Hybrid styles with Intel package are unsupported.");
}
}
......
......@@ -318,8 +318,11 @@ void FixOMP::set_neighbor_omp()
const int neigh_omp = _neighbor ? 1 : 0;
const int nrequest = neighbor->nrequest;
// flag *all* neighbor list requests as USER-OMP threaded,
// but skip lists already flagged as USER-INTEL threaded
for (int i = 0; i < nrequest; ++i)
neighbor->requests[i]->omp = neigh_omp;
if (! neighbor->requests[i]->intel)
neighbor->requests[i]->omp = neigh_omp;
}
/* ---------------------------------------------------------------------- */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment