From 3e5890065a5232ade99e915dab40495d7d6bf2d3 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 16 Jul 2010 00:14:20 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4380
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 doc/fix_thermal_conductivity.html | 9 ++++-----
 doc/fix_thermal_conductivity.txt  | 9 ++++-----
 doc/fix_viscosity.html            | 6 +++---
 doc/fix_viscosity.txt             | 6 +++---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/doc/fix_thermal_conductivity.html b/doc/fix_thermal_conductivity.html
index 7e26f434b7..d07ad5e68e 100644
--- a/doc/fix_thermal_conductivity.html
+++ b/doc/fix_thermal_conductivity.html
@@ -122,11 +122,10 @@ minimization</A>.
 </P>
 <P><B>Restrictions:</B>
 </P>
-<P>LAMMPS does not check, but the masses of all exchanged atom pairs
-should be the same to use this fix in a way that conserves both
-momentum and kinetic energy.  Thus you should not need to thermostat
-the system.  If you do use a thermostat, you may want to apply it only
-to the non-swapped dimensions (other than <I>vdim</I>).
+<P>Swaps conserve both momentum and kinetic energy, even if the masses of
+the swapped atoms are not equal.  Thus you should not need to
+thermostat the system.  If you do use a thermostat, you may want to
+apply it only to the non-swapped dimensions (other than <I>vdim</I>).
 </P>
 <P>LAMMPS does not check, but you should not use this fix to swap the
 kinetic energy of atoms that are in constrained molecules, e.g. via
diff --git a/doc/fix_thermal_conductivity.txt b/doc/fix_thermal_conductivity.txt
index c4671523e9..ed2206a766 100644
--- a/doc/fix_thermal_conductivity.txt
+++ b/doc/fix_thermal_conductivity.txt
@@ -112,11 +112,10 @@ minimization"_minimize.html.
 
 [Restrictions:]
 
-LAMMPS does not check, but the masses of all exchanged atom pairs
-should be the same to use this fix in a way that conserves both
-momentum and kinetic energy.  Thus you should not need to thermostat
-the system.  If you do use a thermostat, you may want to apply it only
-to the non-swapped dimensions (other than {vdim}).
+Swaps conserve both momentum and kinetic energy, even if the masses of
+the swapped atoms are not equal.  Thus you should not need to
+thermostat the system.  If you do use a thermostat, you may want to
+apply it only to the non-swapped dimensions (other than {vdim}).
 
 LAMMPS does not check, but you should not use this fix to swap the
 kinetic energy of atoms that are in constrained molecules, e.g. via
diff --git a/doc/fix_viscosity.html b/doc/fix_viscosity.html
index 8bd3775f69..a864ba390f 100644
--- a/doc/fix_viscosity.html
+++ b/doc/fix_viscosity.html
@@ -131,9 +131,9 @@ minimization</A>.
 </P>
 <P><B>Restrictions:</B>
 </P>
-<P>If the masses of all exchange partners are the same, then swaps
-conserve both momentum and kinetic energy.  Thus you should not need
-to thermostat the system.  If you do use a thermostat, you may want to
+<P>Swaps conserve both momentum and kinetic energy, even if the masses of
+the swapped atoms are not equal.  Thus you should not need to
+thermostat the system.  If you do use a thermostat, you may want to
 apply it only to the non-swapped dimensions (other than <I>vdim</I>).
 </P>
 <P>LAMMPS does not check, but you should not use this fix to swap
diff --git a/doc/fix_viscosity.txt b/doc/fix_viscosity.txt
index 4ce3861015..f1cc3ccbf1 100644
--- a/doc/fix_viscosity.txt
+++ b/doc/fix_viscosity.txt
@@ -120,9 +120,9 @@ minimization"_minimize.html.
 
 [Restrictions:]
 
-If the masses of all exchange partners are the same, then swaps
-conserve both momentum and kinetic energy.  Thus you should not need
-to thermostat the system.  If you do use a thermostat, you may want to
+Swaps conserve both momentum and kinetic energy, even if the masses of
+the swapped atoms are not equal.  Thus you should not need to
+thermostat the system.  If you do use a thermostat, you may want to
 apply it only to the non-swapped dimensions (other than {vdim}).
 
 LAMMPS does not check, but you should not use this fix to swap