From 085cbee1163d6cd6bd787718fb2152f37fd049c0 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 18 Jul 2017 11:14:59 -0400 Subject: [PATCH] protect LAMMPS from calling incompatible QUIP library with -DLAMMPS_BIGBIG --- src/USER-QUIP/pair_quip.cpp | 11 +++++++++++ src/USER-QUIP/pair_quip.h | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/src/USER-QUIP/pair_quip.cpp b/src/USER-QUIP/pair_quip.cpp index 0ad8066027..ccd71235e7 100644 --- a/src/USER-QUIP/pair_quip.cpp +++ b/src/USER-QUIP/pair_quip.cpp @@ -124,12 +124,23 @@ void PairQUIP::compute(int eflag, int vflag) lattice[7] = domain->yz; lattice[8] = domain->zprd; +#if defined(LAMMPS_BIGBIG) + error->all(FLERR,"Pair style quip does not support -DLAMMPS_BIGBIG"); + // quip_lammps_longint_wrapper( + // (&nlocal,&nghost,atomic_numbers,tag, + // &inum,&sum_num_neigh,ilist, + // quip_num_neigh,quip_neigh,lattice, + // quip_potential,&n_quip_potential,&x[0][0], + // &quip_energy,quip_local_e,quip_virial,quip_local_virial,quip_force); +#else quip_lammps_wrapper (&nlocal,&nghost,atomic_numbers,tag, &inum,&sum_num_neigh,ilist, quip_num_neigh,quip_neigh,lattice, quip_potential,&n_quip_potential,&x[0][0], &quip_energy,quip_local_e,quip_virial,quip_local_virial,quip_force); +#endif + iquip = 0; for (ii = 0; ii < ntotal; ii++) { for( jj = 0; jj < 3; jj++ ) { diff --git a/src/USER-QUIP/pair_quip.h b/src/USER-QUIP/pair_quip.h index 985a43fd7e..c785792410 100644 --- a/src/USER-QUIP/pair_quip.h +++ b/src/USER-QUIP/pair_quip.h @@ -29,6 +29,11 @@ extern "C" int*, int*, double*, int*, int*, double*, double*, double*, double*, double*, double*); + // void quip_lammps_longint_wrapper(int*, int*, int*, int64_t*, + // int*, int*, int*, + // int*, int*, double*, + // int*, int*, double*, + // double*, double*, double*, double*, double*); void quip_lammps_potential_initialise(int*, int*, double*, char*, int*, char*, int*); }