From ce62da1cca04c13c83e358c1b6dd6095f7f72d3c Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 9 Apr 2022 07:53:17 -0400 Subject: [PATCH] compatibility with legacy OpenMP implementations --- src/INTEL/pppm_electrode_intel.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/INTEL/pppm_electrode_intel.cpp b/src/INTEL/pppm_electrode_intel.cpp index 92b9728ea6..95f9d5bf1a 100644 --- a/src/INTEL/pppm_electrode_intel.cpp +++ b/src/INTEL/pppm_electrode_intel.cpp @@ -20,10 +20,6 @@ #include "pppm_electrode_intel.h" -#include -#include -#include - #include "angle.h" #include "atom.h" #include "bond.h" @@ -45,6 +41,9 @@ #include "update.h" #include "wire_dipole.h" +#include +#include + using namespace LAMMPS_NS; using namespace std; @@ -394,7 +393,7 @@ void PPPMElectrodeIntel::project_psi(IntelBuffers *buffers, bigint nthr = comm->nthreads; #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 { const flt_t scaleinv = 1.0 / (nx_pppm * ny_pppm * nz_pppm); @@ -884,7 +883,7 @@ void PPPMElectrodeIntel::make_rho_in_brick(IntelBuffers *buffers, nthr = comm->nthreads; #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 { const int nix = nxhi_out - nxlo_out + 1; @@ -986,7 +985,7 @@ void PPPMElectrodeIntel::make_rho_in_brick(IntelBuffers *buffers, // reduce all the perthread_densities into global_density if (nthr > 1) { #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 { int ifrom, ito, tid;