diff --git a/doc/Manual.html b/doc/Manual.html index 75ac0b0f4f..36b05bdc30 100644 --- a/doc/Manual.html +++ b/doc/Manual.html @@ -1,7 +1,7 @@ LAMMPS-ICMS Users Manual - + @@ -22,7 +22,7 @@

LAMMPS-ICMS Documentation

-

9 Oct 2014 version +

21 Oct 2014 version

Version info:

diff --git a/doc/Manual.txt b/doc/Manual.txt index 8f0b31f628..934bf578a7 100644 --- a/doc/Manual.txt +++ b/doc/Manual.txt @@ -1,7 +1,7 @@ LAMMPS-ICMS Users Manual LAMMPS Users Manual - + @@ -19,7 +19,7 @@

LAMMPS-ICMS Documentation :c,h3 -9 Oct 2014 version :c,h4 +21 Oct 2014 version :c,h4 Version info: :h4 diff --git a/src/RIGID/fix_rigid_small.cpp b/src/RIGID/fix_rigid_small.cpp index 9dbf6e8266..45d283ffcc 100644 --- a/src/RIGID/fix_rigid_small.cpp +++ b/src/RIGID/fix_rigid_small.cpp @@ -1734,6 +1734,7 @@ void FixRigidSmall::setup_bodies_static() // dorientflag = 1 if any particle stores dipole orientation if (extended) { + grow_arrays(atom->nmax); if (atom->ellipsoid_flag) orientflag = 4; if (atom->line_flag) orientflag = 1; if (atom->tri_flag) orientflag = 4; diff --git a/src/USER-CUDA/fix_set_force_cuda.h b/src/USER-CUDA/fix_set_force_cuda.h index 67e8b4b02b..a195aec0ec 100644 --- a/src/USER-CUDA/fix_set_force_cuda.h +++ b/src/USER-CUDA/fix_set_force_cuda.h @@ -1,5 +1,5 @@ /* -*- c++ -*- ---------------------------------------------------------- - LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator + LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator Original Version: http://lammps.sandia.gov, Sandia National Laboratories diff --git a/src/USER-CUDA/pair_lj_sdk_cuda.h b/src/USER-CUDA/pair_lj_sdk_cuda.h index 8edcf504ad..5e7807cbd7 100644 --- a/src/USER-CUDA/pair_lj_sdk_cuda.h +++ b/src/USER-CUDA/pair_lj_sdk_cuda.h @@ -1,5 +1,5 @@ /* -*- c++ -*- ---------------------------------------------------------- - LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator + LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator Original Version: http://lammps.sandia.gov, Sandia National Laboratories diff --git a/src/VORONOI/compute_voronoi_atom.cpp b/src/VORONOI/compute_voronoi_atom.cpp index f312476836..ac3bcbda8d 100644 --- a/src/VORONOI/compute_voronoi_atom.cpp +++ b/src/VORONOI/compute_voronoi_atom.cpp @@ -15,6 +15,7 @@ Contributing author: Daniel Schwen ------------------------------------------------------------------------- */ +#include "mpi.h" #include "math.h" #include "string.h" #include "stdlib.h" diff --git a/src/version.h b/src/version.h index 960cd8e33a..319fda1dbd 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define LAMMPS_VERSION "9 Oct 2014" +#define LAMMPS_VERSION "21 Oct 2014"