Commit 61e2cd3f authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

avoid requesting threaded neighbor lists that are both threaded via USER-OMP and USER-INTEL

parent cdea8968
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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.");
  }
}

+4 −1
Original line number Diff line number Diff line
@@ -318,7 +318,10 @@ 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)
    if (! neighbor->requests[i]->intel)
      neighbor->requests[i]->omp = neigh_omp;
}