ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into arg-info-class

Browse Source 
# Conflicts:
#	src/compute_chunk_atom.cpp
#	src/compute_chunk_spread_atom.cpp
#	src/compute_reduce.cpp
#	src/compute_reduce_region.cpp
#	src/compute_slice.cpp
#	src/fix_ave_atom.cpp
This commit is contained in:
Axel Kohlmeyer
2021-02-02 11:33:01 -05:00
parent 4d98d9f6aa f2479e7d05
commit c2c8c5e493
52 changed files with 487 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compute_reduce_chunk.cpp
View File

@ -31,7 +31,6 @@ using namespace LAMMPS_NS;
enum{SUM,MINN,MAXX};
#define INVOKED_PERATOM 8
#define BIG 1.0e20
@ -353,9 +352,9 @@ void ComputeReduceChunk::compute_one(int m, double *vchunk, int nstride)
if (which[m] == ArgInfo::COMPUTE) {
Compute *compute = modify->compute[vidx];
if (!(compute->invoked_flag & INVOKED_PERATOM)) {
if (!(compute->invoked_flag & Compute::INVOKED_PERATOM)) {
compute->compute_peratom();
compute->invoked_flag |= INVOKED_PERATOM;
compute->invoked_flag |= Compute::INVOKED_PERATOM;
}
if (argindex[m] == 0) {