Merge pull request #1623 from akohlmey/next-version

Step version string for stable release
Merge pull request #1622 from akohlmey/fix-ave-histo-bugfix
2019-08-06 11:17:40 -04:00 · 2019-08-06 10:54:49 -04:00 · 2019-08-06 10:12:19 -04:00 · 2019-08-06 08:52:54 -04:00 · 2019-08-06 07:28:00 -04:00 · 2019-08-05 17:21:11 -06:00
5 changed files with 14 additions and 11 deletions
--- a/doc/lammps.1
+++ b/doc/lammps.1
@ -1,4 +1,4 @@
-.TH LAMMPS "6 August 2019" "2019-08-06"
+.TH LAMMPS "7 August 2019" "2019-08-07"
 .SH NAME
 .B LAMMPS
 \- Molecular Dynamics Simulator.
--- a/doc/src/Manual.txt
+++ b/doc/src/Manual.txt
@ -1,7 +1,7 @@
 <!-- HTML_ONLY -->
 <HEAD>
 <TITLE>LAMMPS Users Manual</TITLE>
-<META NAME="docnumber" CONTENT="6 Aug 2019 version">
+<META NAME="docnumber" CONTENT="7 Aug 2019 version">
 <META NAME="author" CONTENT="http://lammps.sandia.gov - Sandia National Laboratories">
 <META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License.">
 </HEAD>
@ -21,7 +21,7 @@
 :line

 LAMMPS Documentation :c,h1
-6 Aug 2019 version :c,h2
+7 Aug 2019 version :c,h2

 "What is a LAMMPS version?"_Manual_version.html

--- a/doc/src/replicate.txt
+++ b/doc/src/replicate.txt
@ -14,7 +14,8 @@ replicate nx ny nz {keyword} :pre

 nx,ny,nz = replication factors in each dimension :ulb
 optional {keyword} = {bbox} :l
-  {bbox} = only check atoms in replicas that overlap with a processor's sub-domain :ule
+  {bbox} = only check atoms in replicas that overlap with a processor's sub-domain :pre
+:ule

 [Examples:]

@ -45,11 +46,13 @@ file that crosses a periodic boundary should be between two atoms with
 image flags that differ by 1.  This will allow the bond to be
 unwrapped appropriately.

-The optional keyword {bbox} uses a bounding box to only check atoms
-in replicas that overlap with a processor's sub-domain when assigning
-atoms to processors, and thus can result in substantial speedups for
-calculations using a large number of processors. It does require
-temporarily using more memory.
+The optional keyword {bbox} uses a bounding box to only check atoms in
+replicas that overlap with a processor's sub-domain when assigning
+atoms to processors.  It typically results in a substantial speedup
+when using the replicate command on a large number of processors.  It
+does require temporary use of more memory, specifically that each
+processor can store all atoms in the entire system before it is
+replicated.

 [Restrictions:]

--- a/src/fix_ave_histo_weight.cpp
+++ b/src/fix_ave_histo_weight.cpp
@ -33,7 +33,7 @@ using namespace FixConst;
 enum{X,V,F,COMPUTE,FIX,VARIABLE};
 enum{ONE,RUNNING};
 enum{SCALAR,VECTOR,WINDOW};
-enum{GLOBAL,PERATOM,LOCAL};
+enum{DEFAULT,GLOBAL,PERATOM,LOCAL};
 enum{IGNORE,END,EXTRA};
 enum{SINGLE,VALUE};

--- a/src/version.h
+++ b/src/version.h
@ -1 +1 @@
-#define LAMMPS_VERSION "6 Aug 2019"
+#define LAMMPS_VERSION "7 Aug 2019"
Author	SHA1	Message	Date
Axel Kohlmeyer	d08d6b5fb0	Merge pull request #1623 from akohlmey/next-version Step version string for stable release	2019-08-06 11:17:40 -04:00
Axel Kohlmeyer	db621fc897	Merge pull request #1622 from akohlmey/fix-ave-histo-bugfix fix inconsistent enumerator bug in fix ave/histo vs fix ave/histo/weight	2019-08-06 10:54:49 -04:00
Axel Kohlmeyer	c820c92225	Merge pull request #1620 from lammps/replicate fix formatting and augment explanation for bbox option	2019-08-06 10:12:19 -04:00
Axel Kohlmeyer	59046e7444	step version number for stable release	2019-08-06 08:52:54 -04:00
Axel Kohlmeyer	4a55e9dd0c	fix inconsistent enumerator bug in fix ave/histo vs fix ave/histo/weight	2019-08-06 07:28:00 -04:00
Steve Plimpton	2d64323354	fix formatting and augment explanation for bbox option	2019-08-05 17:21:11 -06:00