consistently refer to INTEL package in upper case

This commit is contained in:
Axel Kohlmeyer
2022-01-23 21:12:22 -05:00
parent cd16556256
commit 88dadd0fff
3 changed files with 9 additions and 12 deletions

View File

@ -43,7 +43,7 @@ using namespace FixConst;
#ifdef __INTEL_OFFLOAD #ifdef __INTEL_OFFLOAD
#ifndef _LMP_INTEL_OFFLOAD #ifndef _LMP_INTEL_OFFLOAD
#warning "Not building Intel package with Xeon Phi offload support." #warning "Not building INTEL package with Xeon Phi offload support."
#endif #endif
#endif #endif
@ -303,7 +303,7 @@ void FixIntel::init()
if (force->pair_match("^hybrid", 0) != nullptr) { if (force->pair_match("^hybrid", 0) != nullptr) {
_pair_hybrid_flag = 1; _pair_hybrid_flag = 1;
if (force->newton_pair != 0 && force->pair->no_virial_fdotr_compute) if (force->newton_pair != 0 && force->pair->no_virial_fdotr_compute)
error->all(FLERR,"Intel package requires fdotr virial with newton on."); error->all(FLERR,"INTEL package requires fdotr virial with newton on.");
} else } else
_pair_hybrid_flag = 0; _pair_hybrid_flag = 0;
@ -354,12 +354,12 @@ void FixIntel::init()
void FixIntel::setup(int vflag) void FixIntel::setup(int vflag)
{ {
if (neighbor->style != Neighbor::BIN) if (neighbor->style != Neighbor::BIN)
error->all(FLERR,"Currently, neighbor style BIN must be used with Intel package."); error->all(FLERR,"Currently, neighbor style BIN must be used with INTEL package.");
if (vflag > 3) if (vflag > 3)
error->all(FLERR,"Cannot currently get per-atom virials with Intel package."); error->all(FLERR,"Cannot currently get per-atom virials with INTEL package.");
#ifdef _LMP_INTEL_OFFLOAD #ifdef _LMP_INTEL_OFFLOAD
if (neighbor->exclude_setting() != 0) if (neighbor->exclude_setting() != 0)
error->all(FLERR,"Currently, cannot use neigh_modify exclude with Intel package offload."); error->all(FLERR,"Currently, cannot use neigh_modify exclude with INTEL package offload.");
post_force(vflag); post_force(vflag);
#endif #endif
} }
@ -512,8 +512,7 @@ void FixIntel::bond_init_check()
} }
if (intel_pair == 0) if (intel_pair == 0)
error->all(FLERR,"Intel styles for bond/angle/dihedral/improper " error->all(FLERR,"Intel styles for bond/angle/dihedral/improper require intel pair style.");
"require intel pair style.");
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

View File

@ -161,10 +161,8 @@ void NBinIntel::bin_atoms(IntelBuffers<flt_t,acc_t> * buffers) {
const flt_t dx = (INTEL_BIGP - bboxhi[0]); const flt_t dx = (INTEL_BIGP - bboxhi[0]);
const flt_t dy = (INTEL_BIGP - bboxhi[1]); const flt_t dy = (INTEL_BIGP - bboxhi[1]);
const flt_t dz = (INTEL_BIGP - bboxhi[2]); const flt_t dz = (INTEL_BIGP - bboxhi[2]);
if (dx * dx + dy * dy + dz * dz < if (dx * dx + dy * dy + dz * dz < static_cast<flt_t>(neighbor->cutneighmaxsq))
static_cast<flt_t>(neighbor->cutneighmaxsq)) error->one(FLERR,"INTEL package expects no atoms within cutoff of (1e15,1e15,1e15).");
error->one(FLERR,
"Intel package expects no atoms within cutoff of {1e15,1e15,1e15}.");
} }
// ---------- Grow and cast/pack buffers ------------- // ---------- Grow and cast/pack buffers -------------

View File

@ -71,7 +71,7 @@ void VerletLRTIntel::init()
#ifndef LMP_INTEL_USELRT #ifndef LMP_INTEL_USELRT
error->all(FLERR, error->all(FLERR,
"LRT otion for Intel package disabled at compile time"); "LRT otion for INTEL package disabled at compile time");
#endif #endif
} }