Commit 7dc8746f authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #39 from akohlmey/small-bugfixes

Collected small changes and bugfixes
parents 5d89493a 7bb880f0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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();
+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@
#include "error.h"
#include "memory.h"

// DEBUG
#include "update.h"

using namespace LAMMPS_NS;

#define BUFFACTOR 1.5
+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@
#include "memory.h"
#include "error.h"

// DEBUG
#include "update.h"

using namespace LAMMPS_NS;

#define BUFFACTOR 1.5
+9 −9
Original line number Diff line number Diff line
@@ -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 ||