Merge branch 'develop' into general-triclinic
# Conflicts: # src/atom.cpp
This commit is contained in:
@ -24,8 +24,8 @@
|
||||
|
||||
using namespace LAMMPS_NS;
|
||||
|
||||
#define ONELINE 256
|
||||
#define DELTA 1048576
|
||||
static constexpr int ONELINE = 256;
|
||||
static constexpr int DELTA = 1048576;
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user