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

15
src/compute_global_atom.cpp
View File

@ -27,9 +27,6 @@ using namespace LAMMPS_NS;
enum{VECTOR,ARRAY};
#define INVOKED_VECTOR 2
#define INVOKED_ARRAY 4
#define INVOKED_PERATOM 8
#define BIG 1.0e20
@ -303,9 +300,9 @@ void ComputeGlobalAtom::compute_peratom()
if (whichref == ArgInfo::COMPUTE) {
Compute *compute = modify->compute[ref2index];
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 (indexref == 0) {
@ -360,9 +357,9 @@ void ComputeGlobalAtom::compute_peratom()
if (which[m] == ArgInfo::COMPUTE) {
Compute *compute = modify->compute[value2index[m]];
if (!(compute->invoked_flag & INVOKED_VECTOR)) {
if (!(compute->invoked_flag & Compute::INVOKED_VECTOR)) {
compute->compute_vector();
compute->invoked_flag |= INVOKED_VECTOR;
compute->invoked_flag |= Compute::INVOKED_VECTOR;
}
source = compute->vector;
@ -418,9 +415,9 @@ void ComputeGlobalAtom::compute_peratom()
if (which[m] == ArgInfo::COMPUTE) {
Compute *compute = modify->compute[value2index[m]];
if (!(compute->invoked_flag & INVOKED_ARRAY)) {
if (!(compute->invoked_flag & Compute::INVOKED_ARRAY)) {
compute->compute_array();
compute->invoked_flag |= INVOKED_ARRAY;
compute->invoked_flag |= Compute::INVOKED_ARRAY;
}
double **compute_array = compute->array;