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

sync with GH

Browse Source 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15597 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
sjplimp
2016-09-20 14:52:43 +00:00
parent 900c83960e
commit 558303072d
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/comm.cpp
View File

@ -87,7 +87,7 @@ Comm::Comm(LAMMPS *lmp) : Pointers(lmp)
} else if (getenv("OMP_NUM_THREADS") == NULL) {
nthreads = 1;
if (me == 0)
error->warning(FLERR,"OMP_NUM_THREADS environment is not set. "
error->message(FLERR,"OMP_NUM_THREADS environment is not set. "
"Defaulting to 1 thread.");
} else {
nthreads = omp_get_max_threads();

3
src/comm_brick.cpp
View File

@ -39,9 +39,6 @@
#include "error.h"
#include "memory.h"
// DEBUG
#include "update.h"
using namespace LAMMPS_NS;
#define BUFFACTOR 1.5

3
src/comm_tiled.cpp
View File

@ -28,9 +28,6 @@
#include "memory.h"
#include "error.h"
// DEBUG
#include "update.h"
using namespace LAMMPS_NS;
#define BUFFACTOR 1.5

18
src/fix_ave_atom.cpp
View File

@ -69,33 +69,33 @@ FixAveAtom::FixAveAtom(LAMMPS *lmp, int narg, char **arg) :
if (strcmp(arg[i],"x") == 0) {
which[i] = X;
argindex[i++] = 0;
argindex[i] = 0;
} else if (strcmp(arg[i],"y") == 0) {
which[i] = X;
argindex[i++] = 1;
argindex[i] = 1;
} else if (strcmp(arg[i],"z") == 0) {
which[i] = X;
argindex[i++] = 2;
argindex[i] = 2;
} else if (strcmp(arg[i],"vx") == 0) {
which[i] = V;
argindex[i++] = 0;
argindex[i] = 0;
} else if (strcmp(arg[i],"vy") == 0) {
which[i] = V;
argindex[i++] = 1;
argindex[i] = 1;
} else if (strcmp(arg[i],"vz") == 0) {
which[i] = V;
argindex[i++] = 2;
argindex[i] = 2;
} else if (strcmp(arg[i],"fx") == 0) {
which[i] = F;
argindex[i++] = 0;
argindex[i] = 0;
} else if (strcmp(arg[i],"fy") == 0) {
which[i] = F;
argindex[i++] = 1;
argindex[i] = 1;
} else if (strcmp(arg[i],"fz") == 0) {
which[i] = F;
argindex[i++] = 2;
argindex[i] = 2;
} else if (strncmp(arg[i],"c_",2) == 0 ||
strncmp(arg[i],"f_",2) == 0 ||