compatibility with legacy OpenMP implementations

This commit is contained in:
Axel Kohlmeyer
2022-04-09 07:53:17 -04:00
parent a94fa0a840
commit ce62da1cca

View File

@ -20,10 +20,6 @@
#include "pppm_electrode_intel.h" #include "pppm_electrode_intel.h"
#include <cmath>
#include <cstring>
#include <iostream>
#include "angle.h" #include "angle.h"
#include "atom.h" #include "atom.h"
#include "bond.h" #include "bond.h"
@ -45,6 +41,9 @@
#include "update.h" #include "update.h"
#include "wire_dipole.h" #include "wire_dipole.h"
#include <cmath>
#include <cstring>
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
using namespace std; using namespace std;
@ -394,7 +393,7 @@ void PPPMElectrodeIntel::project_psi(IntelBuffers<flt_t, acc_t> *buffers, bigint
nthr = comm->nthreads; nthr = comm->nthreads;
#if defined(_OPENMP) #if defined(_OPENMP)
#pragma omp parallel LMP_DEFAULT_NONE shared(nlocal, nthr, imat, vec) if (!_use_lrt) #pragma omp parallel LMP_DEFAULT_NONE LMP_SHARED(nlocal, nthr, imat, vec) if (!_use_lrt)
#endif #endif
{ {
const flt_t scaleinv = 1.0 / (nx_pppm * ny_pppm * nz_pppm); const flt_t scaleinv = 1.0 / (nx_pppm * ny_pppm * nz_pppm);
@ -884,7 +883,7 @@ void PPPMElectrodeIntel::make_rho_in_brick(IntelBuffers<flt_t, acc_t> *buffers,
nthr = comm->nthreads; nthr = comm->nthreads;
#if defined(_OPENMP) #if defined(_OPENMP)
#pragma omp parallel LMP_DEFAULT_NONE shared(nthr, nlocal, global_density, imat) if (!_use_lrt) #pragma omp parallel LMP_DEFAULT_NONE LMP_SHARED(nthr, nlocal, global_density, imat) if (!_use_lrt)
#endif #endif
{ {
const int nix = nxhi_out - nxlo_out + 1; const int nix = nxhi_out - nxlo_out + 1;
@ -986,7 +985,7 @@ void PPPMElectrodeIntel::make_rho_in_brick(IntelBuffers<flt_t, acc_t> *buffers,
// reduce all the perthread_densities into global_density // reduce all the perthread_densities into global_density
if (nthr > 1) { if (nthr > 1) {
#if defined(_OPENMP) #if defined(_OPENMP)
#pragma omp parallel LMP_DEFAULT_NONE shared(nthr, global_density) if (!_use_lrt) #pragma omp parallel LMP_DEFAULT_NONE LMP_SHARED(nthr, global_density) if (!_use_lrt)
#endif #endif
{ {
int ifrom, ito, tid; int ifrom, ito, tid;