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/dump_custom.cpp
View File

@ -46,7 +46,6 @@ enum{ID,MOL,PROC,PROCP1,TYPE,ELEMENT,MASS,
COMPUTE,FIX,VARIABLE,INAME,DNAME};
enum{LT,LE,GT,GE,EQ,NEQ,XOR};
#define INVOKED_PERATOM 8
#define ONEFIELD 32
#define DELTA 1048576
@ -585,9 +584,9 @@ int DumpCustom::count()
error->all(FLERR,"Compute used in dump between runs is not current");
} else {
for (i = 0; i < ncompute; i++) {
if (!(compute[i]->invoked_flag & INVOKED_PERATOM)) {
if (!(compute[i]->invoked_flag & Compute::INVOKED_PERATOM)) {
compute[i]->compute_peratom();
compute[i]->invoked_flag |= INVOKED_PERATOM;
compute[i]->invoked_flag |= Compute::INVOKED_PERATOM;
}
}
}