From 6aae3ac7b1b671f17ce4aa6bf299b014f083ccbe Mon Sep 17 00:00:00 2001 From: sjplimp Date: Thu, 9 Apr 2015 17:47:45 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13399 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/Make.py | 7 ++++++- src/fix_ave_chunk.cpp | 2 +- src/fix_ave_spatial.cpp | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Make.py b/src/Make.py index 1f3cd91d0b..ebb411ba39 100755 --- a/src/Make.py +++ b/src/Make.py @@ -698,13 +698,18 @@ class Packages: def setup(self): # extract package lists from src/Makefile - # remove kokkos from lib since it doesn't actually have a lib + # remove names from lib that there are not Make.py lib-classes for + # most don't actually have libs, so nothing to control from Make.py make = MakeReader("%s/Makefile" % dir.src) std = make.getvar("PACKAGE") user = make.getvar("PACKUSER") lib = make.getvar("PACKLIB") + lib.remove("kim") lib.remove("kokkos") + lib.remove("molfile") + lib.remove("python") + lib.remove("quip") all = std + user # plist = command line args expanded to yes-package or no-package diff --git a/src/fix_ave_chunk.cpp b/src/fix_ave_chunk.cpp index 7a7935c5bb..5d6f854d83 100644 --- a/src/fix_ave_chunk.cpp +++ b/src/fix_ave_chunk.cpp @@ -279,7 +279,7 @@ FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) : if (modify->fix[ifix]->peratom_flag == 0) error->all(FLERR, "Fix ave/chunk fix does not calculate per-atom values"); - if (argindex[i] && modify->fix[ifix]->size_peratom_cols != 0) + if (argindex[i] == 0 && modify->fix[ifix]->size_peratom_cols != 0) error->all(FLERR, "Fix ave/chunk fix does not calculate a per-atom vector"); if (argindex[i] && modify->fix[ifix]->size_peratom_cols == 0) diff --git a/src/fix_ave_spatial.cpp b/src/fix_ave_spatial.cpp index 9a6daa51d5..521f0956bd 100644 --- a/src/fix_ave_spatial.cpp +++ b/src/fix_ave_spatial.cpp @@ -328,7 +328,7 @@ FixAveSpatial::FixAveSpatial(LAMMPS *lmp, int narg, char **arg) : if (modify->fix[ifix]->peratom_flag == 0) error->all(FLERR, "Fix ave/spatial fix does not calculate per-atom values"); - if (argindex[i] && modify->fix[ifix]->size_peratom_cols != 0) + if (argindex[i] == 0 && modify->fix[ifix]->size_peratom_cols != 0) error->all(FLERR, "Fix ave/spatial fix does not calculate a per-atom vector"); if (argindex[i] && modify->fix[ifix]->size_peratom_cols == 0)