From aa618da536602affcf87b5f90c5e2618f636821f Mon Sep 17 00:00:00 2001 From: sjplimp Date: Fri, 2 Apr 2010 16:51:06 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3949 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- doc/Eqs/fix_box_relax1.jpg | Bin 0 -> 1792 bytes doc/Eqs/fix_box_relax1.tex | 9 + doc/Eqs/fix_box_relax2.jpg | Bin 0 -> 2114 bytes doc/Eqs/fix_box_relax2.tex | 9 + doc/Section_commands.html | 12 +- doc/Section_commands.txt | 8 +- doc/Section_howto.html | 24 +- doc/Section_howto.txt | 24 +- doc/boundary.html | 2 +- doc/boundary.txt | 2 +- doc/compute_temp.html | 2 +- doc/compute_temp.txt | 2 +- doc/compute_temp_com.html | 4 +- doc/compute_temp_com.txt | 4 +- doc/compute_temp_deform.html | 4 +- doc/compute_temp_deform.txt | 4 +- doc/compute_temp_partial.html | 4 +- doc/compute_temp_partial.txt | 4 +- doc/compute_temp_profile.html | 4 +- doc/compute_temp_profile.txt | 4 +- doc/compute_temp_ramp.html | 4 +- doc/compute_temp_ramp.txt | 4 +- doc/compute_temp_region.html | 6 +- doc/compute_temp_region.txt | 6 +- doc/fix.html | 10 +- doc/fix.txt | 10 +- doc/fix_addforce.html | 12 +- doc/fix_addforce.txt | 12 +- doc/fix_atc.html | 2 +- doc/fix_atc.txt | 2 +- doc/fix_ave_histo.html | 2 +- doc/fix_ave_histo.txt | 2 +- doc/fix_ave_time.html | 11 +- doc/fix_ave_time.txt | 11 +- doc/fix_aveforce.html | 10 +- doc/fix_aveforce.txt | 10 +- doc/fix_bond_break.html | 4 +- doc/fix_bond_break.txt | 4 +- doc/fix_bond_create.html | 4 +- doc/fix_bond_create.txt | 4 +- doc/fix_bond_swap.html | 4 +- doc/fix_bond_swap.txt | 4 +- doc/fix_box_relax.html | 242 +++++++++++----- doc/fix_box_relax.txt | 234 +++++++++++---- doc/fix_deform.html | 16 +- doc/fix_deform.txt | 16 +- doc/fix_deposit.html | 10 +- doc/fix_deposit.txt | 10 +- doc/fix_drag.html | 8 +- doc/fix_drag.txt | 8 +- doc/fix_dt_reset.html | 11 +- doc/fix_dt_reset.txt | 11 +- doc/fix_efield.html | 4 +- doc/fix_efield.txt | 4 +- doc/fix_enforce2d.html | 4 +- doc/fix_enforce2d.txt | 4 +- doc/fix_evaporate.html | 7 +- doc/fix_evaporate.txt | 7 +- doc/fix_freeze.html | 10 +- doc/fix_freeze.txt | 10 +- doc/fix_gravity.html | 4 +- doc/fix_gravity.txt | 4 +- doc/fix_heat.html | 12 +- doc/fix_heat.txt | 12 +- doc/fix_indent.html | 4 +- doc/fix_indent.txt | 4 +- doc/fix_langevin.html | 18 +- doc/fix_langevin.txt | 18 +- doc/fix_lineforce.html | 4 +- doc/fix_lineforce.txt | 4 +- doc/fix_momentum.html | 4 +- doc/fix_momentum.txt | 4 +- doc/fix_move.html | 8 +- doc/fix_move.txt | 8 +- doc/fix_nh.html | 454 ++++++++++++++++++++++++++++++ doc/fix_nh.txt | 440 +++++++++++++++++++++++++++++ doc/fix_nph.html | 227 --------------- doc/fix_nph.txt | 213 -------------- doc/fix_nph_asphere.html | 129 +++++++++ doc/fix_nph_asphere.txt | 124 ++++++++ doc/fix_nph_sphere.html | 129 +++++++++ doc/fix_nph_sphere.txt | 124 ++++++++ doc/fix_npt.html | 273 ------------------ doc/fix_npt.txt | 257 ----------------- doc/fix_npt_asphere.html | 134 ++------- doc/fix_npt_asphere.txt | 126 ++------- doc/fix_npt_sphere.html | 133 ++------- doc/fix_npt_sphere.txt | 125 ++------ doc/fix_nve.html | 6 +- doc/fix_nve.txt | 6 +- doc/fix_nve_asphere.html | 4 +- doc/fix_nve_asphere.txt | 4 +- doc/fix_nve_limit.html | 18 +- doc/fix_nve_limit.txt | 18 +- doc/fix_nve_noforce.html | 4 +- doc/fix_nve_noforce.txt | 4 +- doc/fix_nve_sphere.html | 4 +- doc/fix_nve_sphere.txt | 4 +- doc/fix_nvt.html | 189 ------------- doc/fix_nvt.txt | 176 ------------ doc/fix_nvt_asphere.html | 63 ++--- doc/fix_nvt_asphere.txt | 57 ++-- doc/fix_nvt_sllod.html | 68 ++--- doc/fix_nvt_sllod.txt | 62 ++-- doc/fix_nvt_sphere.html | 62 +--- doc/fix_nvt_sphere.txt | 56 +--- doc/fix_orient_fcc.html | 8 +- doc/fix_orient_fcc.txt | 8 +- doc/fix_planeforce.html | 4 +- doc/fix_planeforce.txt | 4 +- doc/fix_poems.html | 4 +- doc/fix_poems.txt | 4 +- doc/fix_pour.html | 10 +- doc/fix_pour.txt | 10 +- doc/fix_press_berendsen.html | 163 ++++++----- doc/fix_press_berendsen.txt | 164 ++++++----- doc/fix_print.html | 4 +- doc/fix_print.txt | 4 +- doc/fix_reax_bonds.html | 4 +- doc/fix_reax_bonds.txt | 4 +- doc/fix_recenter.html | 6 +- doc/fix_recenter.txt | 6 +- doc/fix_setforce.html | 10 +- doc/fix_setforce.txt | 10 +- doc/fix_shake.html | 4 +- doc/fix_shake.txt | 4 +- doc/fix_spring.html | 24 +- doc/fix_spring.txt | 24 +- doc/fix_spring_rg.html | 4 +- doc/fix_spring_rg.txt | 4 +- doc/fix_spring_self.html | 9 +- doc/fix_spring_self.txt | 9 +- doc/fix_temp_berendsen.html | 10 +- doc/fix_temp_berendsen.txt | 10 +- doc/fix_temp_rescale.html | 14 +- doc/fix_temp_rescale.txt | 14 +- doc/fix_thermal_conductivity.html | 17 +- doc/fix_thermal_conductivity.txt | 17 +- doc/fix_tmd.html | 4 +- doc/fix_tmd.txt | 4 +- doc/fix_ttm.html | 14 +- doc/fix_ttm.txt | 14 +- doc/fix_viscosity.html | 12 +- doc/fix_viscosity.txt | 12 +- doc/fix_viscous.html | 4 +- doc/fix_viscous.txt | 4 +- doc/fix_wall.html | 22 +- doc/fix_wall.txt | 22 +- doc/fix_wall_gran.html | 10 +- doc/fix_wall_gran.txt | 10 +- doc/fix_wall_reflect.html | 4 +- doc/fix_wall_reflect.txt | 4 +- doc/fix_wall_region.html | 12 +- doc/fix_wall_region.txt | 12 +- doc/pair_modify.html | 4 +- doc/pair_modify.txt | 2 +- doc/reset_timestep.html | 2 +- doc/reset_timestep.txt | 2 +- doc/temper.html | 2 +- doc/temper.txt | 2 +- 160 files changed, 2639 insertions(+), 2811 deletions(-) create mode 100644 doc/Eqs/fix_box_relax1.jpg create mode 100644 doc/Eqs/fix_box_relax1.tex create mode 100644 doc/Eqs/fix_box_relax2.jpg create mode 100644 doc/Eqs/fix_box_relax2.tex create mode 100644 doc/fix_nh.html create mode 100644 doc/fix_nh.txt delete mode 100644 doc/fix_nph.html delete mode 100644 doc/fix_nph.txt create mode 100644 doc/fix_nph_asphere.html create mode 100755 doc/fix_nph_asphere.txt create mode 100644 doc/fix_nph_sphere.html create mode 100755 doc/fix_nph_sphere.txt delete mode 100644 doc/fix_npt.html delete mode 100644 doc/fix_npt.txt delete mode 100644 doc/fix_nvt.html delete mode 100644 doc/fix_nvt.txt diff --git a/doc/Eqs/fix_box_relax1.jpg b/doc/Eqs/fix_box_relax1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a4b6dda6ea88cac932ce693e476bc2e1677e057c GIT binary patch literal 1792 zcmV+b2mkp0*#F=F5K2Z#MgRc;0RTtG1Oo*G1Ox>I1qKHU2nPoT z2M-Gi2@DYr5)u&)5fKv>92XN58Wj-{7$F!M9UUJZ9}^cMBqAOp93CGY|G)qX2ml}e z;{gE?0RO}Q8~_0T0s{d70RR9100000000051_1*H1Of>E!~iT100II60RsaB0s;d8 z000000RjUA1rY!S5+Mf@F%&^jVIndkkwS5yf&bb72mt{A06zfzm&Y7&#~g9T9CHfF z+wEZ5IyyfG@yzkZ9CHrJgKoh_z}Y(TPJsUae9s(l#~g9T9CMN9CQClFXYzvpa@D$f zr{S!~79twl?qxd;!(>MsK75cQAbg$ld=?iQiMf-T9}EzildO`YDiKtO)j-hkzZ>3x zJ;U%h=(BdrQ?zm7ZrD++NgKix`1^M_Kl#tPcBh_FlH+aFP`mGyq9Fdii<7_peYr>L zigmNTuJmReXd#*!74GHjE5sNuRY)R2PuR7FeR=Z`KVi!nW9VJ$iL!E2f=d|csa`4l zq1=xlEbHC#u%aSA0nWd%I-H^_nF^KUE8G@Yl?fl66Y=2k7t`LLubSx$6^Zhd zEo5zDV484}Cv!;AD>?07k0kg5$38t-%qLI!XViIyiaDCDI%b9`6f(;xQX@hS&vTU; z{qn7i>4Qh6dPfI@rzLARhNRc?a=>e{#RqAa68d=z!5TB*jY!3a(A~q-oW-mMr}^y7 z5`yJQ6G>FK+KIbJkGu8USARY^O!cP`PZ7{vGhnCGLxRuZT3ILm03?z`)}n?|#Q9>v zLd;3>e4X;+c7+b5&BE5|LuQ^Da`7{$VD`I8oqmuK56CQj#y(5svY5<8Ppiu0YEZA- z7u~Zm#GS|BZHOD>Qgz2gJE|vGbn`PEDvXpQllcDJ_Vr#ZGkr0W#7K(ka-@)e-y3Bh zAJGR#e{FN0`e|yPQu-az7PSJYHe%XnkQ(ae}Vm(3HbZ- zUr=>UKDJw@p{tz7tX8rw4WK8C_eLsMa0x#j%@FKs<6nInB}-MU#qU(H4T$%y_?$4` z<71qoIWk%Gqd$}w1D37R-9HUxK(P?k=W{98b{ir%;q&ByAp_*^qu{W(+)d1!*!WMydvfjriX53GN?($w10npkdqqC3oZly&wEP>zU@UJO;_CCXe3;Br$gm z@T8C%Upm+$f39rfhTm!JARTxlZ1@Uh#(w2|-5Ks?vJHM|X2&~rx3wHdniCDG zq(}hR_&*!vhXX=PZYm0s+k3VY7M{zfQ#6cr@7g>r$vRQs4FTYDHgT1#PSZ&x)n?Yj zcVZ$m_T%TdGs2vG(GxXwv#A)@Tf? zBw_p0Ksxr7CH(o=Z$AT)IO<7GIW)#eW{}G?hvnRWH~Iho0Q&$3+n%mPbapm;H%Q^J z7M?erjR-4B(UMTIMyg081Fer61Cjorbj_Zt##F|pQaV+k$W^;K8s6`}>`ap^XZbFa zvM&Dm=8skA-pX`D_^PR5MZG{E zW`fQ9bdX0Z!AnIeAqwml_>!%nb+O~|$nK%V$LcqxmT?wjmlZAeQ7jJ7@>87|S(J_F zm37zP>wZD=XU9{5g(#|5QX`FYHg;J2mM8AS?34E-o_aXroW|#;&C|Y)GS-G76&M5D z?x7TXu>}U=M4uy2RUNaIBr0 zUf$&c&Ww#dt4!Zll3I_00^O zy7Ae`*{@#hGg?S!MIp0YrY~T*37}Rp?5JMS3Wsg%k+(ZPSw3H>7ZvrelzKHW@|saH zFMIz0l4W9~vM8N)4|a`d4wt-cZ=h{;1&MRxJeHO?^0LQ{_u)iura-ZSwE#DBq>_WL i>ne?s4y^of#~g9T9C61SamO5S#~g9T9C61SbN|_I5>ze# literal 0 HcmV?d00001 diff --git a/doc/Eqs/fix_box_relax1.tex b/doc/Eqs/fix_box_relax1.tex new file mode 100644 index 0000000000..a332360666 --- /dev/null +++ b/doc/Eqs/fix_box_relax1.tex @@ -0,0 +1,9 @@ +\documentclass[12pt]{article} + +\begin{document} + +$$ +E = U + P_t \left(V-V_0 \right) + E_{strain} +$$ + +\end{document} diff --git a/doc/Eqs/fix_box_relax2.jpg b/doc/Eqs/fix_box_relax2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5ab0dd93bd63b1f7f2df6f97006fc48ea5fb2193 GIT binary patch literal 2114 zcmV-I2)+0J*#F=F5K2Z#MgRc;0RTtG1Oo*G1Ox>I1qKHU2nPoT z2M-Gi2@DYr5)u&)5fKv>92XN58Wj-{7$F!M9UUJZ9}^cMBqAOp93CGY|G)qX2mmbr zz5xLd0RO}Q8~_0T0s{d70RR9100000000041_K2L2mu2B!~i%D009F70|EpD0tg2H z000000RjUA00j{S5+MgM6Cy!T2oxi6VUZOUB{V`(Vu2SjGlP?%@&DQY2mt{A06zfs zT`5XZl%*+3Qk11D1euXzJr$V}8)?aImSd$#!F6E@SxSA*#4T9%N%pMtr723SYMpnb z^u^j0s`olXS(gRugxG@npEAGXY@q}#U(yL9BaUl5k67uu&E@+fE09gvJ3;4QNoB~= zQrYb1gz8eVjzHW7KN{asia1FpI0HNk)pjnn(^75gxV1Uq3AfiB*)BtQ4K(5wTUc7u zfRyc8N=YODLCs0k`ku+8tn0jL8E!+jwtlRE9mf#R_gO+t(dm}KjzvzTRHStyM#qUJbGJu?2+l31CkQeOUFlZRl)e$+ zsP6KBl^mS*3o*DH@2GpKL^|z2lYbB#n zSU*|a(DCL=RpQ?T5>~{PAKa+<*q1z46Sdr^5L6VRNIB#huvV8_-_xb^yxZ#GJ24R( z-nQFXQgQE->GsLzwM5r4q}bVKRJASC!?&N>ammX|ib(Mt$MC74^*0XbO432dDaC)X z&7IT@KXvd_?Y`d{MsX=f2#~cj5VDYY0kHab2Rra^IjQ=ORoJxc%F%DUN_sQ*iD`!f zh>oqdUr;42mlBeMD1b-`BOo7RTe?z|t_Sf%sVM4yMpX@#UXV2s{5IWmwuLJV;1vX@ zf%xq|YP!PEmusI{BK0Rxy#_0`+hXnZ_z)di!_G-tj=Hp?cX9$k20M~!?RuH=o)_&~ zbPfBzdro)bALa9>wt4T|cBoNqz9g2L{baDcxnOv0w}r1Ku=>Z7>B0L{tzCJKr!=kG zP)p`LvJ=wW9_eibWPjCA^mdB8N$AC=Mcx-49C>g6y(tS*k4Z0Oa$6iEHe6EN1zA=B zAPkV9t@xk1L%aMkYe|qCE-)Hf8;VMDwxtG_jQ1OmtRBQ*jtyVBYNC#qX_ck5IHcKP zkc8tZ`U&7rk+BaK0s%d@eI;c*#~JP_zcoePwc1d=(e&)qH_xk*Vucg` z02*=alkZf^q&f4xEG97q?ER>n2OO#R?KZbRe}4c65~PlM&gh>2pB<9juMig+ck33S}qj*A92%m#}jR4;GM5HP^X9= zfGZsEJ%6=qb%a#Q(Km>5cDk3XueA2jv?vzT6@in0a(zvHbPTtr=uJO5O1D2E*%{Xr z?xi%6Pv&ZY@g#@bccyK{crx;}+#rVvcWfp+pEf;l-xZrjYg>d3Z?5#-pt;DqGiJJ5 zqFUCb8cdg!E;1Yq5ZX|Kg%i#O6OyBWk+ZoLQdftPK~b zA+s_Y5!-4@QQmc?>MnXXw3SCo5Q6m}7Sx!0iJ@~}hs6y$UiHB>8 zXp3f3R;ZyK9l0|f`7^MB3fSM_tnL9ssU($ha(StGYfdiJsx=Ma(FtbjEia+OHHT7w z%Poe<^Z>S{9!}!2e7M1js?w`=yVDwoQf$CZt`LnZc0S=(ysvI_-VrMl!8itNElHn7(CS~Z%v!9qUmqZ_Ogpz!%jVF zVn59lCL5|!ib(NRNNrvrBqOmwJ4sb^+iY_V-5MgCE|wWXWn^P^&<20LD!x_$`HFxd;TfuVkS|jApEGqcaX05hJH-EH;+gPqI=l2jnYLskEhw zQpmTzd5ZLhEz$&-du6)NW#Nz<0SW_n1c0vK5Y@iDN0h5r72(k*|j0coB#j- literal 0 HcmV?d00001 diff --git a/doc/Eqs/fix_box_relax2.tex b/doc/Eqs/fix_box_relax2.tex new file mode 100644 index 0000000000..bc9cddef4e --- /dev/null +++ b/doc/Eqs/fix_box_relax2.tex @@ -0,0 +1,9 @@ +\documentclass[12pt]{article} + +\begin{document} + +$$ +\mathbf P = P_t \mathbf I + {\mathbf S_t} \left( \mathbf h_0^{-1} \right)^t \mathbf h_{0d} +$$ + +\end{document} diff --git a/doc/Section_commands.html b/doc/Section_commands.html index 10e80e3078..c7532ed025 100644 --- a/doc/Section_commands.html +++ b/doc/Section_commands.html @@ -326,12 +326,12 @@ of each style or click on the style itself for a full description: addforceaveforceave/atomave/histoave/spatialave/timebond/breakbond/create bond/swapbox/relaxdeformdepositdragdt/resetefieldenforce2d evaporatefreezegravityheatindentlangevinlineforcemomentum -movenphnptnpt/aspherenpt/spherenvenve/aspherenve/limit -nve/noforcenve/spherenvtnvt/aspherenvt/sllodnvt/sphereorient/fccplaneforce -poemspourpress/berendsenprintreax/bondsrecenterrigidsetforce -shakespringspring/rgspring/selfstore/coordstore/forcetemp/berendsentemp/rescale -thermal/conductivitytmdttmviscosityviscouswall/colloidwall/granwall/harmonic -wall/lj126wall/lj93wall/reflectwall/region +movenphnph/aspherenph/spherenptnpt/aspherenpt/spherenve +nve/aspherenve/limitnve/noforcenve/spherenvtnvt/aspherenvt/sllodnvt/sphere +orient/fccplaneforcepoemspourpress/berendsenprintreax/bondsrecenter +rigidsetforceshakespringspring/rgspring/selfstore/coordstore/force +temp/berendsentemp/rescalethermal/conductivitytmdttmviscosityviscouswall/colloid +wall/granwall/harmonicwall/lj126wall/lj93wall/reflectwall/region

These are fix styles contributed by users, which can be used if diff --git a/doc/Section_commands.txt b/doc/Section_commands.txt index 5eface305e..b08517afd6 100644 --- a/doc/Section_commands.txt +++ b/doc/Section_commands.txt @@ -407,8 +407,10 @@ of each style or click on the style itself for a full description: "lineforce"_fix_lineforce.html, "momentum"_fix_momentum.html, "move"_fix_move.html, -"nph"_fix_nph.html, -"npt"_fix_npt.html, +"nph"_fix_nh.html, +"nph/asphere"_fix_nph_asphere.html, +"nph/sphere"_fix_nph_sphere.html, +"npt"_fix_nh.html, "npt/asphere"_fix_npt_asphere.html, "npt/sphere"_fix_npt_sphere.html, "nve"_fix_nve.html, @@ -416,7 +418,7 @@ of each style or click on the style itself for a full description: "nve/limit"_fix_nve_limit.html, "nve/noforce"_fix_nve_noforce.html, "nve/sphere"_fix_nve_sphere.html, -"nvt"_fix_nvt.html, +"nvt"_fix_nh.html, "nvt/asphere"_fix_nvt_asphere.html, "nvt/sllod"_fix_nvt_sllod.html, "nvt/sphere"_fix_nvt_sphere.html, diff --git a/doc/Section_howto.html b/doc/Section_howto.html index 53caec5c60..521ab237e6 100644 --- a/doc/Section_howto.html +++ b/doc/Section_howto.html @@ -307,7 +307,7 @@ processor partition, using the variable command: 

variable t world 300.0 310.0 320.0 330.0
-

Define a fix of style nvt or langevin +

Define a fix of style nvt or langevin to control the temperature of each simulation: 

fix myfix all nvt $t $t 100.0 
@@ -1266,7 +1266,7 @@ in prescribed ways.
 thermostatting fixes are currently available: Nose-Hoover (nvt),
 Berendsen, Langevin, and direct rescaling (temp/rescale):
 

-
  • fix nvt
+
-
    Fix nvt only thermostats the translational velocity of
+
    Fix nvt only thermostats the translational velocity of
 particles.  Fix nvt/sllod also does this, except
 that it subtracts out a velocity bias due to a deforming box and
 integrates the SLLOD equations of motion.  See the NEMD
@@ -1309,19 +1309,19 @@ as these:
 barosttating methods are currently available: Nose-Hoover (npt and
 nph) and Berendsen:
 
    
-
    • fix npt
+
-
      The fix npt commands include a Nose-Hoover thermostat
-and barostat.  Fix nph is just a Nose/Hoover barostat;
-it does no thermostatting.  Both fix nph and fix
+
      The fix npt commands include a Nose-Hoover thermostat
+and barostat.  Fix nph is just a Nose/Hoover barostat;
+it does no thermostatting.  Both fix nph and fix
 press/bernendsen can be used in conjunction
 with any of the thermostatting fixes.
 
      
-
      As with the thermostats, fix npt and fix
+
      As with the thermostats, fix npt and fix
 nph only use translational motion of the particles in
 computing T and P and performing thermo/barostatting.  Fix
 npt/sphere and fix
@@ -1341,8 +1341,8 @@ pressure.  See the doc pages for the individual fixes and for the
 fix_modify command for instructions on how to assign
 a temperature or pressure compute to a barostatting fix.
 
      
-
      IMPORTANT NOTE: As with the thermostats, the Nose/Hoover methods (fix
-npt and fix nph) perform time
+
      IMPORTANT NOTE: As with the thermostats, the Nose/Hoover methods (fix
+npt and fix nph) perform time
 integration.  Fix press/berendsen does NOT,
 so it should be used with one of the constant NVE fixes or with one of
 the NVT fixes.
@@ -1381,7 +1381,7 @@ or read in via the read_data command.
 they do not move at all, move together as a group at constant velocity
 or in response to a net force acting on them, move in a prescribed
 fashion (e.g. rotate around a point), etc.  Note that if a time
-integration fix like fix nve or fix nvt
+integration fix like fix nve or fix nvt
 is not used with the group that contains wall particles, their
 positions and velocities will not be updated.
 
      
diff --git a/doc/Section_howto.txt b/doc/Section_howto.txt
index 6d7c8ad6f4..c6396e3534 100644
--- a/doc/Section_howto.txt
+++ b/doc/Section_howto.txt
@@ -303,7 +303,7 @@ processor partition, using the "variable"_variable.html command:
 
 variable t world 300.0 310.0 320.0 330.0 :pre
 
-Define a fix of style "nvt"_fix_nvt.html or "langevin"_fix_langevin.html
+Define a fix of style "nvt"_fix_nh.html or "langevin"_fix_langevin.html
 to control the temperature of each simulation:
 
 fix myfix all nvt $t $t 100.0 :pre
@@ -1255,7 +1255,7 @@ Thermostatting in LAMMPS is performed by "fixes"_fix.html.  Four
 thermostatting fixes are currently available: Nose-Hoover (nvt),
 Berendsen, Langevin, and direct rescaling (temp/rescale):
 
-"fix nvt"_fix_nvt.html
+"fix nvt"_fix_nh.html
 "fix nvt/sphere"_fix_nvt_sphere.html
 "fix nvt/asphere"_fix_nvt_asphere.html
 "fix nvt/sllod"_fix_nvt_sllod.html
@@ -1263,7 +1263,7 @@ Berendsen, Langevin, and direct rescaling (temp/rescale):
 "fix langevin"_fix_langevin.html
 "fix temp/rescale"_fix_temp_rescale.html :ul
 
-"Fix nvt"_fix_nvt.html only thermostats the translational velocity of
+"Fix nvt"_fix_nh.html only thermostats the translational velocity of
 particles.  "Fix nvt/sllod"_fix_nvt_sllod.html also does this, except
 that it subtracts out a velocity bias due to a deforming box and
 integrates the SLLOD equations of motion.  See the "NEMD
@@ -1298,20 +1298,20 @@ Barostatting in LAMMPS is also performed by "fixes"_fix.html.  Two
 barosttating methods are currently available: Nose-Hoover (npt and
 nph) and Berendsen:
 
-"fix npt"_fix_npt.html
+"fix npt"_fix_nh.html
 "fix npt/sphere"_fix_npt_sphere.html
 "fix npt/asphere"_fix_npt_asphere.html
-"fix nph"_fix_nph.html
+"fix nph"_fix_nh.html
 "fix press/berendsen"_fix_press_berendsen.html :ul
 
-The "fix npt"_fix_npt.html commands include a Nose-Hoover thermostat
-and barostat.  "Fix nph"_fix_nph.html is just a Nose/Hoover barostat;
-it does no thermostatting.  Both "fix nph"_fix_nph.html and "fix
+The "fix npt"_fix_nh.html commands include a Nose-Hoover thermostat
+and barostat.  "Fix nph"_fix_nh.html is just a Nose/Hoover barostat;
+it does no thermostatting.  Both "fix nph"_fix_nh.html and "fix
 press/bernendsen"_fix_press_berendsen.html can be used in conjunction
 with any of the thermostatting fixes.
 
-As with the thermostats, "fix npt"_fix_npt.html and "fix
-nph"_fix_nph.html only use translational motion of the particles in
+As with the thermostats, "fix npt"_fix_nh.html and "fix
+nph"_fix_nh.html only use translational motion of the particles in
 computing T and P and performing thermo/barostatting.  "Fix
 npt/sphere"_fix_npt_sphere.html and "fix
 npt/asphere"_fix_npt_asphere.html thermo/barostat using not only
@@ -1331,7 +1331,7 @@ pressure.  See the doc pages for the individual fixes and for the
 a temperature or pressure compute to a barostatting fix.
 
 IMPORTANT NOTE: As with the thermostats, the Nose/Hoover methods ("fix
-npt"_fix_npt.html and "fix nph"_fix_nph.html) perform time
+npt"_fix_nh.html and "fix nph"_fix_nh.html) perform time
 integration.  "Fix press/berendsen"_fix_press_berendsen.html does NOT,
 so it should be used with one of the constant NVE fixes or with one of
 the NVT fixes.
@@ -1370,7 +1370,7 @@ Their motion can be constrained by many different commands, so that
 they do not move at all, move together as a group at constant velocity
 or in response to a net force acting on them, move in a prescribed
 fashion (e.g. rotate around a point), etc.  Note that if a time
-integration fix like "fix nve"_fix_nve.html or "fix nvt"_fix_nvt.html
+integration fix like "fix nve"_fix_nve.html or "fix nvt"_fix_nh.html
 is not used with the group that contains wall particles, their
 positions and velocities will not be updated.
 
diff --git a/doc/boundary.html b/doc/boundary.html
index 2c28433a15..29e7fd5e71 100644
--- a/doc/boundary.html
+++ b/doc/boundary.html
@@ -43,7 +43,7 @@ commands.
 
      The style p means the box is periodic, so that particles interact
 across the boundary, and they can exit one end of the box and re-enter
 the other end.  A periodic dimension can change in size due to
-constant pressure boundary conditions or box deformation (see the fix
+constant pressure boundary conditions or box deformation (see the fix
 npt and fix deform commands).  The p
 style must be applied to both faces of a dimension.
 
      
diff --git a/doc/boundary.txt b/doc/boundary.txt
index 8c238588b0..27282a16b8 100644
--- a/doc/boundary.txt
+++ b/doc/boundary.txt
@@ -39,7 +39,7 @@ The style {p} means the box is periodic, so that particles interact
 across the boundary, and they can exit one end of the box and re-enter
 the other end.  A periodic dimension can change in size due to
 constant pressure boundary conditions or box deformation (see the "fix
-npt"_fix_npt.html and "fix deform"_fix_deform.html commands).  The {p}
+npt"_fix_nh.html and "fix deform"_fix_deform.html commands).  The {p}
 style must be applied to both faces of a dimension.
 
 The styles {f}, {s}, and {m} mean the box is non-periodic, so that
diff --git a/doc/compute_temp.html b/doc/compute_temp.html
index b963fcd3a5..9c7209c9ec 100644
--- a/doc/compute_temp.html
+++ b/doc/compute_temp.html
@@ -28,7 +28,7 @@ compute myTemp mobile temp
 
      Define a computation that calculates the temperature of a group of
 atoms.  A compute of this style can be used by any command that
 computes a temperature, e.g. thermo_modify, fix
-temp/rescale, fix npt, etc.
+temp/rescale, fix npt, etc.
 
      
 
      The temperature is calculated by the formula KE = dim/2 N k T, where
 KE = total kinetic energy of the group of atoms (sum of 1/2 m v^2),
diff --git a/doc/compute_temp.txt b/doc/compute_temp.txt
index f2b36372f0..32bb3658a9 100644
--- a/doc/compute_temp.txt
+++ b/doc/compute_temp.txt
@@ -25,7 +25,7 @@ compute myTemp mobile temp :pre
 Define a computation that calculates the temperature of a group of
 atoms.  A compute of this style can be used by any command that
 computes a temperature, e.g. "thermo_modify"_thermo_modify.html, "fix
-temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_npt.html, etc.
+temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_nh.html, etc.
 
 The temperature is calculated by the formula KE = dim/2 N k T, where
 KE = total kinetic energy of the group of atoms (sum of 1/2 m v^2),
diff --git a/doc/compute_temp_com.html b/doc/compute_temp_com.html
index cd3363f63e..1472f34732 100644
--- a/doc/compute_temp_com.html
+++ b/doc/compute_temp_com.html
@@ -31,7 +31,7 @@ This is useful if the group is expected to have a non-zero net
 velocity for some reason.  A compute of this style can be used by any
 command that computes a temperature,
 e.g. thermo_modify, fix
-temp/rescale, fix npt, etc.
+temp/rescale, fix npt, etc.
 
      
 
      After the center-of-mass velocity has been subtracted from each atom,
 the temperature is calculated by the formula KE = dim/2 N k T, where
@@ -56,7 +56,7 @@ velocity of the atoms.  If this compute is used with a fix command
 that performs thermostatting then this bias will be subtracted from
 each atom, thermostatting of the remaining thermal velocity will be
 performed, and the bias will be added back in.  Thermostatting fixes
-that work in this way include fix nvt, fix
+that work in this way include fix nvt, fix
 temp/rescale, fix
 temp/berendsen, and fix
 langevin.
diff --git a/doc/compute_temp_com.txt b/doc/compute_temp_com.txt
index d2f44f0aa7..fe1e2bd027 100644
--- a/doc/compute_temp_com.txt
+++ b/doc/compute_temp_com.txt
@@ -28,7 +28,7 @@ This is useful if the group is expected to have a non-zero net
 velocity for some reason.  A compute of this style can be used by any
 command that computes a temperature,
 e.g. "thermo_modify"_thermo_modify.html, "fix
-temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_npt.html, etc.
+temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_nh.html, etc.
 
 After the center-of-mass velocity has been subtracted from each atom,
 the temperature is calculated by the formula KE = dim/2 N k T, where
@@ -53,7 +53,7 @@ velocity of the atoms.  If this compute is used with a fix command
 that performs thermostatting then this bias will be subtracted from
 each atom, thermostatting of the remaining thermal velocity will be
 performed, and the bias will be added back in.  Thermostatting fixes
-that work in this way include "fix nvt"_fix_nvt.html, "fix
+that work in this way include "fix nvt"_fix_nh.html, "fix
 temp/rescale"_fix_temp_rescale.html, "fix
 temp/berendsen"_fix_temp_berendsen, and "fix
 langevin"_fix_langevin.html.
diff --git a/doc/compute_temp_deform.html b/doc/compute_temp_deform.html
index 79d38515c6..75c81403b4 100644
--- a/doc/compute_temp_deform.html
+++ b/doc/compute_temp_deform.html
@@ -33,7 +33,7 @@ of this style is created by the fix nvt/sllod
 command to compute the thermal temperature of atoms for thermostatting
 purposes.  A compute of this style can also be used by any command
 that computes a temperature, e.g. thermo_modify,
-fix temp/rescale, fix npt, etc.
+fix temp/rescale, fix npt, etc.
 
      
 
      The deformation fix changes the box size and/or shape over time, so
 each atom in the simulation box can be thought of as having a
@@ -80,7 +80,7 @@ from the velocity of the atoms.  If this compute is used with a fix
 command that performs thermostatting then this bias will be subtracted
 from each atom, thermostatting of the remaining thermal velocity will
 be performed, and the bias will be added back in.  Thermostatting
-fixes that work in this way include fix nvt, fix
+fixes that work in this way include fix nvt, fix
 temp/rescale, fix
 temp/berendsen, and fix
 langevin.
diff --git a/doc/compute_temp_deform.txt b/doc/compute_temp_deform.txt
index af4805d03d..389e8e171a 100644
--- a/doc/compute_temp_deform.txt
+++ b/doc/compute_temp_deform.txt
@@ -30,7 +30,7 @@ of this style is created by the "fix nvt/sllod"_fix_nvt_sllod.html
 command to compute the thermal temperature of atoms for thermostatting
 purposes.  A compute of this style can also be used by any command
 that computes a temperature, e.g. "thermo_modify"_thermo_modify.html,
-"fix temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_npt.html, etc.
+"fix temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_nh.html, etc.
 
 The deformation fix changes the box size and/or shape over time, so
 each atom in the simulation box can be thought of as having a
@@ -77,7 +77,7 @@ from the velocity of the atoms.  If this compute is used with a fix
 command that performs thermostatting then this bias will be subtracted
 from each atom, thermostatting of the remaining thermal velocity will
 be performed, and the bias will be added back in.  Thermostatting
-fixes that work in this way include "fix nvt"_fix_nvt.html, "fix
+fixes that work in this way include "fix nvt"_fix_nh.html, "fix
 temp/rescale"_fix_temp_rescale.html, "fix
 temp/berendsen"_fix_temp_berendsen, and "fix
 langevin"_fix_langevin.html.
diff --git a/doc/compute_temp_partial.html b/doc/compute_temp_partial.html
index d92348d3ac..f7df8c55ce 100644
--- a/doc/compute_temp_partial.html
+++ b/doc/compute_temp_partial.html
@@ -29,7 +29,7 @@
 atoms, after excluding one or more velocity components.  A compute of
 this style can be used by any command that computes a temperature,
 e.g. thermo_modify, fix
-temp/rescale, fix npt, etc.
+temp/rescale, fix npt, etc.
 
      
 
      The temperature is calculated by the formula KE = dim/2 N k T, where
 KE = total kinetic energy of the group of atoms (sum of 1/2 m v^2),
@@ -56,7 +56,7 @@ velocity of the atoms.  If this compute is used with a fix command
 that performs thermostatting then this bias will be subtracted from
 each atom, thermostatting of the remaining thermal velocity will be
 performed, and the bias will be added back in.  Thermostatting fixes
-that work in this way include fix nvt, fix
+that work in this way include fix nvt, fix
 temp/rescale, fix
 temp/berendsen, and fix
 langevin.
diff --git a/doc/compute_temp_partial.txt b/doc/compute_temp_partial.txt
index b854c5fec1..82908d3520 100644
--- a/doc/compute_temp_partial.txt
+++ b/doc/compute_temp_partial.txt
@@ -26,7 +26,7 @@ Define a computation that calculates the temperature of a group of
 atoms, after excluding one or more velocity components.  A compute of
 this style can be used by any command that computes a temperature,
 e.g. "thermo_modify"_thermo_modify.html, "fix
-temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_npt.html, etc.
+temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_nh.html, etc.
 
 The temperature is calculated by the formula KE = dim/2 N k T, where
 KE = total kinetic energy of the group of atoms (sum of 1/2 m v^2),
@@ -53,7 +53,7 @@ velocity of the atoms.  If this compute is used with a fix command
 that performs thermostatting then this bias will be subtracted from
 each atom, thermostatting of the remaining thermal velocity will be
 performed, and the bias will be added back in.  Thermostatting fixes
-that work in this way include "fix nvt"_fix_nvt.html, "fix
+that work in this way include "fix nvt"_fix_nh.html, "fix
 temp/rescale"_fix_temp_rescale.html, "fix
 temp/berendsen"_fix_temp_berendsen, and "fix
 langevin"_fix_langevin.html.
diff --git a/doc/compute_temp_profile.html b/doc/compute_temp_profile.html
index ead2f15d9c..73e5107897 100644
--- a/doc/compute_temp_profile.html
+++ b/doc/compute_temp_profile.html
@@ -48,7 +48,7 @@ thermostatting a collection of atoms undergoing a complex flow,
 e.g. via a profile-unbiased thermostat (PUT) as described in
 (Evans).  A compute of this style can be used by any command
 that computes a temperature, e.g. thermo_modify,
-fix temp/rescale, fix npt, etc.
+fix temp/rescale, fix npt, etc.
 
      
 
      The xflag, yflag, zflag settings determine which components of
 average velocity are subtracted out.
@@ -94,7 +94,7 @@ from the velocity of the atoms.  If this compute is used with a fix
 command that performs thermostatting then this bias will be subtracted
 from each atom, thermostatting of the remaining thermal velocity will
 be performed, and the bias will be added back in.  Thermostatting
-fixes that work in this way include fix nvt, fix
+fixes that work in this way include fix nvt, fix
 temp/rescale, fix
 temp/berendsen, and fix
 langevin.
diff --git a/doc/compute_temp_profile.txt b/doc/compute_temp_profile.txt
index 143410e61a..4d13acbd26 100644
--- a/doc/compute_temp_profile.txt
+++ b/doc/compute_temp_profile.txt
@@ -40,7 +40,7 @@ thermostatting a collection of atoms undergoing a complex flow,
 e.g. via a profile-unbiased thermostat (PUT) as described in
 "(Evans)"_#Evans.  A compute of this style can be used by any command
 that computes a temperature, e.g. "thermo_modify"_thermo_modify.html,
-"fix temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_npt.html, etc.
+"fix temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_nh.html, etc.
 
 The {xflag}, {yflag}, {zflag} settings determine which components of
 average velocity are subtracted out.
@@ -86,7 +86,7 @@ from the velocity of the atoms.  If this compute is used with a fix
 command that performs thermostatting then this bias will be subtracted
 from each atom, thermostatting of the remaining thermal velocity will
 be performed, and the bias will be added back in.  Thermostatting
-fixes that work in this way include "fix nvt"_fix_nvt.html, "fix
+fixes that work in this way include "fix nvt"_fix_nh.html, "fix
 temp/rescale"_fix_temp_rescale.html, "fix
 temp/berendsen"_fix_temp_berendsen, and "fix
 langevin"_fix_langevin.html.
diff --git a/doc/compute_temp_ramp.html b/doc/compute_temp_ramp.html
index f181eb2192..c504d7f1d6 100644
--- a/doc/compute_temp_ramp.html
+++ b/doc/compute_temp_ramp.html
@@ -37,7 +37,7 @@ atoms, after subtracting out an ramped velocity profile before
 computing the kinetic energy.  A compute of this style can be used by
 any command that computes a temperature,
 e.g. thermo_modify, fix
-temp/rescale, fix npt, etc.
+temp/rescale, fix npt, etc.
 
      
 
      The meaning of the arguments for this command which define the
 velocity ramp are the same as for the velocity ramp
@@ -75,7 +75,7 @@ from the velocity of the atoms.  If this compute is used with a fix
 command that performs thermostatting then this bias will be subtracted
 from each atom, thermostatting of the remaining thermal velocity will
 be performed, and the bias will be added back in.  Thermostatting
-fixes that work in this way include fix nvt, fix
+fixes that work in this way include fix nvt, fix
 temp/rescale, fix
 temp/berendsen, and fix
 langevin.
diff --git a/doc/compute_temp_ramp.txt b/doc/compute_temp_ramp.txt
index 5db8ee552f..f7e5d92adf 100644
--- a/doc/compute_temp_ramp.txt
+++ b/doc/compute_temp_ramp.txt
@@ -33,7 +33,7 @@ atoms, after subtracting out an ramped velocity profile before
 computing the kinetic energy.  A compute of this style can be used by
 any command that computes a temperature,
 e.g. "thermo_modify"_thermo_modify.html, "fix
-temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_npt.html, etc.
+temp/rescale"_fix_temp_rescale.html, "fix npt"_fix_nh.html, etc.
 
 The meaning of the arguments for this command which define the
 velocity ramp are the same as for the "velocity ramp"_velocity.html
@@ -71,7 +71,7 @@ from the velocity of the atoms.  If this compute is used with a fix
 command that performs thermostatting then this bias will be subtracted
 from each atom, thermostatting of the remaining thermal velocity will
 be performed, and the bias will be added back in.  Thermostatting
-fixes that work in this way include "fix nvt"_fix_nvt.html, "fix
+fixes that work in this way include "fix nvt"_fix_nh.html, "fix
 temp/rescale"_fix_temp_rescale.html, "fix
 temp/berendsen"_fix_temp_berendsen, and "fix
 langevin"_fix_langevin.html.
diff --git a/doc/compute_temp_region.html b/doc/compute_temp_region.html
index 3e1e2a0a95..291746fa7c 100644
--- a/doc/compute_temp_region.html
+++ b/doc/compute_temp_region.html
@@ -36,8 +36,8 @@ temp/rescale, etc.
 
      Note that a region-style temperature can be used to thermostat with
 fix temp/rescale or fix
 langevin, but should probably not be used with
-Nose/Hoover style fixes (fix nvt, fix
-npt, or fix nph), if the
+Nose/Hoover style fixes (fix nvt, fix
+npt, or fix nph), if the
 degrees-of-freedom included in the computed T varies with time.
 
      
 
      The temperature is calculated by the formula KE = dim/2 N k T, where
@@ -66,7 +66,7 @@ compute is used with a fix command that performs thermostatting then
 this bias will be subtracted from each atom, thermostatting of the
 remaining thermal velocity will be performed, and the bias will be
 added back in.  Thermostatting fixes that work in this way include
-fix nvt, fix temp/rescale, fix
+fix nvt, fix temp/rescale, fix
 temp/berendsen, and fix
 langevin.  This means any of the thermostatting
 fixes can operate on a geometric region of atoms, as defined by this
diff --git a/doc/compute_temp_region.txt b/doc/compute_temp_region.txt
index 785833f830..c3e6092e46 100644
--- a/doc/compute_temp_region.txt
+++ b/doc/compute_temp_region.txt
@@ -33,8 +33,8 @@ temp/rescale"_fix_temp_rescale.html, etc.
 Note that a {region}-style temperature can be used to thermostat with
 "fix temp/rescale"_fix_temp_rescale.html or "fix
 langevin"_fix_langevin.html, but should probably not be used with
-Nose/Hoover style fixes ("fix nvt"_fix_nvt.html, "fix
-npt"_fix_npt.html, or "fix nph"_fix_nph.html), if the
+Nose/Hoover style fixes ("fix nvt"_fix_nh.html, "fix
+npt"_fix_nh.html, or "fix nph"_fix_nh.html), if the
 degrees-of-freedom included in the computed T varies with time.
 
 The temperature is calculated by the formula KE = dim/2 N k T, where
@@ -63,7 +63,7 @@ compute is used with a fix command that performs thermostatting then
 this bias will be subtracted from each atom, thermostatting of the
 remaining thermal velocity will be performed, and the bias will be
 added back in.  Thermostatting fixes that work in this way include
-"fix nvt"_fix_nvt.html, "fix temp/rescale"_fix_temp_rescale.html, "fix
+"fix nvt"_fix_nh.html, "fix temp/rescale"_fix_temp_rescale.html, "fix
 temp/berendsen"_fix_temp_berendsen, and "fix
 langevin"_fix_langevin.html.  This means any of the thermostatting
 fixes can operate on a geometric region of atoms, as defined by this
diff --git a/doc/fix.html b/doc/fix.html
index c66aaa06ba..db2b0ad5fc 100644
--- a/doc/fix.html
+++ b/doc/fix.html
@@ -50,7 +50,7 @@ underscores.
 off a fix; simply specifying a new fix with a similar style will not
 turn off the first one.  This is especially important to realize for
 integration fixes.  For example, using a fix nve
-command for a second run after using a fix nvt command
+command for a second run after using a fix nvt command
 for the first run, will not cancel out the NVT time integration
 invoked by the "fix nvt" command.  Thus two time integrators would be
 in place!
@@ -185,8 +185,10 @@ list of fix styles available in LAMMPS:
 
    • lineforce - constrain atoms to move in a line
 
    • momentum - zero the linear and/or angular momentum of a group of atoms
 
    • move - move atoms in a prescribed fashion
-
    • nph - constant NPH time integration via Nose/Hoover
-
    • npt - constant NPT time integration via Nose/Hoover
+
    • nph - constant NPH time integration via Nose/Hoover
+
    • nph/asphere - NPH for aspherical particles
+
    • nph/sphere - NPH for spherical particles
+
    • npt - constant NPT time integration via Nose/Hoover
 
    • npt/asphere - NPT for aspherical particles
 
    • npt/sphere - NPT for spherical particles
 
    • nve - constant NVE time integration
@@ -194,7 +196,7 @@ list of fix styles available in LAMMPS:
 
    • nve/limit - NVE with limited step length
 
    • nve/noforce - NVE without forces (v only)
 
    • nve/sphere - NVT for spherical particles
-
    • nvt - constant NVT time integration via Nose/Hoover
+
    • nvt - constant NVT time integration via Nose/Hoover
 
    • nvt/asphere - NVT for aspherical particles
 
    • nvt/sllod - NVT for NEMD with SLLOD equations
 
    • nvt/sphere - NVT for spherical particles
diff --git a/doc/fix.txt b/doc/fix.txt
index ae25e277e7..2e8662e580 100644
--- a/doc/fix.txt
+++ b/doc/fix.txt
@@ -47,7 +47,7 @@ IMPORTANT NOTE: The "unfix"_unfix.html command is the only way to turn
 off a fix; simply specifying a new fix with a similar style will not
 turn off the first one.  This is especially important to realize for
 integration fixes.  For example, using a "fix nve"_fix_nve.html
-command for a second run after using a "fix nvt"_fix_nvt.html command
+command for a second run after using a "fix nvt"_fix_nh.html command
 for the first run, will not cancel out the NVT time integration
 invoked by the "fix nvt" command.  Thus two time integrators would be
 in place!
@@ -180,8 +180,10 @@ list of fix styles available in LAMMPS:
 "lineforce"_fix_lineforce.html - constrain atoms to move in a line
 "momentum"_fix_momentum.html - zero the linear and/or angular momentum of a group of atoms
 "move"_fix_move.html - move atoms in a prescribed fashion
-"nph"_fix_nph.html - constant NPH time integration via Nose/Hoover
-"npt"_fix_npt.html - constant NPT time integration via Nose/Hoover
+"nph"_fix_nh.html - constant NPH time integration via Nose/Hoover
+"nph/asphere"_fix_nph_asphere.html - NPH for aspherical particles
+"nph/sphere"_fix_nph_sphere.html - NPH for spherical particles
+"npt"_fix_nh.html - constant NPT time integration via Nose/Hoover
 "npt/asphere"_fix_npt_asphere.html - NPT for aspherical particles
 "npt/sphere"_fix_npt_sphere.html - NPT for spherical particles
 "nve"_fix_nve.html - constant NVE time integration
@@ -189,7 +191,7 @@ list of fix styles available in LAMMPS:
 "nve/limit"_fix_nve_limit.html - NVE with limited step length
 "nve/noforce"_fix_nve_noforce.html - NVE without forces (v only)
 "nve/sphere"_fix_nve_sphere.html - NVT for spherical particles
-"nvt"_fix_nvt.html - constant NVT time integration via Nose/Hoover
+"nvt"_fix_nh.html - constant NVT time integration via Nose/Hoover
 "nvt/asphere"_fix_nvt_asphere.html - NVT for aspherical particles
 "nvt/sllod"_fix_nvt_sllod.html - NVT for NEMD with SLLOD equations
 "nvt/sphere"_fix_nvt_sphere.html - NVT for spherical particles
diff --git a/doc/fix_addforce.html b/doc/fix_addforce.html
index 3672a57ce4..53967d98b0 100644
--- a/doc/fix_addforce.html
+++ b/doc/fix_addforce.html
@@ -59,12 +59,12 @@ forces added by this fix in a consistent manner.  I.e. there is a
 decrease in potential energy when atoms move in the direction of the
 added force.
 
      
-
      This fix computes a scalar and a 3-vector of forces, which can be
-accessed by various output commands.  The
-scalar is the potential energy discussed above.  The vector is the
-total force on the group of atoms before the forces on individual
-atoms are changed by the fix.  The scalar vector values calculated by
-this fix are "extensive".
+
      This fix computes a global scalar and a global 3-vector of forces,
+which can be accessed by various output
+commands.  The scalar is the potential energy
+discussed above.  The vector is the total force on the group of atoms
+before the forces on individual atoms are changed by the fix.  The
+scalar and vector values calculated by this fix are "extensive".
 
      
 
      No parameter of this fix can be used with the start/stop keywords of
 the run command.
diff --git a/doc/fix_addforce.txt b/doc/fix_addforce.txt
index 4003824ff9..29579b1c4f 100644
--- a/doc/fix_addforce.txt
+++ b/doc/fix_addforce.txt
@@ -50,12 +50,12 @@ forces added by this fix in a consistent manner.  I.e. there is a
 decrease in potential energy when atoms move in the direction of the
 added force.
 
-This fix computes a scalar and a 3-vector of forces, which can be
-accessed by various "output commands"_Section_howto.html#4_15.  The
-scalar is the potential energy discussed above.  The vector is the
-total force on the group of atoms before the forces on individual
-atoms are changed by the fix.  The scalar vector values calculated by
-this fix are "extensive".
+This fix computes a global scalar and a global 3-vector of forces,
+which can be accessed by various "output
+commands"_Section_howto.html#4_15.  The scalar is the potential energy
+discussed above.  The vector is the total force on the group of atoms
+before the forces on individual atoms are changed by the fix.  The
+scalar and vector values calculated by this fix are "extensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.
diff --git a/doc/fix_atc.html b/doc/fix_atc.html
index 51e0f34821..85efdbdd70 100644
--- a/doc/fix_atc.html
+++ b/doc/fix_atc.html
@@ -71,7 +71,7 @@ book, for the basics of FE simulation.
 
      Thermal and two_temperature (coupling) types use a Verlet
 time-integration algorithm.  The hardy type does not contain its own
 time-integrator and must be used with a separate fix that does contain
-one, e.g. fix nve, fix nvt, etc.
+one, e.g. fix nve, fix nvt, etc.
 
      
 
      A set of example input files with the attendant material files are
 included in the examples/USER/atc directory of the LAMMPS
diff --git a/doc/fix_atc.txt b/doc/fix_atc.txt
index aa7a46c22b..ccde62405e 100644
--- a/doc/fix_atc.txt
+++ b/doc/fix_atc.txt
@@ -64,7 +64,7 @@ book"_#Hughes, for the basics of FE simulation.
 {Thermal} and {two_temperature} (coupling) types use a Verlet
 time-integration algorithm.  The {hardy} type does not contain its own
 time-integrator and must be used with a separate fix that does contain
-one, e.g. "fix nve"_fix_nve.html, "fix nvt"_fix_nvt.html, etc.
+one, e.g. "fix nve"_fix_nve.html, "fix nvt"_fix_nh.html, etc.
 
 A set of example input files with the attendant material files are
 included in the examples/USER/atc directory of the LAMMPS
diff --git a/doc/fix_ave_histo.html b/doc/fix_ave_histo.html
index e631ba640f..5dd92ff314 100644
--- a/doc/fix_ave_histo.html
+++ b/doc/fix_ave_histo.html
@@ -146,7 +146,7 @@ array calculated by the compute is used.
 which can sum per-atom quantities into a global scalar or vector which
 can thus be accessed by fix ave/histo.  Or it can be a compute defined
 not in your input script, but by thermodynamic
-output or other fixes such as fix
+output or other fixes such as fix
 nvt or fix temp/rescale.  See
 the doc pages for these commands which give the IDs of these computes.
 Users can also write code for their own compute styles and add them
diff --git a/doc/fix_ave_histo.txt b/doc/fix_ave_histo.txt
index f267dec1ab..35a04288c8 100644
--- a/doc/fix_ave_histo.txt
+++ b/doc/fix_ave_histo.txt
@@ -135,7 +135,7 @@ which can sum per-atom quantities into a global scalar or vector which
 can thus be accessed by fix ave/histo.  Or it can be a compute defined
 not in your input script, but by "thermodynamic
 output"_thermo_style.html or other fixes such as "fix
-nvt"_fix_nvt.html or "fix temp/rescale"_fix_temp_rescale.html.  See
+nvt"_fix_nh.html or "fix temp/rescale"_fix_temp_rescale.html.  See
 the doc pages for these commands which give the IDs of these computes.
 Users can also write code for their own compute styles and "add them
 to LAMMPS"_Section_modify.html.
diff --git a/doc/fix_ave_time.html b/doc/fix_ave_time.html
index 8b01cfa9f7..8ba7ed7b2b 100644
--- a/doc/fix_ave_time.html
+++ b/doc/fix_ave_time.html
@@ -141,7 +141,7 @@ the Ith column of the global array calculated by the compute is used.
 which can sum per-atom quantities into a global scalar or vector which
 can thus be accessed by fix ave/time.  Or it can be a compute defined
 not in your input script, but by thermodynamic
-output or other fixes such as fix
+output or other fixes such as fix
 nvt or fix temp/rescale.  See
 the doc pages for these commands which give the IDs of these computes.
 Users can also write code for their own compute styles and add them
@@ -263,10 +263,11 @@ appropriate fields from the fix ave/time command.
 files.  None of the fix_modify options
 are relevant to this fix.
 
      
-
      This fix produces a global scalar or vector or array which can be
-accessed by various output commands.  The
-values can only be accessed on timesteps that are multiples of Nfreq
-since that is when averaging is performed.
+
      This fix produces a global scalar or global vector or global array
+which can be accessed by various output
+commands.  The values can only be accessed on
+timesteps that are multiples of Nfreq since that is when averaging
+is performed.
 
      
 
      A scalar is produced if only a single input value is averaged and
 mode = scalar.  A vector is produced if multiple input values are
diff --git a/doc/fix_ave_time.txt b/doc/fix_ave_time.txt
index 9b8c10cfbc..d2eccc8464 100644
--- a/doc/fix_ave_time.txt
+++ b/doc/fix_ave_time.txt
@@ -130,7 +130,7 @@ which can sum per-atom quantities into a global scalar or vector which
 can thus be accessed by fix ave/time.  Or it can be a compute defined
 not in your input script, but by "thermodynamic
 output"_thermo_style.html or other fixes such as "fix
-nvt"_fix_nvt.html or "fix temp/rescale"_fix_temp_rescale.html.  See
+nvt"_fix_nh.html or "fix temp/rescale"_fix_temp_rescale.html.  See
 the doc pages for these commands which give the IDs of these computes.
 Users can also write code for their own compute styles and "add them
 to LAMMPS"_Section_modify.html.
@@ -251,10 +251,11 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-This fix produces a global scalar or vector or array which can be
-accessed by various "output commands"_Section_howto.html#4_15.  The
-values can only be accessed on timesteps that are multiples of {Nfreq}
-since that is when averaging is performed.
+This fix produces a global scalar or global vector or global array
+which can be accessed by various "output
+commands"_Section_howto.html#4_15.  The values can only be accessed on
+timesteps that are multiples of {Nfreq} since that is when averaging
+is performed.
 
 A scalar is produced if only a single input value is averaged and
 {mode} = scalar.  A vector is produced if multiple input values are
diff --git a/doc/fix_aveforce.html b/doc/fix_aveforce.html
index 7176281314..db67471695 100644
--- a/doc/fix_aveforce.html
+++ b/doc/fix_aveforce.html
@@ -62,11 +62,11 @@ to it.
 files.  None of the fix_modify options
 are relevant to this fix.
 
      
-
      This fix computes a 3-vector of forces, which can be accessed by
-various output commands.  This is the total
-force on the group of atoms before the forces on individual atoms are
-changed by the fix.  The vector values calculated by this fix are
-"extensive".
+
      This fix computes a global 3-vector of forces, which can be accessed
+by various output commands.  This is the
+total force on the group of atoms before the forces on individual
+atoms are changed by the fix.  The vector values calculated by this
+fix are "extensive".
 
      
 
      No parameter of this fix can be used with the start/stop keywords of
 the run command.
diff --git a/doc/fix_aveforce.txt b/doc/fix_aveforce.txt
index 5e60c33575..8e9ddd7ef6 100644
--- a/doc/fix_aveforce.txt
+++ b/doc/fix_aveforce.txt
@@ -53,11 +53,11 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-This fix computes a 3-vector of forces, which can be accessed by
-various "output commands"_Section_howto.html#4_15.  This is the total
-force on the group of atoms before the forces on individual atoms are
-changed by the fix.  The vector values calculated by this fix are
-"extensive".
+This fix computes a global 3-vector of forces, which can be accessed
+by various "output commands"_Section_howto.html#4_15.  This is the
+total force on the group of atoms before the forces on individual
+atoms are changed by the fix.  The vector values calculated by this
+fix are "extensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.
diff --git a/doc/fix_bond_break.html b/doc/fix_bond_break.html
index 4ef36b2951..956de2c47d 100644
--- a/doc/fix_bond_break.html
+++ b/doc/fix_bond_break.html
@@ -112,8 +112,8 @@ resulting from broken bonds.
 files.  None of the fix_modify options
 are relevant to this fix. 
 
      
-
      This fix computes two statistics which it stores in a vector of length
-2, which can be accessed by various output
+
      This fix computes two statistics which it stores in a global vector of
+length 2, which can be accessed by various output
 commands.  The vector values calculated by
 this fix are "intensive".
 
      
diff --git a/doc/fix_bond_break.txt b/doc/fix_bond_break.txt
index c7395cd377..233127dcb9 100755
--- a/doc/fix_bond_break.txt
+++ b/doc/fix_bond_break.txt
@@ -101,8 +101,8 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix. 
 
-This fix computes two statistics which it stores in a vector of length
-2, which can be accessed by various "output
+This fix computes two statistics which it stores in a global vector of
+length 2, which can be accessed by various "output
 commands"_Section_howto.html#4_15.  The vector values calculated by
 this fix are "intensive".
 
diff --git a/doc/fix_bond_create.html b/doc/fix_bond_create.html
index 5843b35cbe..750b68dfca 100644
--- a/doc/fix_bond_create.html
+++ b/doc/fix_bond_create.html
@@ -169,8 +169,8 @@ resulting from created bonds.
 files.  None of the fix_modify options
 are relevant to this fix. 
 
      
-
      This fix computes two statistics which it stores in a vector of length
-2, which can be accessed by various output
+
      This fix computes two statistics which it stores in a global vector of
+length 2, which can be accessed by various output
 commands.  The vector values calculated by
 this fix are "intensive".
 
      
diff --git a/doc/fix_bond_create.txt b/doc/fix_bond_create.txt
index 35800f600a..8613451319 100755
--- a/doc/fix_bond_create.txt
+++ b/doc/fix_bond_create.txt
@@ -157,8 +157,8 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix. 
 
-This fix computes two statistics which it stores in a vector of length
-2, which can be accessed by various "output
+This fix computes two statistics which it stores in a global vector of
+length 2, which can be accessed by various "output
 commands"_Section_howto.html#4_15.  The vector values calculated by
 this fix are "intensive".
 
diff --git a/doc/fix_bond_swap.html b/doc/fix_bond_swap.html
index 93da22ec68..a4ced35353 100644
--- a/doc/fix_bond_swap.html
+++ b/doc/fix_bond_swap.html
@@ -144,8 +144,8 @@ fix.  You can use it to assign a compute you have
 defined to this fix which will be used to compute the temperature for
 the Boltzmann criterion.
 
      
-
      This fix computes two statistical quantities as a 2-vector of output,
-which can be accessed by various output
+
      This fix computes two statistical quantities as a global 2-vector of
+output, which can be accessed by various output
 commands.  The first component of the vector
 is the cummulative number of swaps performed by all processors.  The
 second component of the vector is the cummulative number of swaps
diff --git a/doc/fix_bond_swap.txt b/doc/fix_bond_swap.txt
index 8d96001ac9..eba291c8c7 100755
--- a/doc/fix_bond_swap.txt
+++ b/doc/fix_bond_swap.txt
@@ -141,8 +141,8 @@ fix.  You can use it to assign a "compute"_compute.html you have
 defined to this fix which will be used to compute the temperature for
 the Boltzmann criterion.
 
-This fix computes two statistical quantities as a 2-vector of output,
-which can be accessed by various "output
+This fix computes two statistical quantities as a global 2-vector of
+output, which can be accessed by various "output
 commands"_Section_howto.html#4_15.  The first component of the vector
 is the cummulative number of swaps performed by all processors.  The
 second component of the vector is the cummulative number of swaps
diff --git a/doc/fix_box_relax.html b/doc/fix_box_relax.html
index d4a460274c..d6ccd57e86 100644
--- a/doc/fix_box_relax.html
+++ b/doc/fix_box_relax.html
@@ -13,68 +13,67 @@
 
 
      Syntax:
 
      
-
      fix ID group-ID box/relax style args keyword value ... 
+
      fix ID group-ID box/relax keyword value ... 
 
      
 
      • ID, group-ID are documented in fix command 
 
 
      • box/relax = style name of this fix command 
 
-
      • style = xyz or xy or yz or xz or aniso 
-
-
          xyz arg = P = desired pressure (pressure units)
-  xy or yz or xz or aniso args = Px Py Pz
-    Px,Py,Pz = desired pressure in x,y,z (pressure units) 
-
        
-
      • zero or more keyword/value pairs may be appended to the args 
-
-
      • keyword = dilate or vmax 
-
-
          dilate value = all or partial
-  vmax value = fraction = max allowed volume change in one iteration 
+
        one or more keyword value pairs may be appended
+keyword = iso or aniso or tri or x or y or z or xy or yz or xz or couple or nreset or vmax or dilate
+  iso or aniso or tri value = Ptarget = desired pressure (pressure units)
+  x or y or z or xy or yz or xz value = Ptarget = desired pressure (pressure units)
+  couple = none or xyz or xy or yz or xz
+  nreset value = reset reference cell every this many minimizer iterations
+  vmax value = fraction = max allowed volume change in one iteration
+  dilate value = all or partial 
 
        
 
 
      
 
      Examples:
 
      
-
      fix 1 all box/relax xyz 0.0 vmax 0.001
-fix 2 water box/relax aniso 0.0 0.0 1000.0 dilate partial 
+
      fix 1 all box/relax ixo 0.0 vmax 0.001
+fix 2 water box/relax aniso 0.0 dilate partial
+fix 2 ice box/relax tri 0.0 couple xy nreset 100 
 
      
 
      Description:
 
      
-
      Apply an external pressure to the simulation box during an energy
-minimization.  This allows the box dimensions to vary
-during the iterations of the minimizer so that the final configuration
-will be both an energy minimum for the potential energy of the atoms
-and the system pressure will be close to the desired pressure.
-Conceptually, specifying a positive pressure is like squeezing on the
-simulation box; a negative pressure typically allows the box to
-expand.
+
      Apply an external pressure or stress tensor to the simulation box
+during an energy minimization.  This allows the box
+size and shape to vary during the iterations of the minimizer so that
+the final configuration will be both an energy minimum for the
+potential energy of the atoms, and the system pressure tensor will be
+close to the specified external tensor.  Conceptually, specifying a
+positive pressure is like squeezing on the simulation box; a negative
+pressure typically allows the box to expand.
 
      
-
      The pressure can be specified in one of several styles, as determined
-by the style argument.
+
      
+
+
      The external pressure tensor is specified using one or more of the
+iso, aniso, tri, x, y, z, xy, xz, yz, and couple
+keywords.  These keywords give you the ability to specify all 6
+components of an external stress tensor, and to couple various of
+these components together so that the dimensions they represent are
+varied together during the mimimization.
 
      
-
      Style xyz means couple all 3 dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the 3 dimensions
-together.  Styles xy or yz or xz means that the 2 specified
-dimensions are coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently according to its specified pressure.  For style aniso,
-all 3 dimensions dilate/contract independently according to the 3
-specified pressure values.
+
      Orthogonal simulation boxes have 3 adjustable dimensions (x,y,z).
+Triclinic (non-orthogonal) simulation boxes have 6 adjustable
+dimensions (x,y,z,xy,xz,yz).  The create_box, read
+data, and read_restart commands
+specify whether the simulation box is orthogonal or non-orthogonal
+(triclinic) and explain the meaning of the xy,xz,yz tilt factors.
 
      
-
      For any of the styles except xyz, the target pressure for any
-independent components (e.g. z in xy, or any dimension in aniso)
-can be specified as NULL.  This means that no pressure is applied to
-that dimension so that the box dimension remains unchanged during the
-minimization.
+
      The target pressures Ptarget for each of the 6 components of the
+stress tensor can be specified independently via the x, y, z,
+xy, xz, yz keywords, which correspond to the 6 simulation box
+dimensions.  For example, if the y keyword is used, the y-box length
+will change during the minimization.  If the xy keyword is used, the
+xy tilt factor will change.  A box dimension will not change if that
+component is not specified.
 
      
-
      For styles xy and yz and xz, the target pressures must be the
-same for the two coupled dimensions and cannot be specified as NULL.
-
      
-
      For all pressure styles, the simulation box stays rectangular in
-shape.  Tilted boxes (triclinic symmetry) are supported by other
-LAMMPS commands (see this section of the
-manual), but not yet by this command.
+
      Note that in order to use the xy, xz, or yz keywords, the
+simulation box must be triclinic, even if its initial tilt factors are
+0.0.
 
      
 
      When the size of the simulation box changes, all atoms are re-scaled
 to new positions, unless the keyword dilate is specified with a
@@ -83,15 +82,111 @@ re-scaled.  This can be useful for leaving the coordinates of atoms in
 a solid substrate unchanged and controlling the pressure of a
 surrounding fluid.
 
      
+
      
+
+
      The couple keyword allows two or three of the diagonal components of
+the pressure tensor to be "coupled" together.  The value specified
+with the keyword determines which are coupled.  For example, xz
+means the Pxx and Pzz components of the stress tensor are coupled.
+Xyz means all 3 diagonal components are coupled.  Coupling means two
+things: the instantaneous stress will be computed as an average of the
+corresponding diagonal components, and the coupled box dimensions will
+be changed together in lockstep, meaning coupled dimensions will be
+dilated or contracted by the same percentage every timestep.  The
+Ptarget values for any coupled dimensions must be identical.
+Couple xyz can be used for a 2d simulation; the z dimension is
+simply ignored.
+
      
+
      
+
+
      The iso, aniso, and tri keywords are simply shortcuts that are
+equivalent to specifying several other keywords together.
+
      
+
      The keyword iso means couple all 3 diagonal components together when
+pressure is computed (hydrostatic pressure), and dilate/contract the
+dimensions together.  Using "iso Ptarget" is the same as specifying
+these 4 keywords:
+
      
+
      x Ptarget
+y Ptarget
+z Ptarget
+couple xyz 
+
      
+
      The keyword aniso means x, y, and z dimensions are controlled
+independently using the Pxx, Pyy, and Pzz components of the
+stress tensor as the driving forces, and the specified scalar external
+pressure.  Using "aniso Ptarget" is the same as specifying these 4
+keywords:
+
      
+
      x Ptarget
+y Ptarget
+z Ptarget
+couple none 
+
      
+
      The keyword tri means x, y, z, xy, xz, and yz dimensions
+are controlled independently using their individual stress components
+as the driving forces, and the specified scalar pressure as the
+external normal stress.  Using "tri Ptarget" is the same as specifying
+these 7 keywords:
+
      
+
      x Ptarget
+y Ptarget
+z Ptarget
+xy 0.0 
+yz 0.0 
+xz 0.0 
+couple none 
+
      
+
      
+
 
      The vmax keyword can be used to limit the fractional change in the
 volume of the simulation box that can occur in one iteration of the
 minimizer.  If the pressure is not settling down during the
 minimization this can be because the volume is fluctuating too much.
-The specfied fraction must be greater than 0.0 and should be << 1.0.
+The specified fraction must be greater than 0.0 and should be << 1.0.
 A value of 0.001 means the volume cannot change by more than 1/10 of a
-percent in one iteration for style xyz.  For the other styles it
-means no linear dimension of the simulation box can change by more
-than 1/10 of a percent.
+percent in one iteration when couple xyz has been specified.  For
+any other case it means no linear dimension of the simulation box can
+change by more than 1/10 of a percent.
+
      
+
      
+
+
      With this fix, the potential energy used by the minimzer is augmented
+by an additional energy provided by the fix. The overall objective
+function then is:
+
      
+
      
+
      
+
      where U is the system potential energy, P_t is the desired
+hydrostatic pressure, V and V_0 are the system and reference
+volumes, respectively.  E_strain is the strain energy expression
+proposed by Parrinello and Rahman (Parrinello1981).
+Taking derivatives of E w.r.t. the box dimensions, and setting these
+to zero, we find that at the minimum of the objective function, the
+global system stress tensor P will satisfy the relation:
+
      
+
      
+
      
+
      where I is the identity matric, h_0 is the box dimension tensor of
+the reference cell, and h_0d is the diagonal part of
+h_0. S_t is a symmetric stress tensor that is chosen by LAMMPS
+so that the upper-triangular components of P equal the stress tensor
+specified by the user.
+
      
+
      This equation only applies when the box dimensions are equal to those
+of the reference dimensions. If this is not the case, then the
+converged stress tensor will not equal that specified by the user.  We
+can resolve this problem by periodically resetting the reference
+dimensions. The keyword nreset_ref controls how often this is done.
+If this keyword is not used, or is given a value of zero, then the
+reference dimensions are set to those of the initial simulation domain
+and are never changed. A value of nstep means that every nstep
+minimization steps, the reference dimensions are set to those of the
+current simulation domain. Note that resetting the reference
+dimensions changes the objective function and gradients, which
+sometimes causes the minimization to fail. This can be resolved by
+changing the value of nreset, or simply continuing the minimization
+from a restart file.
 
      
 
      IMPORTANT NOTE: As normally computed, pressure includes a kinetic-
 energy or temperature-dependent component; see the compute
@@ -103,19 +198,19 @@ temperature and you print the usual thermodynamic pressure, it may not
 appear the system is converging to your specified pressure.  The
 solution for this is to either (a) zero the velocities of all atoms
 before performing the minimization, or (b) make sure you are
-monitoring the pressure without its kinetic component.  The latter
-can be done by outputting the pressure from the fix this command
-creates (see below) or a pressure fix you define yourself.
+monitoring the pressure without its kinetic component.  The latter can
+be done by outputting the pressure from the fix this command creates
+(see below) or a pressure fix you define yourself.
 
      
 
      IMPORTANT NOTE: Because pressure is often a very sensitive function of
 volume, it can be difficult for the minimizer to equilibrate the
-system the desired pressure with high precision.  Some techiniques
-that seem to help are (a) use the "min_modify line quadratic" option
-when minimizing with box relaxtions, and (b) minimize several times in
-succession if need be, to drive the pressure closer to the target
-pressure.  Also note that some systems (e.g. liquids) will not sustain
-an anisotropic applied pressure, which means the minimizer will not
-converge.
+system the desired pressure with high precision, particularly for
+solids.  Some techiniques that seem to help are (a) use the
+"min_modify line quadratic" option when minimizing with box
+relaxations, and (b) minimize several times in succession if need be,
+to drive the pressure closer to the target pressure.  Also note that
+some systems (e.g. liquids) will not sustain a non-hydrostatic applied
+pressure, which means the minimizer will not converge.
 
      
 
      
 
@@ -171,9 +266,11 @@ only if the temp keyword comes after the press keyword.  If the
 compute specified by the press keyword will be unaffected by the
 temp setting.
 
      
-
      No global scalar or vector or per-atom quantities are stored by this
-fix for access by various output commands.
-No parameter of this fix can be used with the start/stop keywords of
+
      This fix computes a global scalar which can be accessed by various
+output commands.  The scalar is the
+pressure-volume energy, plus the strain energy, if it exists.
+
      
+
      No parameter of this fix can be used with the start/stop keywords of
 the run command.
 
      
 
      This fix is invoked during energy minimization, but
@@ -183,16 +280,27 @@ described above.
 
      
 
      Restrictions:
 
      
-
      Any box dimension adjusted by this fix must be periodic.  A dimension
-whose target pressure is specified as NULL can be non-periodic or
-periodic.
+
      Only dimensions that are available can be adjusted by this fix.
+Non-periodic dimensions are not available.  z, xz, and yz, are
+not available for 2D simulations. xy, xz, and yz are only
+available if the simulation domain is non-orthogonal.  The
+create_box, read data, and
+read_restart commands specify whether the
+simulation box is orthogonal or non-orthogonal (triclinic) and explain
+the meaning of the xy,xz,yz tilt factors.
 
      
 
      Related commands:
 
      
-
      fix npt, minimize
+
      fix npt, minimize
 
      
 
      Default:
 
      
-
      The keyword defaults are dilate = all and vmax = 0.0001.
+
      The keyword defaults are dilate = all, vmax = 0.0001, nreset = 0.
+
      
+
      
+
+
+
+
      (Parrinello1981) Parrinello and Rahman, J Appl Phys, 52, 7182 (1981).
 
      
 
diff --git a/doc/fix_box_relax.txt b/doc/fix_box_relax.txt
index 164f763b0b..f8a82b00d4 100644
--- a/doc/fix_box_relax.txt
+++ b/doc/fix_box_relax.txt
@@ -10,62 +10,64 @@ fix box/relax command :h3
 
 [Syntax:]
 
-fix ID group-ID box/relax style args keyword value ... :pre
+fix ID group-ID box/relax keyword value ... :pre
 
 ID, group-ID are documented in "fix"_fix.html command :ulb,l
 box/relax = style name of this fix command :l
-style = {xyz} or {xy} or {yz} or {xz} or {aniso} :l
-  {xyz} arg = P = desired pressure (pressure units)
-  {xy} or {yz} or {xz} or {aniso} args = Px Py Pz
-    Px,Py,Pz = desired pressure in x,y,z (pressure units) :pre
-
-zero or more keyword/value pairs may be appended to the args :l
-keyword = {dilate} or {vmax} :l
-  {dilate} value = {all} or {partial}
-  {vmax} value = fraction = max allowed volume change in one iteration :pre
+one or more keyword value pairs may be appended
+keyword = {iso} or {aniso} or {tri} or {x} or {y} or {z} or {xy} or {yz} or {xz} or {couple} or {nreset} or {vmax} or {dilate}
+  {iso} or {aniso} or {tri} value = Ptarget = desired pressure (pressure units)
+  {x} or {y} or {z} or {xy} or {yz} or {xz} value = Ptarget = desired pressure (pressure units)
+  {couple} = {none} or {xyz} or {xy} or {yz} or {xz}
+  {nreset} value = reset reference cell every this many minimizer iterations
+  {vmax} value = fraction = max allowed volume change in one iteration
+  {dilate} value = {all} or {partial} :pre
 :ule
 
 [Examples:]
 
-fix 1 all box/relax xyz 0.0 vmax 0.001
-fix 2 water box/relax aniso 0.0 0.0 1000.0 dilate partial :pre
+fix 1 all box/relax ixo 0.0 vmax 0.001
+fix 2 water box/relax aniso 0.0 dilate partial
+fix 2 ice box/relax tri 0.0 couple xy nreset 100 :pre
 
 [Description:]
 
-Apply an external pressure to the simulation box during an "energy
-minimization"_minimize.html.  This allows the box dimensions to vary
-during the iterations of the minimizer so that the final configuration
-will be both an energy minimum for the potential energy of the atoms
-and the system pressure will be close to the desired pressure.
-Conceptually, specifying a positive pressure is like squeezing on the
-simulation box; a negative pressure typically allows the box to
-expand.
+Apply an external pressure or stress tensor to the simulation box
+during an "energy minimization"_minimize.html.  This allows the box
+size and shape to vary during the iterations of the minimizer so that
+the final configuration will be both an energy minimum for the
+potential energy of the atoms, and the system pressure tensor will be
+close to the specified external tensor.  Conceptually, specifying a
+positive pressure is like squeezing on the simulation box; a negative
+pressure typically allows the box to expand.
 
-The pressure can be specified in one of several styles, as determined
-by the {style} argument.
+:line
 
-Style {xyz} means couple all 3 dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the 3 dimensions
-together.  Styles {xy} or {yz} or {xz} means that the 2 specified
-dimensions are coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently according to its specified pressure.  For style {aniso},
-all 3 dimensions dilate/contract independently according to the 3
-specified pressure values.
+The external pressure tensor is specified using one or more of the
+{iso}, {aniso}, {tri}, {x}, {y}, {z}, {xy}, {xz}, {yz}, and {couple}
+keywords.  These keywords give you the ability to specify all 6
+components of an external stress tensor, and to couple various of
+these components together so that the dimensions they represent are
+varied together during the mimimization.
 
-For any of the styles except {xyz}, the target pressure for any
-independent components (e.g. z in {xy}, or any dimension in {aniso})
-can be specified as NULL.  This means that no pressure is applied to
-that dimension so that the box dimension remains unchanged during the
-minimization.
+Orthogonal simulation boxes have 3 adjustable dimensions (x,y,z).
+Triclinic (non-orthogonal) simulation boxes have 6 adjustable
+dimensions (x,y,z,xy,xz,yz).  The "create_box"_create_box.html, "read
+data"_read_data.html, and "read_restart"_read_restart.html commands
+specify whether the simulation box is orthogonal or non-orthogonal
+(triclinic) and explain the meaning of the xy,xz,yz tilt factors.
 
-For styles {xy} and {yz} and {xz}, the target pressures must be the
-same for the two coupled dimensions and cannot be specified as NULL.
+The target pressures {Ptarget} for each of the 6 components of the
+stress tensor can be specified independently via the {x}, {y}, {z},
+{xy}, {xz}, {yz} keywords, which correspond to the 6 simulation box
+dimensions.  For example, if the {y} keyword is used, the y-box length
+will change during the minimization.  If the {xy} keyword is used, the
+xy tilt factor will change.  A box dimension will not change if that
+component is not specified.
 
-For all pressure styles, the simulation box stays rectangular in
-shape.  Tilted boxes (triclinic symmetry) are supported by other
-LAMMPS commands (see "this section"_Section_howto.html#4_12 of the
-manual), but not yet by this command.
+Note that in order to use the {xy}, {xz}, or {yz} keywords, the
+simulation box must be triclinic, even if its initial tilt factors are
+0.0.
 
 When the size of the simulation box changes, all atoms are re-scaled
 to new positions, unless the keyword {dilate} is specified with a
@@ -74,15 +76,111 @@ re-scaled.  This can be useful for leaving the coordinates of atoms in
 a solid substrate unchanged and controlling the pressure of a
 surrounding fluid.
 
+:line
+
+The {couple} keyword allows two or three of the diagonal components of
+the pressure tensor to be "coupled" together.  The value specified
+with the keyword determines which are coupled.  For example, {xz}
+means the {Pxx} and {Pzz} components of the stress tensor are coupled.
+{Xyz} means all 3 diagonal components are coupled.  Coupling means two
+things: the instantaneous stress will be computed as an average of the
+corresponding diagonal components, and the coupled box dimensions will
+be changed together in lockstep, meaning coupled dimensions will be
+dilated or contracted by the same percentage every timestep.  The
+{Ptarget} values for any coupled dimensions must be identical.
+{Couple xyz} can be used for a 2d simulation; the {z} dimension is
+simply ignored.
+
+:line
+
+The {iso}, {aniso}, and {tri} keywords are simply shortcuts that are
+equivalent to specifying several other keywords together.
+
+The keyword {iso} means couple all 3 diagonal components together when
+pressure is computed (hydrostatic pressure), and dilate/contract the
+dimensions together.  Using "iso Ptarget" is the same as specifying
+these 4 keywords:
+
+x Ptarget
+y Ptarget
+z Ptarget
+couple xyz :pre
+
+The keyword {aniso} means {x}, {y}, and {z} dimensions are controlled
+independently using the {Pxx}, {Pyy}, and {Pzz} components of the
+stress tensor as the driving forces, and the specified scalar external
+pressure.  Using "aniso Ptarget" is the same as specifying these 4
+keywords:
+
+x Ptarget
+y Ptarget
+z Ptarget
+couple none :pre
+
+The keyword {tri} means {x}, {y}, {z}, {xy}, {xz}, and {yz} dimensions
+are controlled independently using their individual stress components
+as the driving forces, and the specified scalar pressure as the
+external normal stress.  Using "tri Ptarget" is the same as specifying
+these 7 keywords:
+
+x Ptarget
+y Ptarget
+z Ptarget
+xy 0.0 
+yz 0.0 
+xz 0.0 
+couple none :pre
+
+:line
+
 The {vmax} keyword can be used to limit the fractional change in the
 volume of the simulation box that can occur in one iteration of the
 minimizer.  If the pressure is not settling down during the
 minimization this can be because the volume is fluctuating too much.
-The specfied fraction must be greater than 0.0 and should be << 1.0.
+The specified fraction must be greater than 0.0 and should be << 1.0.
 A value of 0.001 means the volume cannot change by more than 1/10 of a
-percent in one iteration for style {xyz}.  For the other styles it
-means no linear dimension of the simulation box can change by more
-than 1/10 of a percent.
+percent in one iteration when {couple xyz} has been specified.  For
+any other case it means no linear dimension of the simulation box can
+change by more than 1/10 of a percent.
+
+:line
+
+With this fix, the potential energy used by the minimzer is augmented
+by an additional energy provided by the fix. The overall objective
+function then is:
+
+:c,image(Eqs/fix_box_relax1.jpg) 
+
+where {U} is the system potential energy, {P}_t is the desired
+hydrostatic pressure, {V} and {V}_0 are the system and reference
+volumes, respectively.  {E}_{strain} is the strain energy expression
+proposed by Parrinello and Rahman "(Parrinello1981)"_#Parrinello1981.
+Taking derivatives of {E} w.r.t. the box dimensions, and setting these
+to zero, we find that at the minimum of the objective function, the
+global system stress tensor [P] will satisfy the relation:
+
+:c,image(Eqs/fix_box_relax2.jpg) 
+
+where [I] is the identity matric, [h]_0 is the box dimension tensor of
+the reference cell, and [h]_0{d} is the diagonal part of
+[h]_0. [S]_{t} is a symmetric stress tensor that is chosen by LAMMPS
+so that the upper-triangular components of [P] equal the stress tensor
+specified by the user.
+ 
+This equation only applies when the box dimensions are equal to those
+of the reference dimensions. If this is not the case, then the
+converged stress tensor will not equal that specified by the user.  We
+can resolve this problem by periodically resetting the reference
+dimensions. The keyword {nreset_ref} controls how often this is done.
+If this keyword is not used, or is given a value of zero, then the
+reference dimensions are set to those of the initial simulation domain
+and are never changed. A value of {nstep} means that every {nstep}
+minimization steps, the reference dimensions are set to those of the
+current simulation domain. Note that resetting the reference
+dimensions changes the objective function and gradients, which
+sometimes causes the minimization to fail. This can be resolved by
+changing the value of {nreset}, or simply continuing the minimization
+from a restart file.
 
 IMPORTANT NOTE: As normally computed, pressure includes a kinetic-
 energy or temperature-dependent component; see the "compute
@@ -94,19 +192,19 @@ temperature and you print the usual thermodynamic pressure, it may not
 appear the system is converging to your specified pressure.  The
 solution for this is to either (a) zero the velocities of all atoms
 before performing the minimization, or (b) make sure you are
-monitoring the pressure without its kinetic component.  The latter
-can be done by outputting the pressure from the fix this command
-creates (see below) or a pressure fix you define yourself.
+monitoring the pressure without its kinetic component.  The latter can
+be done by outputting the pressure from the fix this command creates
+(see below) or a pressure fix you define yourself.
 
 IMPORTANT NOTE: Because pressure is often a very sensitive function of
 volume, it can be difficult for the minimizer to equilibrate the
-system the desired pressure with high precision.  Some techiniques
-that seem to help are (a) use the "min_modify line quadratic" option
-when minimizing with box relaxtions, and (b) minimize several times in
-succession if need be, to drive the pressure closer to the target
-pressure.  Also note that some systems (e.g. liquids) will not sustain
-an anisotropic applied pressure, which means the minimizer will not
-converge.
+system the desired pressure with high precision, particularly for
+solids.  Some techiniques that seem to help are (a) use the
+"min_modify line quadratic" option when minimizing with box
+relaxations, and (b) minimize several times in succession if need be,
+to drive the pressure closer to the target pressure.  Also note that
+some systems (e.g. liquids) will not sustain a non-hydrostatic applied
+pressure, which means the minimizer will not converge.
 
 :line
 
@@ -162,8 +260,10 @@ only if the {temp} keyword comes after the {press} keyword.  If the
 compute specified by the {press} keyword will be unaffected by the
 {temp} setting.
 
-No global scalar or vector or per-atom quantities are stored by this
-fix for access by various "output commands"_Section_howto.html#4_15.
+This fix computes a global scalar which can be accessed by various
+"output commands"_Section_howto.html#4_15.  The scalar is the
+pressure-volume energy, plus the strain energy, if it exists.
+
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.
 
@@ -174,14 +274,24 @@ described above.
 
 [Restrictions:]
 
-Any box dimension adjusted by this fix must be periodic.  A dimension
-whose target pressure is specified as NULL can be non-periodic or
-periodic.
+Only dimensions that are available can be adjusted by this fix.
+Non-periodic dimensions are not available.  {z}, {xz}, and {yz}, are
+not available for 2D simulations. {xy}, {xz}, and {yz} are only
+available if the simulation domain is non-orthogonal.  The
+"create_box"_create_box.html, "read data"_read_data.html, and
+"read_restart"_read_restart.html commands specify whether the
+simulation box is orthogonal or non-orthogonal (triclinic) and explain
+the meaning of the xy,xz,yz tilt factors.
 
 [Related commands:]
 
-"fix npt"_fix_nph.html, "minimize"_minimize.html
+"fix npt"_fix_nh.html, "minimize"_minimize.html
 
 [Default:]
 
-The keyword defaults are dilate = all and vmax = 0.0001.
+The keyword defaults are dilate = all, vmax = 0.0001, nreset = 0.
+
+:line
+
+:link(Parrinello1981)
+[(Parrinello1981)] Parrinello and Rahman, J Appl Phys, 52, 7182 (1981).
diff --git a/doc/fix_deform.html b/doc/fix_deform.html
index 7b2248f99c..33e2fe463b 100644
--- a/doc/fix_deform.html
+++ b/doc/fix_deform.html
@@ -95,11 +95,11 @@ temp/deform commands for more details.
 
      
 
      Any parameter varied by this command must refer to a periodic
 dimension - see the boundary command.  For parameters
-"xy", "xz", and "yz" this means both affected dimensions must be
-periodic, e.g. x and y for "xy".  Dimensions not varied by this
-command can be periodic or non-periodic.  Unspecified periodic
-dimensions can also be controlled by a fix npt or fix
-nph command.
+xy, xz, and yz, the 2nd dimension must be periodic, e.g. y for
+xy.  Dimensions not varied by this command can be periodic or
+non-periodic.  Dimensions corresponding to unspecified parameters can
+also be controlled by a fix npt or fix nph
+command.
 
      
 
      The size and shape of the simulation box at the beginning of the
 simulation run were either specified by the
@@ -227,7 +227,7 @@ fix deform) since that implies a density change.  Using the volume
 style for those 2 dimensions to keep the box volume constant may make
 more physical sense, but may also not be correct for materials and
 potentials whose Poisson ratio is not 0.5.  An alternative is to use
-fix npt aniso with zero applied pressure on those 2
+fix npt aniso with zero applied pressure on those 2
 dimensions, so that they respond to the tensile strain dynamically.
 
      
 
      The wiggle style oscillates the specified box length dimension
@@ -433,8 +433,8 @@ defined in terms of distance/time.
 
      
 
      No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.
 
      
 
      This fix can perform deformation over multiple runs, using the start
diff --git a/doc/fix_deform.txt b/doc/fix_deform.txt
index 0e15cc72cf..065641a7f2 100644
--- a/doc/fix_deform.txt
+++ b/doc/fix_deform.txt
@@ -85,11 +85,11 @@ temp/deform"_compute_temp_deform.html commands for more details.
 
 Any parameter varied by this command must refer to a periodic
 dimension - see the "boundary"_boundary.html command.  For parameters
-"xy", "xz", and "yz" this means both affected dimensions must be
-periodic, e.g. x and y for "xy".  Dimensions not varied by this
-command can be periodic or non-periodic.  Unspecified periodic
-dimensions can also be controlled by a "fix npt"_fix_npt.html or "fix
-nph"_fix_nph.html command.
+{xy}, {xz}, and {yz}, the 2nd dimension must be periodic, e.g. {y} for
+{xy}.  Dimensions not varied by this command can be periodic or
+non-periodic.  Dimensions corresponding to unspecified parameters can
+also be controlled by a "fix npt"_fix_nh.html or "fix nph"_fix_nh.html
+command.
 
 The size and shape of the simulation box at the beginning of the
 simulation run were either specified by the
@@ -217,7 +217,7 @@ fix deform) since that implies a density change.  Using the {volume}
 style for those 2 dimensions to keep the box volume constant may make
 more physical sense, but may also not be correct for materials and
 potentials whose Poisson ratio is not 0.5.  An alternative is to use
-"fix npt aniso"_fix_npt.html with zero applied pressure on those 2
+"fix npt aniso"_fix_nh.html with zero applied pressure on those 2
 dimensions, so that they respond to the tensile strain dynamically.
 
 The {wiggle} style oscillates the specified box length dimension
@@ -423,8 +423,8 @@ defined in terms of distance/time.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.
 
 This fix can perform deformation over multiple runs, using the {start}
diff --git a/doc/fix_deposit.html b/doc/fix_deposit.html
index 3e169a2ce5..43b2d7c82c 100644
--- a/doc/fix_deposit.html
+++ b/doc/fix_deposit.html
@@ -142,11 +142,11 @@ a fix in an input script that reads a restart file, so that the
 operation of the fix continues in an uninterrupted fashion.
 
      
 
      None of the fix_modify options are relevant to this
-fix.  No global scalar or vector or per-atom quantities are stored by
-this fix for access by various output
-commands.  No parameter of this fix can be
-used with the start/stop keywords of the run command.
-This fix is not invoked during energy minimization.
+fix.  No global or per-atom quantities are stored by this fix for
+access by various output commands.  No
+parameter of this fix can be used with the start/stop keywords of
+the run command.  This fix is not invoked during energy
+minimization.
 
      
 
      Restrictions:
 
      
diff --git a/doc/fix_deposit.txt b/doc/fix_deposit.txt
index 0be09f0116..70e8e61a9c 100644
--- a/doc/fix_deposit.txt
+++ b/doc/fix_deposit.txt
@@ -130,11 +130,11 @@ a fix in an input script that reads a restart file, so that the
 operation of the fix continues in an uninterrupted fashion.
 
 None of the "fix_modify"_fix_modify.html options are relevant to this
-fix.  No global scalar or vector or per-atom quantities are stored by
-this fix for access by various "output
-commands"_Section_howto.html#4_15.  No parameter of this fix can be
-used with the {start/stop} keywords of the "run"_run.html command.
-This fix is not invoked during "energy minimization"_minimize.html.
+fix.  No global or per-atom quantities are stored by this fix for
+access by various "output commands"_Section_howto.html#4_15.  No
+parameter of this fix can be used with the {start/stop} keywords of
+the "run"_run.html command.  This fix is not invoked during "energy
+minimization"_minimize.html.
 
 [Restrictions:]
 
diff --git a/doc/fix_drag.html b/doc/fix_drag.html
index 14ad2f5558..5cdd866d18 100644
--- a/doc/fix_drag.html
+++ b/doc/fix_drag.html
@@ -45,10 +45,10 @@ in the simulation.
 files.  None of the fix_modify options
 are relevant to this fix.
 
      
-
      This fix computes a 3-vector of forces, which can be accessed by
-various output commands.  This is the total
-force on the group of atoms by the drag force.  The vector values
-calculated by this fix are "extensive".
+
      This fix computes a global 3-vector of forces, which can be accessed
+by various output commands.  This is the
+total force on the group of atoms by the drag force.  The vector
+values calculated by this fix are "extensive".
 
      
 
      No parameter of this fix can be used with the start/stop keywords of
 the run command.  This fix is not invoked during energy
diff --git a/doc/fix_drag.txt b/doc/fix_drag.txt
index 67462cd8cc..3fdf26bcb8 100644
--- a/doc/fix_drag.txt
+++ b/doc/fix_drag.txt
@@ -43,10 +43,10 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-This fix computes a 3-vector of forces, which can be accessed by
-various "output commands"_Section_howto.html#4_15.  This is the total
-force on the group of atoms by the drag force.  The vector values
-calculated by this fix are "extensive".
+This fix computes a global 3-vector of forces, which can be accessed
+by various "output commands"_Section_howto.html#4_15.  This is the
+total force on the group of atoms by the drag force.  The vector
+values calculated by this fix are "extensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.  This fix is not invoked during "energy
diff --git a/doc/fix_dt_reset.html b/doc/fix_dt_reset.html
index f4b7555627..e146adfa9d 100644
--- a/doc/fix_dt_reset.html
+++ b/doc/fix_dt_reset.html
@@ -69,11 +69,12 @@ outer loop (largest) timestep, which is the same timestep that the
 files.  None of the fix_modify options
 are relevant to this fix.
 
      
-
      The current timestep size is stored as a scalar quantity by this fix.
-The cumulative simulation time (in time units) is stored as the first
-element of a vector.  Both these quantities can be accessed by various
-output commands.  The scalar and vector
-values calculated by this fix are "intensive".
+
      This fix computes a global scalar and a global vector of length 1,
+which can be accessed by various output
+commands.  The scalar is the current timestep
+size.  The cumulative simulation time (in time units) is stored as the
+first element of the vector.  The scalar and vector values calculated
+by this fix are "intensive".
 
      
 
      No parameter of this fix can be used with the start/stop keywords of
 the run command.  This fix is not invoked during energy
diff --git a/doc/fix_dt_reset.txt b/doc/fix_dt_reset.txt
index 78064f2550..c0100bd7fa 100644
--- a/doc/fix_dt_reset.txt
+++ b/doc/fix_dt_reset.txt
@@ -65,11 +65,12 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-The current timestep size is stored as a scalar quantity by this fix.
-The cumulative simulation time (in time units) is stored as the first
-element of a vector.  Both these quantities can be accessed by various
-"output commands"_Section_howto.html#4_15.  The scalar and vector
-values calculated by this fix are "intensive".
+This fix computes a global scalar and a global vector of length 1,
+which can be accessed by various "output
+commands"_Section_howto.html#4_15.  The scalar is the current timestep
+size.  The cumulative simulation time (in time units) is stored as the
+first element of the vector.  The scalar and vector values calculated
+by this fix are "intensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.  This fix is not invoked during "energy
diff --git a/doc/fix_efield.html b/doc/fix_efield.html
index e4bed32236..e85fc2c334 100644
--- a/doc/fix_efield.html
+++ b/doc/fix_efield.html
@@ -32,8 +32,8 @@ external electric field being applied to the system.
 
      
 
      No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_efield.txt b/doc/fix_efield.txt
index 3dfd69b5cc..5e751ffe67 100644
--- a/doc/fix_efield.txt
+++ b/doc/fix_efield.txt
@@ -29,8 +29,8 @@ external electric field being applied to the system.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_enforce2d.html b/doc/fix_enforce2d.html
index 59a3f6e445..778d80d60a 100644
--- a/doc/fix_enforce2d.html
+++ b/doc/fix_enforce2d.html
@@ -32,8 +32,8 @@ not move from their initial z coordinate.
 
      
 
      No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 
      
diff --git a/doc/fix_enforce2d.txt b/doc/fix_enforce2d.txt
index 5de8a73faf..12fc0948a0 100644
--- a/doc/fix_enforce2d.txt
+++ b/doc/fix_enforce2d.txt
@@ -29,8 +29,8 @@ not move from their initial z coordinate.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 
diff --git a/doc/fix_evaporate.html b/doc/fix_evaporate.html
index a87806c4a8..210b51fc0a 100644
--- a/doc/fix_evaporate.html
+++ b/doc/fix_evaporate.html
@@ -49,9 +49,10 @@ incur overhead due to the cost of building neighbor lists.
 files.  None of the fix_modify options
 are relevant to this fix.
 
      
-
      The cummulative number of deleted atoms is stored as a scalar quantity
-by this fix.  This quantity can be accessed by various output
-commands.  The scalar value is "intensive".
+
      This fix computes a global scalar, which can be accessed by various
+output commands.  The scalar is the
+cummulative number of deleted atoms.  The scalar value calculated by
+this fix is "intensive".
 
      
 
      No parameter of this fix can be used with the start/stop keywords of
 the run command.  This fix is not invoked during energy
diff --git a/doc/fix_evaporate.txt b/doc/fix_evaporate.txt
index 57b1afe994..800c222a13 100644
--- a/doc/fix_evaporate.txt
+++ b/doc/fix_evaporate.txt
@@ -46,9 +46,10 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-The cummulative number of deleted atoms is stored as a scalar quantity
-by this fix.  This quantity can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value is "intensive".
+This fix computes a global scalar, which can be accessed by various
+"output commands"_Section_howto.html#4_15.  The scalar is the
+cummulative number of deleted atoms.  The scalar value calculated by
+this fix is "intensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.  This fix is not invoked during "energy
diff --git a/doc/fix_freeze.html b/doc/fix_freeze.html
index ce8c66a885..55486a8268 100644
--- a/doc/fix_freeze.html
+++ b/doc/fix_freeze.html
@@ -36,11 +36,11 @@ particles appropriately, as if the frozen particle has infinite mass.
 files.  None of the fix_modify options
 are relevant to this fix.
 
      
-
      This fix computes a 3-vector of forces, which can be accessed by
-various output commands.  This is the total
-force on the group of atoms before the forces on individual atoms are
-changed by the fix.  The vector values calculated by this fix are
-"extensive".
+
      This fix computes a global 3-vector of forces, which can be accessed
+by various output commands.  This is the
+total force on the group of atoms before the forces on individual
+atoms are changed by the fix.  The vector values calculated by this
+fix are "extensive".
 
      
 
      No parameter of this fix can be used with the start/stop keywords of
 the run command.  This fix is not invoked during energy
diff --git a/doc/fix_freeze.txt b/doc/fix_freeze.txt
index abfd9372b0..5f24eabd88 100644
--- a/doc/fix_freeze.txt
+++ b/doc/fix_freeze.txt
@@ -33,11 +33,11 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-This fix computes a 3-vector of forces, which can be accessed by
-various "output commands"_Section_howto.html#4_15.  This is the total
-force on the group of atoms before the forces on individual atoms are
-changed by the fix.  The vector values calculated by this fix are
-"extensive".
+This fix computes a global 3-vector of forces, which can be accessed
+by various "output commands"_Section_howto.html#4_15.  This is the
+total force on the group of atoms before the forces on individual
+atoms are changed by the fix.  The vector values calculated by this
+fix are "extensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.  This fix is not invoked during "energy
diff --git a/doc/fix_gravity.html b/doc/fix_gravity.html
index 324bbf46a9..0a823a51df 100644
--- a/doc/fix_gravity.html
+++ b/doc/fix_gravity.html
@@ -89,8 +89,8 @@ by (x,y,z).  For 2d systems, the z component is ignored.
 
      
 
      No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_gravity.txt b/doc/fix_gravity.txt
index 164d8a7540..86184a4d01 100644
--- a/doc/fix_gravity.txt
+++ b/doc/fix_gravity.txt
@@ -81,8 +81,8 @@ by (x,y,z).  For 2d systems, the z component is ignored.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_heat.html b/doc/fix_heat.html
index c37fe88354..53e15feab1 100644
--- a/doc/fix_heat.html
+++ b/doc/fix_heat.html
@@ -47,7 +47,7 @@ time the fix is invoked.  If heat is subtracted from the system too
 aggressively so that the group's kinetic energy would go to zero,
 LAMMPS halts with an error message.
 
      
-
      Fix heat is different from a thermostat such as fix nvt
+
      Fix heat is different from a thermostat such as fix nvt
 or fix temp/rescale in that energy is
 added/subtracted continually.  Thus if there isn't another mechanism
 in place to counterbalance this effect, the entire system will heat or
@@ -59,7 +59,7 @@ from the system.
 their velocities.  Thus you must still use an integration fix
 (e.g. fix nve) on the affected atoms.  This fix should
 not normally be used on atoms that have their temperature controlled
-by another fix - e.g. fix nvt or fix
+by another fix - e.g. fix nvt or fix
 langevin fix.
 
      
 
      Restart, fix_modify, output, run start/stop, minimize info:
@@ -68,10 +68,10 @@ langevin fix.
 files.  None of the fix_modify options
 are relevant to this fix.
 
      
-
      This fix computes a scalar which can be accessed by various output
-commands.  This scalar is the most recent
-value by which velocites were scaled.  The scalar value calculated by
-this fix is "intensive".
+
      This fix computes a global scalar which can be accessed by various
+output commands.  This scalar is the most
+recent value by which velocites were scaled.  The scalar value
+calculated by this fix is "intensive".
 
      
 
      No parameter of this fix can be used with the start/stop keywords of
 the run command.  This fix is not invoked during energy
diff --git a/doc/fix_heat.txt b/doc/fix_heat.txt
index 7984b4738e..2f9e937892 100644
--- a/doc/fix_heat.txt
+++ b/doc/fix_heat.txt
@@ -44,7 +44,7 @@ time the fix is invoked.  If heat is subtracted from the system too
 aggressively so that the group's kinetic energy would go to zero,
 LAMMPS halts with an error message.
 
-Fix heat is different from a thermostat such as "fix nvt"_fix_nvt.html
+Fix heat is different from a thermostat such as "fix nvt"_fix_nh.html
 or "fix temp/rescale"_fix_temp_rescale.html in that energy is
 added/subtracted continually.  Thus if there isn't another mechanism
 in place to counterbalance this effect, the entire system will heat or
@@ -56,7 +56,7 @@ This fix does not change the coordinates of its atoms; it only scales
 their velocities.  Thus you must still use an integration fix
 (e.g. "fix nve"_fix_nve.html) on the affected atoms.  This fix should
 not normally be used on atoms that have their temperature controlled
-by another fix - e.g. "fix nvt"_fix_nvt.html or "fix
+by another fix - e.g. "fix nvt"_fix_nh.html or "fix
 langevin"_fix_langevin.html fix.
 
 [Restart, fix_modify, output, run start/stop, minimize info:]
@@ -65,10 +65,10 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-This fix computes a scalar which can be accessed by various "output
-commands"_Section_howto.html#4_15.  This scalar is the most recent
-value by which velocites were scaled.  The scalar value calculated by
-this fix is "intensive".
+This fix computes a global scalar which can be accessed by various
+"output commands"_Section_howto.html#4_15.  This scalar is the most
+recent value by which velocites were scaled.  The scalar value
+calculated by this fix is "intensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.  This fix is not invoked during "energy
diff --git a/doc/fix_indent.html b/doc/fix_indent.html
index 468feeb42e..f66f5b3001 100644
--- a/doc/fix_indent.html
+++ b/doc/fix_indent.html
@@ -183,8 +183,8 @@ the system's potential energy as part of thermodyn
 output.  The energy of each particle interacting
 with the indenter is K/3 (r - R)^3.
 
      
-
      This fix computes a scalar energy and a 3-vector of forces (on the
-indenter), which can be accessed by various output
+
      This fix computes a global scalar energy and a global 3-vector of
+forces (on the indenter), which can be accessed by various output
 commands.  The scalar and vector values
 calculated by this fix are "extensive".
 
      
diff --git a/doc/fix_indent.txt b/doc/fix_indent.txt
index 2e69cfaab0..e632c39b9e 100644
--- a/doc/fix_indent.txt
+++ b/doc/fix_indent.txt
@@ -174,8 +174,8 @@ the system's potential energy as part of "thermodynamic
 output"_thermo_style.html.  The energy of each particle interacting
 with the indenter is K/3 (r - R)^3.
 
-This fix computes a scalar energy and a 3-vector of forces (on the
-indenter), which can be accessed by various "output
+This fix computes a global scalar energy and a global 3-vector of
+forces (on the indenter), which can be accessed by various "output
 commands"_Section_howto.html#4_15.  The scalar and vector values
 calculated by this fix are "extensive".
 
diff --git a/doc/fix_langevin.html b/doc/fix_langevin.html
index 78dabfe965..b6f95ce7f5 100644
--- a/doc/fix_langevin.html
+++ b/doc/fix_langevin.html
@@ -83,14 +83,14 @@ this fix.  The translational degrees of freedom can also have a bias
 velocity removed from them before thermostatting takes place; see the
 description below.
 
      
-
      IMPORTANT NOTE: Unlike the fix nvt command which
+
      IMPORTANT NOTE: Unlike the fix nvt command which
 performs Nose/Hoover thermostatting AND time integration, this fix
 does NOT perform time integration.  It only modifies forces to effect
 thermostatting.  Thus you must use a separate time integration fix,
 like fix nve to actually update the velocities and
 positions of atoms using the modified forces.  Likewise, this fix
 should not normally be used on atoms that also have their temperature
-controlled by another fix - e.g. by fix nvt or fix
+controlled by another fix - e.g. by fix nvt or fix
 temp/rescale commands.
 
      
 
      See this howto section of the manual for a
@@ -171,11 +171,11 @@ system's potential energy as part of thermodynamic
 output.  Note that use of this option requires
 setting the tally keyword to yes.
 
      
-
      The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".  Note that calculation of this quantity
-requires setting the tally keyword to yes.
+
      This fix computes a global scalar which can be accessed by various
+output commands.  The scalar is the
+cummulative energy change due to this fix.  The scalar value
+calculated by this fix is "extensive".  Note that calculation of this
+quantity requires setting the tally keyword to yes.
 
      
 
      This fix can ramp its target temperature over multiple runs, using the
 start and stop keywords of the run command.  See the
@@ -187,8 +187,8 @@ requires setting the tally keyword to yes.
 
      
 
      Related commands:
 
      
-
      fix nvt, fix temp/rescale, fix
-viscous, fix nvt
+
      fix nvt, fix temp/rescale, fix
+viscous, fix nvt
 
      
 
      Default:
 
      
diff --git a/doc/fix_langevin.txt b/doc/fix_langevin.txt
index b00dcdbd5c..858df53296 100644
--- a/doc/fix_langevin.txt
+++ b/doc/fix_langevin.txt
@@ -73,14 +73,14 @@ this fix.  The translational degrees of freedom can also have a bias
 velocity removed from them before thermostatting takes place; see the
 description below.
 
-IMPORTANT NOTE: Unlike the "fix nvt"_fix_nvt.html command which
+IMPORTANT NOTE: Unlike the "fix nvt"_fix_nh.html command which
 performs Nose/Hoover thermostatting AND time integration, this fix
 does NOT perform time integration.  It only modifies forces to effect
 thermostatting.  Thus you must use a separate time integration fix,
 like "fix nve"_fix_nve.html to actually update the velocities and
 positions of atoms using the modified forces.  Likewise, this fix
 should not normally be used on atoms that also have their temperature
-controlled by another fix - e.g. by "fix nvt"_fix_nvt.html or "fix
+controlled by another fix - e.g. by "fix nvt"_fix_nh.html or "fix
 temp/rescale"_fix_temp_rescale.html commands.
 
 See "this howto section"_Section_howto.html#4_16 of the manual for a
@@ -161,11 +161,11 @@ system's potential energy as part of "thermodynamic
 output"_thermo_style.html.  Note that use of this option requires
 setting the {tally} keyword to {yes}.
 
-The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".  Note that calculation of this quantity
-requires setting the {tally} keyword to {yes}.
+This fix computes a global scalar which can be accessed by various
+"output commands"_Section_howto.html#4_15.  The scalar is the
+cummulative energy change due to this fix.  The scalar value
+calculated by this fix is "extensive".  Note that calculation of this
+quantity requires setting the {tally} keyword to {yes}.
 
 This fix can ramp its target temperature over multiple runs, using the
 {start} and {stop} keywords of the "run"_run.html command.  See the
@@ -177,8 +177,8 @@ This fix is not invoked during "energy minimization"_minimize.html.
 
 [Related commands:]
 
-"fix nvt"_fix_nvt.html, "fix temp/rescale"_fix_temp_rescale.html, "fix
-viscous"_fix_viscous.html, "fix nvt"_fix_nvt.html
+"fix nvt"_fix_nh.html, "fix temp/rescale"_fix_temp_rescale.html, "fix
+viscous"_fix_viscous.html, "fix nvt"_fix_nh.html
 
 [Default:]
 
diff --git a/doc/fix_lineforce.html b/doc/fix_lineforce.html
index 620110abd3..7de7b3ac03 100644
--- a/doc/fix_lineforce.html
+++ b/doc/fix_lineforce.html
@@ -37,8 +37,8 @@ it should continue to move along the line thereafter.
 
      
 
      No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 
      
diff --git a/doc/fix_lineforce.txt b/doc/fix_lineforce.txt
index 399a5beff3..f5e069ada0 100644
--- a/doc/fix_lineforce.txt
+++ b/doc/fix_lineforce.txt
@@ -34,8 +34,8 @@ it should continue to move along the line thereafter.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 
diff --git a/doc/fix_momentum.html b/doc/fix_momentum.html
index 8535876f7e..ab91b7d3a7 100644
--- a/doc/fix_momentum.html
+++ b/doc/fix_momentum.html
@@ -62,8 +62,8 @@ initial velocities with zero aggregate linear and/or angular momentum.
 
      
 
      No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_momentum.txt b/doc/fix_momentum.txt
index 06a1dabad6..f2ed114b63 100644
--- a/doc/fix_momentum.txt
+++ b/doc/fix_momentum.txt
@@ -54,8 +54,8 @@ initial velocities with zero aggregate linear and/or angular momentum.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_move.html b/doc/fix_move.html
index 2d5b935399..70e92b26ca 100644
--- a/doc/fix_move.html
+++ b/doc/fix_move.html
@@ -56,7 +56,7 @@ forces on the atoms.  This can be useful for boundary or other atoms,
 whose movement can influence nearby atoms.
 
      
 
      IMPORTANT NOTE: The atoms affected by this fix should not normally be
-time integrated by other fixes (e.g. fix nve, fix
+time integrated by other fixes (e.g. fix nve, fix
 nvt), since that will change their positions and
 velocities twice.
 
      
@@ -188,9 +188,9 @@ uninterrupted fashion.
 fix.  
 
      
 
      This fix produces a per-atom array which can be accessed by various
-output commands.  The number of columns
-for each atom is 3, and the columns store the original unwrapped
-x,y,z coords of each atom.  The per-atom values be accessed on any
+output commands.  The number of columns for
+each atom is 3, and the columns store the original unwrapped x,y,z
+coords of each atom.  The per-atom values can be accessed on any
 timestep.
 
      
 
      No parameter of this fix can be used with the start/stop keywords of
diff --git a/doc/fix_move.txt b/doc/fix_move.txt
index c5d955cf61..7154fee32b 100644
--- a/doc/fix_move.txt
+++ b/doc/fix_move.txt
@@ -48,7 +48,7 @@ whose movement can influence nearby atoms.
 
 IMPORTANT NOTE: The atoms affected by this fix should not normally be
 time integrated by other fixes (e.g. "fix nve"_fix_nve.html, "fix
-nvt"_fix_nvt.html), since that will change their positions and
+nvt"_fix_nh.html), since that will change their positions and
 velocities twice.
 
 IMPORTANT NOTE: As atoms move due to this fix, they will pass thru
@@ -179,9 +179,9 @@ None of the "fix_modify"_fix_modify.html options are relevant to this
 fix.  
 
 This fix produces a per-atom array which can be accessed by various
-"output commands"_Section_howto.html#4_15.  The number of columns
-for each atom is 3, and the columns store the original unwrapped
-x,y,z coords of each atom.  The per-atom values be accessed on any
+"output commands"_Section_howto.html#4_15.  The number of columns for
+each atom is 3, and the columns store the original unwrapped x,y,z
+coords of each atom.  The per-atom values can be accessed on any
 timestep.
 
 No parameter of this fix can be used with the {start/stop} keywords of
diff --git a/doc/fix_nh.html b/doc/fix_nh.html
new file mode 100644
index 0000000000..921bd96b72
--- /dev/null
+++ b/doc/fix_nh.html
@@ -0,0 +1,454 @@
+
+
      LAMMPS WWW Site - LAMMPS Documentation - LAMMPS Commands 
+
      
+
+
+
+
+
+
+
      
+
+
      fix nvt command 
+
      
+
      fix npt command 
+
      
+
      fix nph command 
+
      
+
      Syntax:
+
      
+
      fix ID group-ID style_name keyword value ... 
+
      
+
      • ID, group-ID are documented in fix command 
+
+
      • style_name = nvt or npt or nph 
+
+
        one or more keyword value pairs may be appended
+keyword = temp or iso or aniso or tri or x or y or z or xy or yz or xz or couple or tchain or pchain or mtk or tloop or ploop or nreset or drag or dilate
+  temp values = Tstart Tstop Tdamp
+    Tstart,Tstop = external temperature at start/end of run
+    Tdamp = temperature damping parameter (time units)
+  iso or aniso or tri values = Pstart Pstop Pdamp
+    Pstart,Pstop = scalar external pressure at start/end of run (pressure units)
+    Pdamp = pressure damping parameter (time units)
+  x or y or z or xy or yz or xz values = Pstart Pstop Pdamp
+    Pstart,Pstop = external stress tensor component at start/end of run (pressure units)
+    Pdamp = stress damping parameter (time units)
+  couple = none or xyz or xy or yz or xz
+  tchain value = length of thermostat chain (1 = single thermostat)
+  pchain values = length of thermostat chain  on barostat (0 = no thermostat)
+  mtk value = yes or no = add in MTK adjustment term or not
+  tloop value = number of sub-cycles to perform on thermostat
+  ploop value = number of sub-cycles to perform on barostat thermostat
+  nreset value = reset reference cell every this many timesteps
+  drag value = drag factor added to barostat/thermostat (0.0 = no drag)
+  dilate value = all or partial 
+
        
+
+
      
+
      Examples:
+
      
+
      fix 1 all nvt temp 300.0 300.0 100.0
+fix 1 water npt temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
+fix 2 jello npt temp 300.0 300.0 100.0 tri 5.0 5.0 1000.0
+fix 2 ice nph temp 273.15 273.15 x 1.0 1.0 0.5 y 2.0 2.0 0.5 z 3.0 3.0 0.5 yz 0.1 0.1 0.5 xz 0.2 0.2 0.5 xy 0.3 0.3 0.5 nreset 1000 
+
      
+
      Description:
+
      
+
      These commands perform time integration on Nose-Hoover style
+non-Hamiltonian equations of motion which are designed to generate
+positions and velocities sampled from the canonical (nvt),
+isothermal-isobaric (npt), and isenthalpic (nph) ensembles.  This is
+achieved by adding some dynamic variables which are coupled to the
+particle velocities (thermostatting) and simulation domain dimensions
+(barostatting).  In addition to basic thermostatting and barostatting,
+these fixes can also create a chain of thermostats coupled to the
+particle thermostat, and another chain of thermostats coupled to the
+barostat variables. The barostat can be coupled to the overall box
+volume, or to individual dimensions, including the xy, xz and yz
+tilt dimensions. The external pressure of the barostat can be
+specified as either a scalar pressure (isobaric ensemble) or as
+components of a symmetric stress tensor (constant stress ensemble).
+When used correctly, the time-averaged temperature and stress tensor
+of the particles will match the target values specified by
+Tstart/Tstop and Pstart/Pstop.
+
      
+
      The equations of motion used are those of Shinoda et al in
+(Shinoda), which combine the hydrostatic equations of
+Martyna, Tobias and Klein in (Martyna) with the strain
+energy proposed by Parrinello and Rahman in
+(Parrinello).  The time integration schemes follow the
+time-reversible measure-preserving integrators derived by Tuckerman et
+al in (Tuckerman).
+
      
+
      
+
+
      The thermostat for fix styles nvt and npt is specified using the
+temp keyword.  Other thermostat-related keywords are tchain,
+tloop and drag, which are discussed below.
+
      
+
      The thermostat is applied to only the translational degrees of freedom
+for the particles.  The translational degrees of freedom can also have
+a bias velocity removed before thermostatting takes place; see the
+description below.  The desired temperature at each timestep is a
+ramped value during the run from Tstart to Tstop.  The Tdamp
+parameter is specified in time units and determines how rapidly the
+temperature is relaxed.  For example, a value of 100.0 means to relax
+the temperature in a timespan of (roughly) 100 time units (tau or
+fmsec or psec - see the units command).  The atoms in the
+fix group are the only ones whose velocities and positions are updated
+by the velocity/position update portion of the integration.
+
      
+
      
+
+
      The barostat for fix styles npt and nph is specified using one or
+more of the iso, aniso, tri, x, y, z, xy, xz, yz,
+and couple keywords.  These keywords give you the ability to specify
+all 6 components of an external stress tensor, and to couple various
+of these components together so that the dimensions they represent are
+varied together during a constant-pressure simulation.
+
      
+
      Other barostat-related keywords are pchain, mtk, ploop,
+nreset, drag, and dilate, which are discussed below.
+
      
+
      Orthogonal simulation boxes have 3 adjustable dimensions (x,y,z).
+Triclinic (non-orthogonal) simulation boxes have 6 adjustable
+dimensions (x,y,z,xy,xz,yz).  The create_box, read
+data, and read_restart commands
+specify whether the simulation box is orthogonal or non-orthogonal
+(triclinic) and explain the meaning of the xy,xz,yz tilt factors.
+
      
+
      The target pressures for each of the 6 components of the stress tensor
+can be specified independently via the x, y, z, xy, xz, yz
+keywords, which correspond to the 6 simulation box dimensions.  For
+each component, the external pressure or tensor component at each
+timestep is a ramped value during the run from Pstart to Pstop.
+If a target pressure is specified for a component, then the
+corresponding box dimension will change during a simulation.  For
+example, if the y keyword is used, the y-box length will change.  If
+the xy keyword is used, the xy tilt factor will change.  A box
+dimension will not change if that component is not specified, although
+you have the option to change that dimension via the fix
+deform command.
+
      
+
      Note that in order to use the xy, xz, or yz keywords, the
+simulation box must be triclinic, even if its initial tilt factors are
+0.0.
+
      
+
      For all barostat keywords, the Pdamp parameter operates like the
+Tdamp parameter, determining the time scale on which pressure is
+relaxed.  For example, a value of 1000.0 means to relax the pressure
+in a timespan of (roughly) 1000 time units (tau or fmsec or psec - see
+the units command).
+
      
+
      Regardless of what atoms are in the fix group, a global pressure or
+stress tensor is computed for all atoms.  Similarly, when the size of
+the simulation box is changed, all atoms are re-scaled to new
+positions, unless the keyword dilate is specified with a value of
+partial, in which case only the atoms in the fix group are
+re-scaled.  The latter can be useful for leaving the coordinates of
+atoms in a solid substrate unchanged and controlling the pressure of a
+surrounding fluid.
+
      
+
      
+
+
      The couple keyword allows two or three of the diagonal components of
+the pressure tensor to be "coupled" together.  The value specified
+with the keyword determines which are coupled.  For example, xz
+means the Pxx and Pzz components of the stress tensor are coupled.
+Xyz means all 3 diagonal components are coupled.  Coupling means two
+things: the instantaneous stress will be computed as an average of the
+corresponding diagonal components, and the coupled box dimensions will
+be changed together in lockstep, meaning coupled dimensions will be
+dilated or contracted by the same percentage every timestep.  The
+Pstart, Pstop, Pdamp parameters for any coupled dimensions must
+be identical.  Couple xyz can be used for a 2d simulation; the z
+dimension is simply ignored.
+
      
+
      
+
+
      The iso, aniso, and tri keywords are simply shortcuts that are
+equivalent to specifying several other keywords together.
+
      
+
      The keyword iso means couple all 3 diagonal components together when
+pressure is computed (hydrostatic pressure), and dilate/contract the
+dimensions together.  Using "iso Pstart Pstop Pdamp" is the same as
+specifying these 4 keywords:
+
      
+
      x Pstart Pstop Pdamp
+y Pstart Pstop Pdamp
+z Pstart Pstop Pdamp
+couple xyz 
+
      
+
      The keyword aniso means x, y, and z dimensions are controlled
+independently using the Pxx, Pyy, and Pzz components of the
+stress tensor as the driving forces, and the specified scalar external
+pressure.  Using "aniso Pstart Pstop Pdamp" is the same as specifying
+these 4 keywords:
+
      
+
      x Pstart Pstop Pdamp
+y Pstart Pstop Pdamp
+z Pstart Pstop Pdamp
+couple none 
+
      
+
      The keyword tri means x, y, z, xy, xz, and yz dimensions
+are controlled independently using their individual stress components
+as the driving forces, and the specified scalar pressure as the
+external normal stress.  Using "tri Pstart Pstop Pdamp" is the same as
+specifying these 7 keywords:
+
      
+
      x Pstart Pstop Pdamp
+y Pstart Pstop Pdamp
+z Pstart Pstop Pdamp
+xy 0.0 0.0 Pdamp
+yz 0.0 0.0 Pdamp
+xz 0.0 0.0 Pdamp
+couple none 
+
      
+
      
+
+
      In some cases (e.g. for solids) the pressure (volume) and/or
+temperature of the system can oscillate undesirably when a Nose/Hoover
+barostat and thermostat is applied.  The optional drag keyword will
+damp these oscillations, although it alters the Nose/Hoover equations.
+A value of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.
+A non-zero value adds a drag term; the larger the value specified, the
+greater the damping effect.  Performing a short run and monitoring the
+pressure and temperature is the best way to determine if the drag term
+is working.  Typically a value between 0.2 to 2.0 is sufficient to
+damp oscillations after a few periods. Note that use of the drag
+keyword will interfere with energy conservation and will also change
+the distribution of positions and velocities so that they do not
+correspond to the norminal NVT, NPT, or NPH ensembles.
+
      
+
      An alternative way to control initial oscillations is to use chain
+thermostats. The keyword tchain determines the number of thermostats
+in the particle thermostat. A value of 1 corresponds to the original
+Nose-Hoover thermostat. The keyword pchain specifies the number of
+thermostats in the chain thermostatting the barostat degrees of
+freedom. A value of 0 corresponds to no thermostatting of the
+bvarostat variables.
+
      
+
      The mtk keyword controls whether or not the correction terms due to
+Martyna, Tuckerman, and Klein are included in the equations of motion
+(Martyna1994).  Specifying no reproduces the original
+Hoover barostat, whose volume probability distribution function
+differs from the true NPT and NPH ensembles by a factor of 1/V.  Hence
+using yes is more correct, but in many cases the difference is
+negligible.
+
      
+
      The keyword tloop can be used to improve the accuracy of integration
+scheme at little extra cost.  The initial and final updates of the
+thermostat variables are broken up into tloop substeps, each of
+length dt/tloop. This corresponds to using a first-order
+Suzuki-Yoshida scheme (Tuckerman2006).  The keyword
+ploop does the same thing for the barostat thermostat.
+
      
+
      The keyword nreset controls how often the reference dimensions used
+to define the strain energy are reset.  If this keyword is not used,
+or is given a value of zero, then the reference dimensions are set to
+those of the initial simulation domain and are never changed. If the
+simulation domain changes significantly during the simulation, then
+the final average pressure tensor will differ significantly from the
+specified values of the external stress tensor.  A value of nstep
+means that every nstep timesteps, the reference dimensions are set
+to those of the current simulation domain.
+
      
+
      
+
+
      IMPORTANT NOTE: Using a barostat coupled to tilt dimensions xy,
+xz, yz can sometimes result in arbitrarily large values of the
+tilt dimensions, i.e. a dratically deformed simulation box.  LAMMPS
+imposes reasonable limits on how large the tilt values can be, and
+exits with an error if these are exceeded.  This error typically
+indicates that there is something badly wrong with how the simulation
+was constructed.  The three most common sources of this error are
+using keyword tri on a liquid system, specifying an external shear
+stress tensor that exceeds the yield stress of the solid, and
+specifying values of Pstart that are too far from the current stress
+value. In other words, triclinic barostatting should be used with
+care.  This also is true for other barostat styles, although they tend
+to be more forgiving of insults.
+
      
+
      IMPORTANT NOTE: Unlike the fix
+temp/berendsen command which performs
+thermostatting but NO time integration, these fixes perform
+thermostatting/barostatting AND time integration.  Thus you should not
+use any other time integration fix, such as fix nve on
+atoms to which this fix is applied.  Likewise, the temp options for
+fix nvt and fix npt should not normally be used on atoms that also
+have their temperature controlled by another fix - e.g. by fix
+langevin or fix temp/rescale
+commands.
+
      
+
      See this howto section of the manual for a
+discussion of different ways to compute temperature and perform
+thermostatting and barostatting.
+
      
+
      
+
+
      These fixes compute a temperature and pressure each timestep.  To do
+this, the fix creates its own computes of style "temp" and "pressure",
+as if one of these two sets of commands had been issued:
+
      
+
      compute fix-ID_temp group-ID temp
+compute fix-ID_press group-ID pressure fix-ID_temp 
+
      
+
      compute fix-ID_temp all temp
+compute fix-ID_press all pressure fix-ID_temp 
+
      
+
      See the compute temp and compute
+pressure commands for details.  Note that the
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
++ underscore + "press".  For fix nvt, the group for the new computes
+is the same as the fix group.  For fix nph and fix npt, the group for
+the new computes is "all" since pressure is computed for the entire
+system.
+
      
+
      Note that these are NOT the computes used by thermodynamic output (see
+the thermo_style command) with ID = thermo_temp
+and thermo_press.  This means you can change the attributes of this
+fix's temperature or pressure via the
+compute_modify command or print this temperature
+or pressure during thermodynamic output via the thermo_style
+custom command using the appropriate compute-ID.
+It also means that changing attributes of thermo_temp or
+thermo_press will have no effect on this fix.
+
      
+
      Like other fixes that perform thermostatting, fix nvt and fix npt can
+be used with compute commands that calculate a
+temperature after removing a "bias" from the atom velocities.
+E.g. removing the center-of-mass velocity from a group of atoms or
+only calculating temperature on the x-component of velocity or only
+calculating temperature for atoms in a geometric region.  This is not
+done by default, but only if the fix_modify command
+is used to assign a temperature compute to this fix that includes such
+a bias term.  See the doc pages for individual compute
+commands to determine which ones include a bias.  In
+this case, the thermostat works in the following manner: the current
+temperature is calculated taking the bias into account, bias is
+removed from each atom, thermostatting is performed on the remaining
+thermal degrees of freedom, and the bias is added back in.
+
      
+
      Restart, fix_modify, output, run start/stop, minimize info:
+
      
+
      These fixes writes the state of all the thermostat and barostat
+variables to binary restart files.  See the
+read_restart command for info on how to re-specify
+a fix in an input script that reads a restart file, so that the
+operation of the fix continues in an uninterrupted fashion.
+
      
+
      The fix_modify temp and press options are
+supported by these fixes.  You can use them to assign a
+compute you have defined to this fix which will be used
+in its thermostatting or barostatting procedure, as described above.
+If you do this, note that the kinetic energy derived from the compute
+temperature should be consistent with the virial term computed using
+all atoms for the pressure.  LAMMPS will warn you if you choose to
+compute temperature on a subset of atoms.
+
      
+
      IMPORTANT NOTE: If both the temp and press keywords are used in a
+single thermo_modify command (or in two separate commands), then the
+order in which the keywords are specified is important.  Note that a
+pressure compute defines its own temperature
+compute as an argument when it is specified.  The temp keyword will
+override this (for the pressure compute being used by fix npt), but
+only if the temp keyword comes after the press keyword.  If the
+temp keyword comes before the press keyword, then the new pressure
+compute specified by the press keyword will be unaffected by the
+temp setting.
+
      
+
      The fix_modify energy option is supported by these
+fixes to add the energy change induced by Nose/Hoover thermostatting
+and barostatting to the system's potential energy as part of
+thermodynamic output.
+
      
+
      These fixes compute a global scalar and a global vector of quantities,
+which can be accessed by various output
+commands.  The scalar values calculated by
+this fix are "extensive"; the vector values are "intensive".
+
      
+
      The scalar is the cummulative energy change due to the fix.
+
      
+
      The vector stores internal Nose/Hoover thermostat and barostat
+variables.  The number and meaning of the vector values depends on
+which fix is used and the settings for keywords tchain and pchain,
+which specify the number of Nose/Hoover chains for the thermostat and
+barostat.  If no thermostatting is done, then tchain is 0.  If no
+barostatting is done, then pchain is 0.  In the following list,
+"ndof" is 0, 1, 3, or 6, and is the number of degrees of freedom in
+the barostat.  Its value is 0 if no barostat is used, else its value
+is 6 if any off-diagonal stress tensor component is barostatted, else
+its value is 1 if couple xyz is used or couple xy for a 2d
+simulation, otherwise its value is 3.
+
      
+
      The order of values in the global vector and their meaning is as
+follows.  The notation means there are tchain values for eta, followed
+by tchain for eta_dot, followed by ndof for omega, etc:
+
      
+
      • etatchain = what for each T chain
+
      • eta_dottchain = what for each T chain
+
      • omegandof = what for each barostat DOF
+
      • omega_dotndof = what for each barostat DOF
+
      • etappchain = what for each P chain
+
      • etap_dotpchain = what for each P chain
+
      • PE_etatchain = potential energy for each T chain
+
      • KE_eta_dottchain = what for each T chain
+
      • PE_omegandof = what for each barostat DOF
+
      • KE_omega_dotndof = what for each barostat DOF
+
      • PE_etappchain = what for each P chain
+
      • KE_etap_dotpchain = what for each P chain
+
      • PE_strain1 = scalar strain energy 
+
      
+
      These fixes can ramp their external temperature and pressure over
+multiple runs, using the start and stop keywords of the
+run command.  See the run command for details of
+how to do this.
+
      
+
      These fixes are not invoked during energy
+minimization.
+
      
+
      Restrictions:
+
      
+
      Non-periodic dimensions cannot be barostatted.  Z, xz, and yz,
+cannot be barostatted 2D simulations.  Xy, xz, and yz can only
+be barostatted if the simulation domain is triclinic and the 2nd
+dimension in the keyword (y dimension in xy) is periodic.  The
+create_box, read data, and
+read_restart commands specify whether the
+simulation box is orthogonal or non-orthogonal (triclinic) and explain
+the meaning of the xy,xz,yz tilt factors.
+
      
+
      For the temp keyword, the final Tstop cannot be 0.0 since it would
+make the external T = 0.0 at some timestep during the simulation which
+is not allowed in the Nose/Hoover formulation.
+
      
+
      Related commands:
+
      
+
      fix nve, fix_modify
+
      
+
      Default:
+
      
+
      The keyword defaults are tchain = 3, pchain = 0, mtk = yes, tloop =
+ploopt = 1, nreset = 0, drag = 0.0, dilate = all, and couple = none.
+
      
+
      
+
+
+
+
      (Martyna) Martyna, Tobias and Klein, J Chem Phys, 101, 4177 (1994).
+
      
+
+
+
      (Parrinello) Parrinello and Rahman, J Appl Phys, 52, 7182 (1981).
+
      
+
+
+
      (Tuckerman) Tuckerman, Alejandre, Lopez-Rendon, Jochim, and
+Martyna, J Phys A: Math Gen, 39, 5629 (2006).
+
      
+
+
+
      (Shinoda) Shinoda, Shiga, and Mikami, Phys Rev B, 69, 134103 (2004).
+
      
+
diff --git a/doc/fix_nh.txt b/doc/fix_nh.txt
new file mode 100644
index 0000000000..6b9553f25b
--- /dev/null
+++ b/doc/fix_nh.txt
@@ -0,0 +1,440 @@
+"LAMMPS WWW Site"_lws - "LAMMPS Documentation"_ld - "LAMMPS Commands"_lc :c
+
+:link(lws,http://lammps.sandia.gov)
+:link(ld,Manual.html)
+:link(lc,Section_commands.html#comm)
+
+:line
+
+fix nvt command :h3
+fix npt command :h3
+fix nph command :h3
+
+[Syntax:]
+
+fix ID group-ID style_name keyword value ... :pre
+
+ID, group-ID are documented in "fix"_fix.html command :ulb,l
+style_name = {nvt} or {npt} or {nph} :l
+one or more keyword value pairs may be appended
+keyword = {temp} or {iso} or {aniso} or {tri} or {x} or {y} or {z} or {xy} or {yz} or {xz} or {couple} or {tchain} or {pchain} or {mtk} or {tloop} or {ploop} or {nreset} or {drag} or {dilate}
+  {temp} values = Tstart Tstop Tdamp
+    Tstart,Tstop = external temperature at start/end of run
+    Tdamp = temperature damping parameter (time units)
+  {iso} or {aniso} or {tri} values = Pstart Pstop Pdamp
+    Pstart,Pstop = scalar external pressure at start/end of run (pressure units)
+    Pdamp = pressure damping parameter (time units)
+  {x} or {y} or {z} or {xy} or {yz} or {xz} values = Pstart Pstop Pdamp
+    Pstart,Pstop = external stress tensor component at start/end of run (pressure units)
+    Pdamp = stress damping parameter (time units)
+  {couple} = {none} or {xyz} or {xy} or {yz} or {xz}
+  {tchain} value = length of thermostat chain (1 = single thermostat)
+  {pchain} values = length of thermostat chain  on barostat (0 = no thermostat)
+  {mtk} value = {yes} or {no} = add in MTK adjustment term or not
+  {tloop} value = number of sub-cycles to perform on thermostat
+  {ploop} value = number of sub-cycles to perform on barostat thermostat
+  {nreset} value = reset reference cell every this many timesteps
+  {drag} value = drag factor added to barostat/thermostat (0.0 = no drag)
+  {dilate} value = {all} or {partial} :pre
+:ule
+
+[Examples:]
+
+fix 1 all nvt temp 300.0 300.0 100.0
+fix 1 water npt temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
+fix 2 jello npt temp 300.0 300.0 100.0 tri 5.0 5.0 1000.0
+fix 2 ice nph temp 273.15 273.15 x 1.0 1.0 0.5 y 2.0 2.0 0.5 z 3.0 3.0 0.5 yz 0.1 0.1 0.5 xz 0.2 0.2 0.5 xy 0.3 0.3 0.5 nreset 1000 :pre
+
+[Description:]
+
+These commands perform time integration on Nose-Hoover style
+non-Hamiltonian equations of motion which are designed to generate
+positions and velocities sampled from the canonical (nvt),
+isothermal-isobaric (npt), and isenthalpic (nph) ensembles.  This is
+achieved by adding some dynamic variables which are coupled to the
+particle velocities (thermostatting) and simulation domain dimensions
+(barostatting).  In addition to basic thermostatting and barostatting,
+these fixes can also create a chain of thermostats coupled to the
+particle thermostat, and another chain of thermostats coupled to the
+barostat variables. The barostat can be coupled to the overall box
+volume, or to individual dimensions, including the {xy}, {xz} and {yz}
+tilt dimensions. The external pressure of the barostat can be
+specified as either a scalar pressure (isobaric ensemble) or as
+components of a symmetric stress tensor (constant stress ensemble).
+When used correctly, the time-averaged temperature and stress tensor
+of the particles will match the target values specified by
+Tstart/Tstop and Pstart/Pstop.
+
+The equations of motion used are those of Shinoda et al in
+"(Shinoda)"_#Shinoda, which combine the hydrostatic equations of
+Martyna, Tobias and Klein in "(Martyna)"_#Martyna with the strain
+energy proposed by Parrinello and Rahman in
+"(Parrinello)"_#Parrinello.  The time integration schemes follow the
+time-reversible measure-preserving integrators derived by Tuckerman et
+al in "(Tuckerman)"_#Tuckerman.
+
+:line
+
+The thermostat for fix styles {nvt} and {npt} is specified using the
+{temp} keyword.  Other thermostat-related keywords are {tchain},
+{tloop} and {drag}, which are discussed below.
+
+The thermostat is applied to only the translational degrees of freedom
+for the particles.  The translational degrees of freedom can also have
+a bias velocity removed before thermostatting takes place; see the
+description below.  The desired temperature at each timestep is a
+ramped value during the run from {Tstart} to {Tstop}.  The {Tdamp}
+parameter is specified in time units and determines how rapidly the
+temperature is relaxed.  For example, a value of 100.0 means to relax
+the temperature in a timespan of (roughly) 100 time units (tau or
+fmsec or psec - see the "units"_units.html command).  The atoms in the
+fix group are the only ones whose velocities and positions are updated
+by the velocity/position update portion of the integration.
+
+:line
+
+The barostat for fix styles {npt} and {nph} is specified using one or
+more of the {iso}, {aniso}, {tri}, {x}, {y}, {z}, {xy}, {xz}, {yz},
+and {couple} keywords.  These keywords give you the ability to specify
+all 6 components of an external stress tensor, and to couple various
+of these components together so that the dimensions they represent are
+varied together during a constant-pressure simulation.
+
+Other barostat-related keywords are {pchain}, {mtk}, {ploop},
+{nreset}, {drag}, and {dilate}, which are discussed below.
+
+Orthogonal simulation boxes have 3 adjustable dimensions (x,y,z).
+Triclinic (non-orthogonal) simulation boxes have 6 adjustable
+dimensions (x,y,z,xy,xz,yz).  The "create_box"_create_box.html, "read
+data"_read_data.html, and "read_restart"_read_restart.html commands
+specify whether the simulation box is orthogonal or non-orthogonal
+(triclinic) and explain the meaning of the xy,xz,yz tilt factors.
+
+The target pressures for each of the 6 components of the stress tensor
+can be specified independently via the {x}, {y}, {z}, {xy}, {xz}, {yz}
+keywords, which correspond to the 6 simulation box dimensions.  For
+each component, the external pressure or tensor component at each
+timestep is a ramped value during the run from {Pstart} to {Pstop}.
+If a target pressure is specified for a component, then the
+corresponding box dimension will change during a simulation.  For
+example, if the {y} keyword is used, the y-box length will change.  If
+the {xy} keyword is used, the xy tilt factor will change.  A box
+dimension will not change if that component is not specified, although
+you have the option to change that dimension via the "fix
+deform"_fix_deform.html command.
+
+Note that in order to use the {xy}, {xz}, or {yz} keywords, the
+simulation box must be triclinic, even if its initial tilt factors are
+0.0.
+
+For all barostat keywords, the {Pdamp} parameter operates like the
+{Tdamp} parameter, determining the time scale on which pressure is
+relaxed.  For example, a value of 1000.0 means to relax the pressure
+in a timespan of (roughly) 1000 time units (tau or fmsec or psec - see
+the "units"_units.html command).
+
+Regardless of what atoms are in the fix group, a global pressure or
+stress tensor is computed for all atoms.  Similarly, when the size of
+the simulation box is changed, all atoms are re-scaled to new
+positions, unless the keyword {dilate} is specified with a value of
+{partial}, in which case only the atoms in the fix group are
+re-scaled.  The latter can be useful for leaving the coordinates of
+atoms in a solid substrate unchanged and controlling the pressure of a
+surrounding fluid.
+
+:line
+
+The {couple} keyword allows two or three of the diagonal components of
+the pressure tensor to be "coupled" together.  The value specified
+with the keyword determines which are coupled.  For example, {xz}
+means the {Pxx} and {Pzz} components of the stress tensor are coupled.
+{Xyz} means all 3 diagonal components are coupled.  Coupling means two
+things: the instantaneous stress will be computed as an average of the
+corresponding diagonal components, and the coupled box dimensions will
+be changed together in lockstep, meaning coupled dimensions will be
+dilated or contracted by the same percentage every timestep.  The
+{Pstart}, {Pstop}, {Pdamp} parameters for any coupled dimensions must
+be identical.  {Couple xyz} can be used for a 2d simulation; the {z}
+dimension is simply ignored.
+
+:line
+
+The {iso}, {aniso}, and {tri} keywords are simply shortcuts that are
+equivalent to specifying several other keywords together.
+
+The keyword {iso} means couple all 3 diagonal components together when
+pressure is computed (hydrostatic pressure), and dilate/contract the
+dimensions together.  Using "iso Pstart Pstop Pdamp" is the same as
+specifying these 4 keywords:
+
+x Pstart Pstop Pdamp
+y Pstart Pstop Pdamp
+z Pstart Pstop Pdamp
+couple xyz :pre
+
+The keyword {aniso} means {x}, {y}, and {z} dimensions are controlled
+independently using the {Pxx}, {Pyy}, and {Pzz} components of the
+stress tensor as the driving forces, and the specified scalar external
+pressure.  Using "aniso Pstart Pstop Pdamp" is the same as specifying
+these 4 keywords:
+
+x Pstart Pstop Pdamp
+y Pstart Pstop Pdamp
+z Pstart Pstop Pdamp
+couple none :pre
+
+The keyword {tri} means {x}, {y}, {z}, {xy}, {xz}, and {yz} dimensions
+are controlled independently using their individual stress components
+as the driving forces, and the specified scalar pressure as the
+external normal stress.  Using "tri Pstart Pstop Pdamp" is the same as
+specifying these 7 keywords:
+
+x Pstart Pstop Pdamp
+y Pstart Pstop Pdamp
+z Pstart Pstop Pdamp
+xy 0.0 0.0 Pdamp
+yz 0.0 0.0 Pdamp
+xz 0.0 0.0 Pdamp
+couple none :pre
+
+:line
+
+In some cases (e.g. for solids) the pressure (volume) and/or
+temperature of the system can oscillate undesirably when a Nose/Hoover
+barostat and thermostat is applied.  The optional {drag} keyword will
+damp these oscillations, although it alters the Nose/Hoover equations.
+A value of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.
+A non-zero value adds a drag term; the larger the value specified, the
+greater the damping effect.  Performing a short run and monitoring the
+pressure and temperature is the best way to determine if the drag term
+is working.  Typically a value between 0.2 to 2.0 is sufficient to
+damp oscillations after a few periods. Note that use of the drag
+keyword will interfere with energy conservation and will also change
+the distribution of positions and velocities so that they do not
+correspond to the norminal NVT, NPT, or NPH ensembles.
+
+An alternative way to control initial oscillations is to use chain
+thermostats. The keyword {tchain} determines the number of thermostats
+in the particle thermostat. A value of 1 corresponds to the original
+Nose-Hoover thermostat. The keyword {pchain} specifies the number of
+thermostats in the chain thermostatting the barostat degrees of
+freedom. A value of 0 corresponds to no thermostatting of the
+bvarostat variables.
+
+The {mtk} keyword controls whether or not the correction terms due to
+Martyna, Tuckerman, and Klein are included in the equations of motion
+"(Martyna1994)"_#Martyna1994.  Specifying {no} reproduces the original
+Hoover barostat, whose volume probability distribution function
+differs from the true NPT and NPH ensembles by a factor of 1/V.  Hence
+using {yes} is more correct, but in many cases the difference is
+negligible.
+
+The keyword {tloop} can be used to improve the accuracy of integration
+scheme at little extra cost.  The initial and final updates of the
+thermostat variables are broken up into {tloop} substeps, each of
+length {dt}/{tloop}. This corresponds to using a first-order
+Suzuki-Yoshida scheme "(Tuckerman2006)"_#Tuckerman2006.  The keyword
+{ploop} does the same thing for the barostat thermostat.
+
+The keyword {nreset} controls how often the reference dimensions used
+to define the strain energy are reset.  If this keyword is not used,
+or is given a value of zero, then the reference dimensions are set to
+those of the initial simulation domain and are never changed. If the
+simulation domain changes significantly during the simulation, then
+the final average pressure tensor will differ significantly from the
+specified values of the external stress tensor.  A value of {nstep}
+means that every {nstep} timesteps, the reference dimensions are set
+to those of the current simulation domain.
+
+:line
+
+IMPORTANT NOTE: Using a barostat coupled to tilt dimensions {xy},
+{xz}, {yz} can sometimes result in arbitrarily large values of the
+tilt dimensions, i.e. a dratically deformed simulation box.  LAMMPS
+imposes reasonable limits on how large the tilt values can be, and
+exits with an error if these are exceeded.  This error typically
+indicates that there is something badly wrong with how the simulation
+was constructed.  The three most common sources of this error are
+using keyword {tri} on a liquid system, specifying an external shear
+stress tensor that exceeds the yield stress of the solid, and
+specifying values of {Pstart} that are too far from the current stress
+value. In other words, triclinic barostatting should be used with
+care.  This also is true for other barostat styles, although they tend
+to be more forgiving of insults.
+
+IMPORTANT NOTE: Unlike the "fix
+temp/berendsen"_fix_temp_berendsen.html command which performs
+thermostatting but NO time integration, these fixes perform
+thermostatting/barostatting AND time integration.  Thus you should not
+use any other time integration fix, such as "fix nve"_fix_nve.html on
+atoms to which this fix is applied.  Likewise, the {temp} options for
+fix nvt and fix npt should not normally be used on atoms that also
+have their temperature controlled by another fix - e.g. by "fix
+langevin"_fix_nh.html or "fix temp/rescale"_fix_temp_rescale.html
+commands.
+
+See "this howto section"_Section_howto.html#4_16 of the manual for a
+discussion of different ways to compute temperature and perform
+thermostatting and barostatting.
+
+:line
+
+These fixes compute a temperature and pressure each timestep.  To do
+this, the fix creates its own computes of style "temp" and "pressure",
+as if one of these two sets of commands had been issued:
+
+compute fix-ID_temp group-ID temp
+compute fix-ID_press group-ID pressure fix-ID_temp :pre
+
+compute fix-ID_temp all temp
+compute fix-ID_press all pressure fix-ID_temp :pre
+
+See the "compute temp"_compute_temp.html and "compute
+pressure"_compute_pressure.html commands for details.  Note that the
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
++ underscore + "press".  For fix nvt, the group for the new computes
+is the same as the fix group.  For fix nph and fix npt, the group for
+the new computes is "all" since pressure is computed for the entire
+system.
+
+Note that these are NOT the computes used by thermodynamic output (see
+the "thermo_style"_thermo_style.html command) with ID = {thermo_temp}
+and {thermo_press}.  This means you can change the attributes of this
+fix's temperature or pressure via the
+"compute_modify"_compute_modify.html command or print this temperature
+or pressure during thermodynamic output via the "thermo_style
+custom"_thermo_style.html command using the appropriate compute-ID.
+It also means that changing attributes of {thermo_temp} or
+{thermo_press} will have no effect on this fix.
+
+Like other fixes that perform thermostatting, fix nvt and fix npt can
+be used with "compute commands"_compute.html that calculate a
+temperature after removing a "bias" from the atom velocities.
+E.g. removing the center-of-mass velocity from a group of atoms or
+only calculating temperature on the x-component of velocity or only
+calculating temperature for atoms in a geometric region.  This is not
+done by default, but only if the "fix_modify"_fix_modify.html command
+is used to assign a temperature compute to this fix that includes such
+a bias term.  See the doc pages for individual "compute
+commands"_compute.html to determine which ones include a bias.  In
+this case, the thermostat works in the following manner: the current
+temperature is calculated taking the bias into account, bias is
+removed from each atom, thermostatting is performed on the remaining
+thermal degrees of freedom, and the bias is added back in.
+
+[Restart, fix_modify, output, run start/stop, minimize info:]
+
+These fixes writes the state of all the thermostat and barostat
+variables to "binary restart files"_restart.html.  See the
+"read_restart"_read_restart.html command for info on how to re-specify
+a fix in an input script that reads a restart file, so that the
+operation of the fix continues in an uninterrupted fashion.
+
+The "fix_modify"_fix_modify.html {temp} and {press} options are
+supported by these fixes.  You can use them to assign a
+"compute"_compute.html you have defined to this fix which will be used
+in its thermostatting or barostatting procedure, as described above.
+If you do this, note that the kinetic energy derived from the compute
+temperature should be consistent with the virial term computed using
+all atoms for the pressure.  LAMMPS will warn you if you choose to
+compute temperature on a subset of atoms.
+
+IMPORTANT NOTE: If both the {temp} and {press} keywords are used in a
+single thermo_modify command (or in two separate commands), then the
+order in which the keywords are specified is important.  Note that a
+"pressure compute"_compute_pressure.html defines its own temperature
+compute as an argument when it is specified.  The {temp} keyword will
+override this (for the pressure compute being used by fix npt), but
+only if the {temp} keyword comes after the {press} keyword.  If the
+{temp} keyword comes before the {press} keyword, then the new pressure
+compute specified by the {press} keyword will be unaffected by the
+{temp} setting.
+
+The "fix_modify"_fix_modify.html {energy} option is supported by these
+fixes to add the energy change induced by Nose/Hoover thermostatting
+and barostatting to the system's potential energy as part of
+"thermodynamic output"_thermo_style.html.
+
+These fixes compute a global scalar and a global vector of quantities,
+which can be accessed by various "output
+commands"_Section_howto.html#4_15.  The scalar values calculated by
+this fix are "extensive"; the vector values are "intensive".
+
+The scalar is the cummulative energy change due to the fix.
+
+The vector stores internal Nose/Hoover thermostat and barostat
+variables.  The number and meaning of the vector values depends on
+which fix is used and the settings for keywords {tchain} and {pchain},
+which specify the number of Nose/Hoover chains for the thermostat and
+barostat.  If no thermostatting is done, then {tchain} is 0.  If no
+barostatting is done, then {pchain} is 0.  In the following list,
+"ndof" is 0, 1, 3, or 6, and is the number of degrees of freedom in
+the barostat.  Its value is 0 if no barostat is used, else its value
+is 6 if any off-diagonal stress tensor component is barostatted, else
+its value is 1 if {couple xyz} is used or {couple xy} for a 2d
+simulation, otherwise its value is 3.
+
+The order of values in the global vector and their meaning is as
+follows.  The notation means there are tchain values for eta, followed
+by tchain for eta_dot, followed by ndof for omega, etc:
+
+eta[tchain] = what for each T chain
+eta_dot[tchain] = what for each T chain
+omega[ndof] = what for each barostat DOF
+omega_dot[ndof] = what for each barostat DOF
+etap[pchain] = what for each P chain
+etap_dot[pchain] = what for each P chain
+PE_eta[tchain] = potential energy for each T chain
+KE_eta_dot[tchain] = what for each T chain
+PE_omega[ndof] = what for each barostat DOF
+KE_omega_dot[ndof] = what for each barostat DOF
+PE_etap[pchain] = what for each P chain
+KE_etap_dot[pchain] = what for each P chain
+PE_strain[1] = scalar strain energy :ul
+
+These fixes can ramp their external temperature and pressure over
+multiple runs, using the {start} and {stop} keywords of the
+"run"_run.html command.  See the "run"_run.html command for details of
+how to do this.
+
+These fixes are not invoked during "energy
+minimization"_minimize.html.
+
+[Restrictions:]
+
+Non-periodic dimensions cannot be barostatted.  {Z}, {xz}, and {yz},
+cannot be barostatted 2D simulations.  {Xy}, {xz}, and {yz} can only
+be barostatted if the simulation domain is triclinic and the 2nd
+dimension in the keyword ({y} dimension in {xy}) is periodic.  The
+"create_box"_create_box.html, "read data"_read_data.html, and
+"read_restart"_read_restart.html commands specify whether the
+simulation box is orthogonal or non-orthogonal (triclinic) and explain
+the meaning of the xy,xz,yz tilt factors.
+
+For the {temp} keyword, the final Tstop cannot be 0.0 since it would
+make the external T = 0.0 at some timestep during the simulation which
+is not allowed in the Nose/Hoover formulation.
+
+[Related commands:]
+
+"fix nve"_fix_nve.html, "fix_modify"_fix_modify.html
+
+[Default:]
+
+The keyword defaults are tchain = 3, pchain = 0, mtk = yes, tloop =
+ploopt = 1, nreset = 0, drag = 0.0, dilate = all, and couple = none.
+
+:line
+
+:link(Martyna)
+[(Martyna)] Martyna, Tobias and Klein, J Chem Phys, 101, 4177 (1994).
+
+:link(Parrinello)
+[(Parrinello)] Parrinello and Rahman, J Appl Phys, 52, 7182 (1981).
+
+:link(Tuckerman)
+[(Tuckerman)] Tuckerman, Alejandre, Lopez-Rendon, Jochim, and
+Martyna, J Phys A: Math Gen, 39, 5629 (2006).
+
+:link(Shinoda)
+[(Shinoda)] Shinoda, Shiga, and Mikami, Phys Rev B, 69, 134103 (2004).
diff --git a/doc/fix_nph.html b/doc/fix_nph.html
deleted file mode 100644
index 73988cd86c..0000000000
--- a/doc/fix_nph.html
+++ /dev/null
@@ -1,227 +0,0 @@
-
-
      LAMMPS WWW Site - LAMMPS Documentation - LAMMPS Commands 
-
      
-
-
-
-
-
-
-
      
-
-
      fix nph command 
-
      
-
      Syntax:
-
      
-
      fix ID group-ID nph p-style args keyword value ... 
-
      
-
      • ID, group-ID are documented in fix command 
-
-
      • nph = style name of this fix command 
-
-
      • p-style = xyz or xy or yz or xz or aniso 
-
-
          xyz args = Pstart Pstop Pdamp
-    Pstart,Pstop = desired pressure at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  xy or yz or xz args = Px0 Px1 Py0 Py1 Pz0 Pz1 Pdamp
-    Px0,Px1,Py0,Py1,Pz0,Pz1 = desired pressure in x,y,z at 
-      start/end (0/1) of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  aniso args = Px0 Px1 Py0 Py1 Pz0 Pz1 Pdamp
-    Px0,Px1,Py0,Py1,Pz0,Pz1 = desired pressure in x,y,z at
-      start/end (0/1) of run (pressure units)
-    Pdamp = pressure damping parameter (time units) 
-
        
-
      • zero or more keyword/value pairs may be appended 
-
-
      • keyword = drag or dilate 
-
-
          drag value = drag factor added to barostat (0.0 = no drag)
-  dilate value = all or partial 
-
        
-
-
      
-
      Examples:
-
      
-
      fix 1 all nph xyz 0.0 0.0 1000.0
-fix 2 all nph xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0 drag 1.0
-fix 2 all nph aniso 0.0 0.0 0.0 0.0 NULL NULL 1000.0 
-
      
-
      Description:
-
      
-
      Perform constant NPH integration to update positions and velocities
-each timestep for atoms in the group using a Nose/Hoover pressure
-barostat (Hoover), implemented as described in
-(Melchionna).  P is pressure.  This creates a system
-trajectory consistent with the isobaric ensemble.  Unlike fix
-npt, temperature will not be controlled if no other fix
-is used.  Temperature can be controlled independently by using a
-thermostatting fis such as fix langevin or fix
-temp/rescale.
-
      
-
      The atoms in the fix group are the only ones whose velocities and
-positions are updated by the velocity/position update portion of the
-NPT integration.
-
      
-
      Regardless of what atoms are in the fix group, a global pressure is
-computed for all atoms.  Similarly, when the size of the simulation
-box is changed, all atoms are re-scaled to new positions, unless the
-keyword dilate is specified with a value of partial, in which case
-only the atoms in the fix group are re-scaled.  The latter can be
-useful for leaving the coordinates of atoms in a solid substrate
-unchanged and controlling the pressure of a surrounding fluid.
-
      
-
      IMPORTANT NOTE: Unlike the fix
-press/berendsen command which performs
-barostatting but NO time integration, this fix performs barostatting
-AND time integration.  Thus you should not use any other time
-integration fix, such as fix nve or fix
-nvt on atoms to which this fix is applied.  Use fix
-npt instead of this fix, if you want to control both
-temperature and pressure via Nose/Hoover.
-
      
-
      See this howto section of the manual for a
-discussion of different ways to compute temperature and perform
-thermostatting and barostatting.
-
      
-
      
-
-
      The pressure can be controlled in one of several styles, as specified
-by the p-style argument.  In each case, the desired pressure at each
-timestep is a ramped value during the run from the starting value to
-the end value.
-
      
-
      Style xyz means couple all dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the dimensions
-together.
-
      
-
      Styles xy or yz or xz means that the 2 specified dimensions are
-coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently, using its pressure component as the driving force.
-These styles cannot be used for a 2d simulation.
-
      
-
      For style aniso, all dimensions dilate/contract independently using
-their individual pressure components as the driving forces.
-
      
-
      For any of the styles except xyz, any of the independent pressure
-components (e.g. z in xy, or any dimension in aniso) can have
-their target pressures (both start and stop values) specified as NULL.
-This means that no pressure control is applied to that dimension so
-that the box dimension remains unchanged.  For a 2d simulation the z
-pressure components must be specified as NULL when using style
-aniso.
-
      
-
      For styles xy and yz and xz, the starting and stopping pressures
-must be the same for the two coupled dimensions and cannot be
-specified as NULL.
-
      
-
      In some cases (e.g. for solids) the pressure (volume) and/or
-temperature of the system can oscillate undesirably when a Nose/Hoover
-barostat is applied.  The optional drag keyword will damp these
-oscillations, although it alters the Nose/Hoover equations.  A value
-of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.  A
-non-zero value adds a drag term; the larger the value specified, the
-greater the damping effect.  Performing a short run and monitoring the
-pressure is the best way to determine if the drag term is working.
-Typically a value between 0.2 to 2.0 is sufficient to damp
-oscillations after a few periods.
-
      
-
      For all pressure styles, the simulation box stays rectangular in
-shape.  Parinello-Rahman boundary condition for tilted boxes
-(triclinic symmetry) are supported by other LAMMPS commands (see this
-section of the manual), but not yet by this
-command.
-
      
-
      For all styles, the Pdamp parameter determines the time scale on
-which pressure is relaxed.  For example, a value of 1000.0 means to
-relax the pressure in a timespan of (roughly) 1000 time units (tau or
-fmsec or psec - see the units command).
-
      
-
      
-
-
      This fix computes a temperature and pressure each timestep.  To do
-this, the fix creates its own computes of style "temp" and "pressure",
-as if these commands had been issued:
-
      
-
      compute fix-ID_temp group-ID temp 
-
      
-
      compute fix-ID_press group-ID pressure fix-ID_temp 
-
      
-
      See the compute temp and compute
-pressure commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
-+ underscore + "press", and the group for the new computes is the same
-as the fix group.
-
      
-
      Note that these are NOT the computes used by thermodynamic output (see
-the thermo_style command) with ID = thermo_temp
-and thermo_press.  This means you can change the attributes of this
-fix's temperature or pressure via the
-compute_modify command or print this temperature
-or pressure during thermodynamic output via the thermo_style
-custom command using the appropriate compute-ID.
-It also means that changing attributes of thermo_temp or
-thermo_press will have no effect on this fix.
-
      
-
      Restart, fix_modify, output, run start/stop, minimize info:
-
      
-
      This fix writes the state of the Nose/Hoover barostat to binary
-restart files.  See the read_restart
-command for info on how to re-specify a fix in an input script that
-reads a restart file, so that the operation of the fix continues in an
-uninterrupted fashion.
-
      
-
      The fix_modify temp and press options are
-supported by this fix.  You can use them to assign a
-compute you have defined to this fix which will be used
-in its thermostatting or barostatting procedure.  If you do this, note
-that the kinetic energy derived from the compute temperature should be
-consistent with the virial term computed using all atoms for the
-pressure.  LAMMPS will warn you if you choose to compute temperature
-on a subset of atoms.
-
      
-
      The fix_modify energy option is supported by this
-fix to add the energy change induced by Nose/Hoover barostatting to
-the system's potential energy as part of thermodynamic
-output.
-
      
-
      The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".
-
      
-
      This fix can ramp its target pressure over multiple runs, using the
-start and stop keywords of the run command.  See the
-run command for details of how to do this.
-
      
-
      This fix is not invoked during energy minimization.
-
      
-
      Restrictions:
-
      
-
      Any dimension being adjusted by this fix must be periodic.  A
-dimension whose target pressures are specified as NULL can be
-non-periodic or periodic.
-
      
-
      Related commands:
-
      
-
      fix nve, fix npt,
-fix_modify
-
      
-
      Default:
-
      
-
      The keyword defaults are drag = 0.0 and dilate = all.
-
      
-
      
-
-
-
-
      (Hoover) Hoover, Phys Rev A, 34, 2499 (1986).
-
      
-
-
-
      (Melchionna) Melchionna, Ciccotti, Holian, Molecular Physics, 78,
-533-44 (1993).
-
      
-
diff --git a/doc/fix_nph.txt b/doc/fix_nph.txt
deleted file mode 100644
index cc0f0f3f72..0000000000
--- a/doc/fix_nph.txt
+++ /dev/null
@@ -1,213 +0,0 @@
-"LAMMPS WWW Site"_lws - "LAMMPS Documentation"_ld - "LAMMPS Commands"_lc :c
-
-:link(lws,http://lammps.sandia.gov)
-:link(ld,Manual.html)
-:link(lc,Section_commands.html#comm)
-
-:line
-
-fix nph command :h3
-
-[Syntax:]
-
-fix ID group-ID nph p-style args keyword value ... :pre
-
-ID, group-ID are documented in "fix"_fix.html command :ulb,l
-nph = style name of this fix command :l
-p-style = {xyz} or {xy} or {yz} or {xz} or {aniso} :l
-  {xyz} args = Pstart Pstop Pdamp
-    Pstart,Pstop = desired pressure at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  {xy} or {yz} or {xz} args = Px0 Px1 Py0 Py1 Pz0 Pz1 Pdamp
-    Px0,Px1,Py0,Py1,Pz0,Pz1 = desired pressure in x,y,z at 
-      start/end (0/1) of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  {aniso} args = Px0 Px1 Py0 Py1 Pz0 Pz1 Pdamp
-    Px0,Px1,Py0,Py1,Pz0,Pz1 = desired pressure in x,y,z at
-      start/end (0/1) of run (pressure units)
-    Pdamp = pressure damping parameter (time units) :pre
-
-zero or more keyword/value pairs may be appended :l
-keyword = {drag} or {dilate} :l
-  {drag} value = drag factor added to barostat (0.0 = no drag)
-  {dilate} value = {all} or {partial} :pre
-:ule
-
-[Examples:]
-
-fix 1 all nph xyz 0.0 0.0 1000.0
-fix 2 all nph xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0 drag 1.0
-fix 2 all nph aniso 0.0 0.0 0.0 0.0 NULL NULL 1000.0 :pre
-
-[Description:]
-
-Perform constant NPH integration to update positions and velocities
-each timestep for atoms in the group using a Nose/Hoover pressure
-barostat "(Hoover)"_#Hoover, implemented as described in
-"(Melchionna)"_#Melchionna.  P is pressure.  This creates a system
-trajectory consistent with the isobaric ensemble.  Unlike "fix
-npt"_fix_npt.html, temperature will not be controlled if no other fix
-is used.  Temperature can be controlled independently by using a
-thermostatting fis such as "fix langevin"_fix_langevin.html or "fix
-temp/rescale"_fix_temp_rescale.html.
-
-The atoms in the fix group are the only ones whose velocities and
-positions are updated by the velocity/position update portion of the
-NPT integration.
-
-Regardless of what atoms are in the fix group, a global pressure is
-computed for all atoms.  Similarly, when the size of the simulation
-box is changed, all atoms are re-scaled to new positions, unless the
-keyword {dilate} is specified with a value of {partial}, in which case
-only the atoms in the fix group are re-scaled.  The latter can be
-useful for leaving the coordinates of atoms in a solid substrate
-unchanged and controlling the pressure of a surrounding fluid.
-
-IMPORTANT NOTE: Unlike the "fix
-press/berendsen"_fix_press_berendsen.html command which performs
-barostatting but NO time integration, this fix performs barostatting
-AND time integration.  Thus you should not use any other time
-integration fix, such as "fix nve"_fix_nve.html or "fix
-nvt"_fix_nvt.html on atoms to which this fix is applied.  Use "fix
-npt"_fix_npt.html instead of this fix, if you want to control both
-temperature and pressure via Nose/Hoover.
-
-See "this howto section"_Section_howto.html#4_16 of the manual for a
-discussion of different ways to compute temperature and perform
-thermostatting and barostatting.
-
-:line
-
-The pressure can be controlled in one of several styles, as specified
-by the {p-style} argument.  In each case, the desired pressure at each
-timestep is a ramped value during the run from the starting value to
-the end value.
-
-Style {xyz} means couple all dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the dimensions
-together.
-
-Styles {xy} or {yz} or {xz} means that the 2 specified dimensions are
-coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently, using its pressure component as the driving force.
-These styles cannot be used for a 2d simulation.
-
-For style {aniso}, all dimensions dilate/contract independently using
-their individual pressure components as the driving forces.
-
-For any of the styles except {xyz}, any of the independent pressure
-components (e.g. z in {xy}, or any dimension in {aniso}) can have
-their target pressures (both start and stop values) specified as NULL.
-This means that no pressure control is applied to that dimension so
-that the box dimension remains unchanged.  For a 2d simulation the z
-pressure components must be specified as NULL when using style
-{aniso}.
-
-For styles {xy} and {yz} and {xz}, the starting and stopping pressures
-must be the same for the two coupled dimensions and cannot be
-specified as NULL.
-
-In some cases (e.g. for solids) the pressure (volume) and/or
-temperature of the system can oscillate undesirably when a Nose/Hoover
-barostat is applied.  The optional {drag} keyword will damp these
-oscillations, although it alters the Nose/Hoover equations.  A value
-of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.  A
-non-zero value adds a drag term; the larger the value specified, the
-greater the damping effect.  Performing a short run and monitoring the
-pressure is the best way to determine if the drag term is working.
-Typically a value between 0.2 to 2.0 is sufficient to damp
-oscillations after a few periods.
-
-For all pressure styles, the simulation box stays rectangular in
-shape.  Parinello-Rahman boundary condition for tilted boxes
-(triclinic symmetry) are supported by other LAMMPS commands (see "this
-section"_Section_howto.html#4_12 of the manual), but not yet by this
-command.
-
-For all styles, the {Pdamp} parameter determines the time scale on
-which pressure is relaxed.  For example, a value of 1000.0 means to
-relax the pressure in a timespan of (roughly) 1000 time units (tau or
-fmsec or psec - see the "units"_units.html command).
-
-:line
-
-This fix computes a temperature and pressure each timestep.  To do
-this, the fix creates its own computes of style "temp" and "pressure",
-as if these commands had been issued:
-
-compute fix-ID_temp group-ID temp :pre
-compute fix-ID_press group-ID pressure fix-ID_temp :pre
-
-See the "compute temp"_compute_temp.html and "compute
-pressure"_compute_pressure.html commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
-+ underscore + "press", and the group for the new computes is the same
-as the fix group.
-
-Note that these are NOT the computes used by thermodynamic output (see
-the "thermo_style"_thermo_style.html command) with ID = {thermo_temp}
-and {thermo_press}.  This means you can change the attributes of this
-fix's temperature or pressure via the
-"compute_modify"_compute_modify.html command or print this temperature
-or pressure during thermodynamic output via the "thermo_style
-custom"_thermo_style.html command using the appropriate compute-ID.
-It also means that changing attributes of {thermo_temp} or
-{thermo_press} will have no effect on this fix.
-
-[Restart, fix_modify, output, run start/stop, minimize info:]
-
-This fix writes the state of the Nose/Hoover barostat to "binary
-restart files"_restart.html.  See the "read_restart"_read_restart.html
-command for info on how to re-specify a fix in an input script that
-reads a restart file, so that the operation of the fix continues in an
-uninterrupted fashion.
-
-The "fix_modify"_fix_modify.html {temp} and {press} options are
-supported by this fix.  You can use them to assign a
-"compute"_compute.html you have defined to this fix which will be used
-in its thermostatting or barostatting procedure.  If you do this, note
-that the kinetic energy derived from the compute temperature should be
-consistent with the virial term computed using all atoms for the
-pressure.  LAMMPS will warn you if you choose to compute temperature
-on a subset of atoms.
-
-The "fix_modify"_fix_modify.html {energy} option is supported by this
-fix to add the energy change induced by Nose/Hoover barostatting to
-the system's potential energy as part of "thermodynamic
-output"_thermo_style.html.
-
-The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".
-
-This fix can ramp its target pressure over multiple runs, using the
-{start} and {stop} keywords of the "run"_run.html command.  See the
-"run"_run.html command for details of how to do this.
-
-This fix is not invoked during "energy minimization"_minimize.html.
-
-[Restrictions:]
-
-Any dimension being adjusted by this fix must be periodic.  A
-dimension whose target pressures are specified as NULL can be
-non-periodic or periodic.
-
-[Related commands:]
-
-"fix nve"_fix_nve.html, "fix npt"_fix_npt.html,
-"fix_modify"_fix_modify.html
-
-[Default:]
-
-The keyword defaults are drag = 0.0 and dilate = all.
-
-:line
-
-:link(Hoover)
-[(Hoover)] Hoover, Phys Rev A, 34, 2499 (1986).
-
-:link(Melchionna)
-[(Melchionna)] Melchionna, Ciccotti, Holian, Molecular Physics, 78,
-533-44 (1993).
diff --git a/doc/fix_nph_asphere.html b/doc/fix_nph_asphere.html
new file mode 100644
index 0000000000..cb7bdbff1a
--- /dev/null
+++ b/doc/fix_nph_asphere.html
@@ -0,0 +1,129 @@
+
+
      LAMMPS WWW Site - LAMMPS Documentation - LAMMPS Commands 
+
      
+
+
+
+
+
+
+
      
+
+
      fix nph/asphere command 
+
      
+
      Syntax:
+
      
+
      fix ID group-ID nph/asphere args keyword value ... 
+
      
+
      • ID, group-ID are documented in fix command
+
      • nph/asphere = style name of this fix command
+
      • additional barostat related keyword/value pairs from the fix nph command can be appended 
+
      
+
      Examples:
+
      
+
      fix 1 all nph/asphere iso 0.0 0.0 1000.0
+fix 2 all nph/asphere x 5.0 5.0 1000.0
+fix 2 all nph/asphere x 5.0 5.0 1000.0 drag 0.2
+fix 2 water nph/asphere aniso 0.0 0.0 1000.0 dilate partial 
+
      
+
      Description:
+
      
+
      Perform constant NPH integration to update position, velocity,
+orientation, and angular velocity each timestep for aspherical or
+ellipsoidal particles in the group using a Nose/Hoover pressure
+barostat.  P is pressure; H is enthalpy.  This creates a system
+trajectory consistent with the isenthalpic ensemble.
+
      
+
      This fix differs from the fix nph command, which assumes
+point particles and only updates their position and velocity.
+
      
+
      Additional parameters affecting the barostat are specified by keywords
+and values documented with the fix nph command.  See,
+for example, discussion of the aniso, and dilate keywords.
+
      
+
      The particles in the fix group are the only ones whose velocities and
+positions are updated by the velocity/position update portion of the
+NPH integration.
+
      
+
      Regardless of what particles are in the fix group, a global pressure is
+computed for all particles.  Similarly, when the size of the simulation
+box is changed, all particles are re-scaled to new positions, unless the
+keyword dilate is specified with a value of partial, in which case
+only the particles in the fix group are re-scaled.  The latter can be
+useful for leaving the coordinates of particles in a solid substrate
+unchanged and controlling the pressure of a surrounding fluid.
+
      
+
      
+
+
      This fix computes a temperature and pressure each timestep.  To do
+this, the fix creates its own computes of style "temp/asphere" and
+"pressure", as if these commands had been issued:
+
      
+
      compute fix-ID_temp all temp/asphere
+compute fix-ID_press all pressure fix-ID_temp 
+
      
+
      See the compute temp/asphere and compute
+pressure commands for details.  Note that the
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
++ underscore + "press", and the group for the new computes is "all"
+since pressure is computed for the entire system.
+
      
+
      Note that these are NOT the computes used by thermodynamic output (see
+the thermo_style command) with ID = thermo_temp
+and thermo_press.  This means you can change the attributes of this
+fix's temperature or pressure via the
+compute_modify command or print this temperature
+or pressure during thermodynamic output via the thermo_style
+custom command using the appropriate compute-ID.
+It also means that changing attributes of thermo_temp or
+thermo_press will have no effect on this fix.
+
      
+
      Restart, fix_modify, output, run start/stop, minimize info:
+
      
+
      This fix writes the state of the Nose/Hoover barostat to binary
+restart files.  See the read_restart
+command for info on how to re-specify a fix in an input script that
+reads a restart file, so that the operation of the fix continues in an
+uninterrupted fashion.
+
      
+
      The fix_modify temp and press options are
+supported by this fix.  You can use them to assign a
+compute you have defined to this fix which will be used
+in its thermostatting or barostatting procedure.  If you do this, note
+that the kinetic energy derived from the compute temperature should be
+consistent with the virial term computed using all atoms for the
+pressure.  LAMMPS will warn you if you choose to compute temperature
+on a subset of atoms.
+
      
+
      The fix_modify energy option is supported by this
+fix to add the energy change induced by Nose/Hoover barostatting to
+the system's potential energy as part of thermodynamic
+output.
+
      
+
      This fix computes the same global scalar and global vector of
+quantities as does the fix nph command.
+
      
+
      This fix can ramp its target pressure over multiple runs, using the
+start and stop keywords of the run command.  See the
+run command for details of how to do this.
+
      
+
      This fix is not invoked during energy minimization.
+
      
+
      Restrictions:
+
      
+
      This fix requires that atoms store torque and angular velocity (omega)
+as defined by the atom_style.  It also require they
+store either a per-particle diameter or per-type shape.
+
      
+
      All particles in the group must be finite-size.  They cannot be point
+particles, but they can be aspherical or spherical.
+
      
+
      Related commands:
+
      
+
      fix nph, fix nve_asphere, fix
+nvt_asphere, fix npt_asphere,
+fix_modify
+
      
+
      Default: none
+
      
+
diff --git a/doc/fix_nph_asphere.txt b/doc/fix_nph_asphere.txt
new file mode 100755
index 0000000000..5f8661df97
--- /dev/null
+++ b/doc/fix_nph_asphere.txt
@@ -0,0 +1,124 @@
+"LAMMPS WWW Site"_lws - "LAMMPS Documentation"_ld - "LAMMPS Commands"_lc :c
+
+:link(lws,http://lammps.sandia.gov)
+:link(ld,Manual.html)
+:link(lc,Section_commands.html#comm)
+
+:line
+
+fix nph/asphere command :h3
+
+[Syntax:]
+
+fix ID group-ID nph/asphere args keyword value ... :pre
+
+ID, group-ID are documented in "fix"_fix.html command
+nph/asphere = style name of this fix command
+additional barostat related keyword/value pairs from the "fix nph"_fix_nh.html command can be appended :ul
+
+[Examples:]
+
+fix 1 all nph/asphere iso 0.0 0.0 1000.0
+fix 2 all nph/asphere x 5.0 5.0 1000.0
+fix 2 all nph/asphere x 5.0 5.0 1000.0 drag 0.2
+fix 2 water nph/asphere aniso 0.0 0.0 1000.0 dilate partial :pre
+
+[Description:]
+
+Perform constant NPH integration to update position, velocity,
+orientation, and angular velocity each timestep for aspherical or
+ellipsoidal particles in the group using a Nose/Hoover pressure
+barostat.  P is pressure; H is enthalpy.  This creates a system
+trajectory consistent with the isenthalpic ensemble.
+
+This fix differs from the "fix nph"_fix_nh.html command, which assumes
+point particles and only updates their position and velocity.
+
+Additional parameters affecting the barostat are specified by keywords
+and values documented with the "fix nph"_fix_nh.html command.  See,
+for example, discussion of the {aniso}, and {dilate} keywords.
+
+The particles in the fix group are the only ones whose velocities and
+positions are updated by the velocity/position update portion of the
+NPH integration.
+
+Regardless of what particles are in the fix group, a global pressure is
+computed for all particles.  Similarly, when the size of the simulation
+box is changed, all particles are re-scaled to new positions, unless the
+keyword {dilate} is specified with a value of {partial}, in which case
+only the particles in the fix group are re-scaled.  The latter can be
+useful for leaving the coordinates of particles in a solid substrate
+unchanged and controlling the pressure of a surrounding fluid.
+
+:line
+
+This fix computes a temperature and pressure each timestep.  To do
+this, the fix creates its own computes of style "temp/asphere" and
+"pressure", as if these commands had been issued:
+
+compute fix-ID_temp all temp/asphere
+compute fix-ID_press all pressure fix-ID_temp :pre
+
+See the "compute temp/asphere"_compute_temp_asphere.html and "compute
+pressure"_compute_pressure.html commands for details.  Note that the
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
++ underscore + "press", and the group for the new computes is "all"
+since pressure is computed for the entire system.
+
+Note that these are NOT the computes used by thermodynamic output (see
+the "thermo_style"_thermo_style.html command) with ID = {thermo_temp}
+and {thermo_press}.  This means you can change the attributes of this
+fix's temperature or pressure via the
+"compute_modify"_compute_modify.html command or print this temperature
+or pressure during thermodynamic output via the "thermo_style
+custom"_thermo_style.html command using the appropriate compute-ID.
+It also means that changing attributes of {thermo_temp} or
+{thermo_press} will have no effect on this fix.
+
+[Restart, fix_modify, output, run start/stop, minimize info:]
+
+This fix writes the state of the Nose/Hoover barostat to "binary
+restart files"_restart.html.  See the "read_restart"_read_restart.html
+command for info on how to re-specify a fix in an input script that
+reads a restart file, so that the operation of the fix continues in an
+uninterrupted fashion.
+
+The "fix_modify"_fix_modify.html {temp} and {press} options are
+supported by this fix.  You can use them to assign a
+"compute"_compute.html you have defined to this fix which will be used
+in its thermostatting or barostatting procedure.  If you do this, note
+that the kinetic energy derived from the compute temperature should be
+consistent with the virial term computed using all atoms for the
+pressure.  LAMMPS will warn you if you choose to compute temperature
+on a subset of atoms.
+
+The "fix_modify"_fix_modify.html {energy} option is supported by this
+fix to add the energy change induced by Nose/Hoover barostatting to
+the system's potential energy as part of "thermodynamic
+output"_thermo_style.html.
+
+This fix computes the same global scalar and global vector of
+quantities as does the "fix nph"_fix_nh.html command.
+
+This fix can ramp its target pressure over multiple runs, using the
+{start} and {stop} keywords of the "run"_run.html command.  See the
+"run"_run.html command for details of how to do this.
+
+This fix is not invoked during "energy minimization"_minimize.html.
+
+[Restrictions:]
+
+This fix requires that atoms store torque and angular velocity (omega)
+as defined by the "atom_style"_atom_style.html.  It also require they
+store either a per-particle diameter or per-type "shape"_shape.html.
+
+All particles in the group must be finite-size.  They cannot be point
+particles, but they can be aspherical or spherical.
+
+[Related commands:]
+
+"fix nph"_fix_nh.html, "fix nve_asphere"_fix_nve_asphere.html, "fix
+nvt_asphere"_fix_nvt_asphere.html, "fix npt_asphere"_fix_npt_asphere.html,
+"fix_modify"_fix_modify.html
+
+[Default:] none
diff --git a/doc/fix_nph_sphere.html b/doc/fix_nph_sphere.html
new file mode 100644
index 0000000000..d58b965f26
--- /dev/null
+++ b/doc/fix_nph_sphere.html
@@ -0,0 +1,129 @@
+
+
      LAMMPS WWW Site - LAMMPS Documentation - LAMMPS Commands 
+
      
+
+
+
+
+
+
+
      
+
+
      fix nph/sphere command 
+
      
+
      Syntax:
+
      
+
      fix ID group-ID nph/sphere args keyword value ... 
+
      
+
      • ID, group-ID are documented in fix command
+
      • nph/sphere = style name of this fix command
+
      • additional barostat related keyword/value pairs from the fix nph command can be appended 
+
      
+
      Examples:
+
      
+
      fix 1 all nph/sphere iso 0.0 0.0 1000.0
+fix 2 all nph/sphere x 5.0 5.0 1000.0
+fix 2 all nph/sphere x 5.0 5.0 1000.0 drag 0.2
+fix 2 water nph/sphere aniso 0.0 0.0 1000.0 dilate partial 
+
      
+
      Description:
+
      
+
      Perform constant NPH integration to update position, velocity, and
+angular velocity each timestep for extended spherical particles in the
+group using a Nose/Hoover pressure barostat.  P is pressure; H is
+enthalpy.  This creates a system trajectory consistent with the
+isenthalpic ensemble.
+
      
+
      This fix differs from the fix nph command, which assumes
+point particles and only updates their position and velocity.
+
      
+
      Additional parameters affecting the barostat are specified by keywords
+and values documented with the fix nph command.  See,
+for example, discussion of the aniso, and dilate keywords.
+
      
+
      The particles in the fix group are the only ones whose velocities and
+positions are updated by the velocity/position update portion of the
+NPH integration.
+
      
+
      Regardless of what particles are in the fix group, a global pressure is
+computed for all particles.  Similarly, when the size of the simulation
+box is changed, all particles are re-scaled to new positions, unless the
+keyword dilate is specified with a value of partial, in which case
+only the particles in the fix group are re-scaled.  The latter can be
+useful for leaving the coordinates of particles in a solid substrate
+unchanged and controlling the pressure of a surrounding fluid.
+
      
+
      
+
+
      This fix computes a temperature and pressure each timestep.  To do
+this, the fix creates its own computes of style "temp/sphere" and
+"pressure", as if these commands had been issued:
+
      
+
      compute fix-ID_temp all temp/sphere
+compute fix-ID_press all pressure fix-ID_temp 
+
      
+
      See the compute temp/sphere and compute
+pressure commands for details.  Note that the
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
++ underscore + "press", and the group for the new computes is "all"
+since pressure is computed for the entire system.
+
      
+
      Note that these are NOT the computes used by thermodynamic output (see
+the thermo_style command) with ID = thermo_temp
+and thermo_press.  This means you can change the attributes of this
+fix's temperature or pressure via the
+compute_modify command or print this temperature
+or pressure during thermodynamic output via the thermo_style
+custom command using the appropriate compute-ID.
+It also means that changing attributes of thermo_temp or
+thermo_press will have no effect on this fix.
+
      
+
      Restart, fix_modify, output, run start/stop, minimize info:
+
      
+
      This fix writes the state of the Nose/Hoover barostat to binary
+restart files.  See the read_restart
+command for info on how to re-specify a fix in an input script that
+reads a restart file, so that the operation of the fix continues in an
+uninterrupted fashion.
+
      
+
      The fix_modify temp and press options are
+supported by this fix.  You can use them to assign a
+compute you have defined to this fix which will be used
+in its thermostatting or barostatting procedure.  If you do this, note
+that the kinetic energy derived from the compute temperature should be
+consistent with the virial term computed using all atoms for the
+pressure.  LAMMPS will warn you if you choose to compute temperature
+on a subset of atoms.
+
      
+
      The fix_modify energy option is supported by this
+fix to add the energy change induced by Nose/Hoover barostatting to
+the system's potential energy as part of thermodynamic
+output.
+
      
+
      This fix computes the same global scalar and global vector of
+quantities as does the fix nph command.
+
      
+
      This fix can ramp its target pressure over multiple runs, using the
+start and stop keywords of the run command.  See the
+run command for details of how to do this.
+
      
+
      This fix is not invoked during energy minimization.
+
      
+
      Restrictions:
+
      
+
      This fix requires that atoms store torque and angular velocity (omega)
+as defined by the atom_style.  It also require they
+store either a per-particle diameter or per-type shape.
+
      
+
      All particles in the group must be finite-size spheres.  They cannot
+be point particles, nor can they be aspherical.
+
      
+
      Related commands:
+
      
+
      fix nph, fix nve_sphere, fix
+nvt_sphere, fix npt_sphere,
+fix_modify
+
      
+
      Default: none
+
      
+
diff --git a/doc/fix_nph_sphere.txt b/doc/fix_nph_sphere.txt
new file mode 100755
index 0000000000..5e9d315772
--- /dev/null
+++ b/doc/fix_nph_sphere.txt
@@ -0,0 +1,124 @@
+"LAMMPS WWW Site"_lws - "LAMMPS Documentation"_ld - "LAMMPS Commands"_lc :c
+
+:link(lws,http://lammps.sandia.gov)
+:link(ld,Manual.html)
+:link(lc,Section_commands.html#comm)
+
+:line
+
+fix nph/sphere command :h3
+
+[Syntax:]
+
+fix ID group-ID nph/sphere args keyword value ... :pre
+
+ID, group-ID are documented in "fix"_fix.html command
+nph/sphere = style name of this fix command
+additional barostat related keyword/value pairs from the "fix nph"_fix_nh.html command can be appended :ul
+
+[Examples:]
+
+fix 1 all nph/sphere iso 0.0 0.0 1000.0
+fix 2 all nph/sphere x 5.0 5.0 1000.0
+fix 2 all nph/sphere x 5.0 5.0 1000.0 drag 0.2
+fix 2 water nph/sphere aniso 0.0 0.0 1000.0 dilate partial :pre
+
+[Description:]
+
+Perform constant NPH integration to update position, velocity, and
+angular velocity each timestep for extended spherical particles in the
+group using a Nose/Hoover pressure barostat.  P is pressure; H is
+enthalpy.  This creates a system trajectory consistent with the
+isenthalpic ensemble.
+
+This fix differs from the "fix nph"_fix_nh.html command, which assumes
+point particles and only updates their position and velocity.
+
+Additional parameters affecting the barostat are specified by keywords
+and values documented with the "fix nph"_fix_nh.html command.  See,
+for example, discussion of the {aniso}, and {dilate} keywords.
+
+The particles in the fix group are the only ones whose velocities and
+positions are updated by the velocity/position update portion of the
+NPH integration.
+
+Regardless of what particles are in the fix group, a global pressure is
+computed for all particles.  Similarly, when the size of the simulation
+box is changed, all particles are re-scaled to new positions, unless the
+keyword {dilate} is specified with a value of {partial}, in which case
+only the particles in the fix group are re-scaled.  The latter can be
+useful for leaving the coordinates of particles in a solid substrate
+unchanged and controlling the pressure of a surrounding fluid.
+
+:line
+
+This fix computes a temperature and pressure each timestep.  To do
+this, the fix creates its own computes of style "temp/sphere" and
+"pressure", as if these commands had been issued:
+
+compute fix-ID_temp all temp/sphere
+compute fix-ID_press all pressure fix-ID_temp :pre
+
+See the "compute temp/sphere"_compute_temp_sphere.html and "compute
+pressure"_compute_pressure.html commands for details.  Note that the
+IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
++ underscore + "press", and the group for the new computes is "all"
+since pressure is computed for the entire system.
+
+Note that these are NOT the computes used by thermodynamic output (see
+the "thermo_style"_thermo_style.html command) with ID = {thermo_temp}
+and {thermo_press}.  This means you can change the attributes of this
+fix's temperature or pressure via the
+"compute_modify"_compute_modify.html command or print this temperature
+or pressure during thermodynamic output via the "thermo_style
+custom"_thermo_style.html command using the appropriate compute-ID.
+It also means that changing attributes of {thermo_temp} or
+{thermo_press} will have no effect on this fix.
+
+[Restart, fix_modify, output, run start/stop, minimize info:]
+
+This fix writes the state of the Nose/Hoover barostat to "binary
+restart files"_restart.html.  See the "read_restart"_read_restart.html
+command for info on how to re-specify a fix in an input script that
+reads a restart file, so that the operation of the fix continues in an
+uninterrupted fashion.
+
+The "fix_modify"_fix_modify.html {temp} and {press} options are
+supported by this fix.  You can use them to assign a
+"compute"_compute.html you have defined to this fix which will be used
+in its thermostatting or barostatting procedure.  If you do this, note
+that the kinetic energy derived from the compute temperature should be
+consistent with the virial term computed using all atoms for the
+pressure.  LAMMPS will warn you if you choose to compute temperature
+on a subset of atoms.
+
+The "fix_modify"_fix_modify.html {energy} option is supported by this
+fix to add the energy change induced by Nose/Hoover barostatting to
+the system's potential energy as part of "thermodynamic
+output"_thermo_style.html.
+
+This fix computes the same global scalar and global vector of
+quantities as does the "fix nph"_fix_nh.html command.
+
+This fix can ramp its target pressure over multiple runs, using the
+{start} and {stop} keywords of the "run"_run.html command.  See the
+"run"_run.html command for details of how to do this.
+
+This fix is not invoked during "energy minimization"_minimize.html.
+
+[Restrictions:]
+
+This fix requires that atoms store torque and angular velocity (omega)
+as defined by the "atom_style"_atom_style.html.  It also require they
+store either a per-particle diameter or per-type "shape"_shape.html.
+
+All particles in the group must be finite-size spheres.  They cannot
+be point particles, nor can they be aspherical.
+
+[Related commands:]
+
+"fix nph"_fix_nh.html, "fix nve_sphere"_fix_nve_sphere.html, "fix
+nvt_sphere"_fix_nvt_sphere.html, "fix npt_sphere"_fix_npt_sphere.html,
+"fix_modify"_fix_modify.html
+
+[Default:] none
diff --git a/doc/fix_npt.html b/doc/fix_npt.html
deleted file mode 100644
index 245cb8a895..0000000000
--- a/doc/fix_npt.html
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
      LAMMPS WWW Site - LAMMPS Documentation - LAMMPS Commands 
-
      
-
-
-
-
-
-
-
      
-
-
      fix npt command 
-
      
-
      Syntax:
-
      
-
      fix ID group-ID npt Tstart Tstop Tdamp p-style args keyword value ... 
-
      
-
      • ID, group-ID are documented in fix command 
-
-
      • npt = style name of this fix command 
-
-
      • Tstart,Tstop = desired temperature at start/end of run (temperature units) 
-
-
      • Tdamp = temperature damping parameter (time units) 
-
-
      • p-style = xyz or xy or yz or xz or aniso 
-
-
          xyz args = Pstart Pstop Pdamp
-    Pstart,Pstop = desired pressure at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  xy or yz or xz or aniso args = Px_start Px_stop Py_start Py_stop Pz_start Pz_stop Pdamp
-    Px_start,Px_stop,... = desired pressure in x,y,z at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units) 
-
        
-
      • zero or more keyword/value pairs may be appended 
-
-
      • keyword = drag or dilate 
-
-
          drag value = drag factor added to barostat/thermostat (0.0 = no drag)
-  dilate value = all or partial 
-
        
-
-
      
-
      Examples:
-
      
-
      fix 1 all npt 300.0 300.0 100.0 xyz 0.0 0.0 1000.0
-fix 2 all npt 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0
-fix 2 all npt 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0 drag 0.2
-fix 2 water npt 300.0 300.0 100.0 aniso 0.0 0.0 0.0 0.0 NULL NULL 1000.0 dilate partial 
-
      
-
      Description:
-
      
-
      Perform constant NPT integration to update positions and velocities
-each timestep for atoms in the group using a Nose/Hoover temperature
-thermostat (Hoover1) and Nose/Hoover pressure barostat
-(Hoover2), implemented as described in
-(Melchionna).  P is pressure; T is temperature.  This
-creates a system trajectory consistent with the isothermal-isobaric
-ensemble.
-
      
-
      The thermostat is applied to only the translational degrees of freedom
-for the particles.  The translational degrees of freedom can also have
-a bias velocity removed from them before thermostatting takes place;
-see the description below.
-
      
-
      The desired temperature at each timestep is a ramped value during the
-run from Tstart to Tstop.  The Tdamp parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-units command).
-
      
-
      The atoms in the fix group are the only ones whose velocities and
-positions are updated by the velocity/position update portion of the
-NPT integration.
-
      
-
      Regardless of what atoms are in the fix group, a global pressure is
-computed for all atoms.  Similarly, when the size of the simulation
-box is changed, all atoms are re-scaled to new positions, unless the
-keyword dilate is specified with a value of partial, in which case
-only the atoms in the fix group are re-scaled.  The latter can be
-useful for leaving the coordinates of atoms in a solid substrate
-unchanged and controlling the pressure of a surrounding fluid.
-
      
-
      IMPORTANT NOTE: Unlike the fix
-temp/berendsen command which performs
-thermostatting but NO time integration, this fix performs
-thermostatting/barostatting AND time integration.  Thus you should not
-use any other time integration fix, such as fix nve on
-atoms to which this fix is applied.  Likewise, this fix should not
-normally be used on atoms that also have their temperature controlled
-by another fix - e.g. by fix langevin or fix
-temp/rescale commands.
-
      
-
      See this howto section of the manual for a
-discussion of different ways to compute temperature and perform
-thermostatting and barostatting.
-
      
-
      
-
-
      The pressure can be controlled in one of several styles, as specified
-by the p-style argument.  In each case, the desired pressure at each
-timestep is a ramped value during the run from the starting value to
-the end value.
-
      
-
      Style xyz means couple all dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the dimensions
-together.
-
      
-
      Styles xy or yz or xz means that the 2 specified dimensions are
-coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently, using its pressure component as the driving force.
-These styles cannot be used for a 2d simulation.
-
      
-
      For style aniso, all dimensions dilate/contract independently using
-their individual pressure components as the driving forces.
-
      
-
      For any of the styles except xyz, any of the independent pressure
-components (e.g. z in xy, or any dimension in aniso) can have
-their target pressures (both start and stop values) specified as NULL.
-This means that no pressure control is applied to that dimension so
-that the box dimension remains unchanged.  For a 2d simulation the z
-pressure components must be specified as NULL when using style
-aniso.
-
      
-
      For styles xy and yz and xz, the starting and stopping pressures
-must be the same for the two coupled dimensions and cannot be
-specified as NULL.
-
      
-
      In some cases (e.g. for solids) the pressure (volume) and/or
-temperature of the system can oscillate undesirably when a Nose/Hoover
-barostat and thermostat is applied.  The optional drag keyword will
-damp these oscillations, although it alters the Nose/Hoover equations.
-A value of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.
-A non-zero value adds a drag term; the larger the value specified, the
-greater the damping effect.  Performing a short run and monitoring the
-pressure and temperature is the best way to determine if the drag term
-is working.  Typically a value between 0.2 to 2.0 is sufficient to
-damp oscillations after a few periods.
-
      
-
      For all pressure styles, the simulation box stays rectangular in
-shape.  Parinello-Rahman boundary condition for tilted boxes
-(triclinic symmetry) are supported by other LAMMPS commands (see this
-section of the manual), but not yet by this
-command.
-
      
-
      For all styles, the Pdamp parameter operates like the Tdamp
-parameter, determining the time scale on which pressure is relaxed.
-For example, a value of 1000.0 means to relax the pressure in a
-timespan of (roughly) 1000 time units (tau or fmsec or psec - see the
-units command).
-
      
-
      
-
-
      This fix computes a temperature and pressure each timestep.  To do
-this, the fix creates its own computes of style "temp" and "pressure",
-as if these commands had been issued:
-
      
-
      compute fix-ID_temp group-ID temp
-compute fix-ID_press group-ID pressure fix-ID_temp 
-
      
-
      See the compute temp and compute
-pressure commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
-+ underscore + "press", and the group for the new computes is the same
-as the fix group.
-
      
-
      Note that these are NOT the computes used by thermodynamic output (see
-the thermo_style command) with ID = thermo_temp
-and thermo_press.  This means you can change the attributes of this
-fix's temperature or pressure via the
-compute_modify command or print this temperature
-or pressure during thermodynamic output via the thermo_style
-custom command using the appropriate compute-ID.
-It also means that changing attributes of thermo_temp or
-thermo_press will have no effect on this fix.
-
      
-
      Like other fixes that perform thermostatting, this fix can be used
-with compute commands that calculate a temperature
-after removing a "bias" from the atom velocities.  E.g. removing the
-center-of-mass velocity from a group of atoms or only calculating
-temperature on the x-component of velocity or only calculating
-temperature for atoms in a geometric region.  This is not done by
-default, but only if the fix_modify command is used
-to assign a temperature compute to this fix that includes such a bias
-term.  See the doc pages for individual compute
-commands to determine which ones include a bias.  In
-this case, the thermostat works in the following manner: the current
-temperature is calculated taking the bias into account, bias is
-removed from each atom, thermostatting is performed on the remaining
-thermal degrees of freedom, and the bias is added back in.
-
      
-
      Restart, fix_modify, output, run start/stop, minimize info:
-
      
-
      This fix writes the state of the Nose/Hoover thermostat and barostat
-to binary restart files.  See the
-read_restart command for info on how to re-specify
-a fix in an input script that reads a restart file, so that the
-operation of the fix continues in an uninterrupted fashion.
-
      
-
      The fix_modify temp and press options are
-supported by this fix.  You can use them to assign a
-compute you have defined to this fix which will be used
-in its thermostatting or barostatting procedure, as described above.
-If you do this, note that the kinetic energy derived from the compute
-temperature should be consistent with the virial term computed using
-all atoms for the pressure.  LAMMPS will warn you if you choose to
-compute temperature on a subset of atoms.
-
      
-
      IMPORTANT NOTE: If both the temp and press keywords are used in a
-single thermo_modify command (or in two separate commands), then the
-order in which the keywords are specified is important.  Note that a
-pressure compute defines its own temperature
-compute as an argument when it is specified.  The temp keyword will
-override this (for the pressure compute being used by fix npt), but
-only if the temp keyword comes after the press keyword.  If the
-temp keyword comes before the press keyword, then the new pressure
-compute specified by the press keyword will be unaffected by the
-temp setting.
-
      
-
      The fix_modify energy option is supported by this
-fix to add the energy change induced by Nose/Hoover thermostatting and
-barostatting to the system's potential energy as part of
-thermodynamic output.
-
      
-
      The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".
-
      
-
      This fix can ramp its target temperature and pressure over multiple
-runs, using the start and stop keywords of the run
-command.  See the run command for details of how to do
-this.
-
      
-
      This fix is not invoked during energy minimization.
-
      
-
      Restrictions:
-
      
-
      Any dimension being adjusted by this fix must be periodic.  A
-dimension whose target pressures are specified as NULL can be
-non-periodic or periodic.
-
      
-
      The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
      
-
      Related commands:
-
      
-
      fix nve, fix nvt, fix nph,
-fix_modify
-
      
-
      Default:
-
      
-
      The keyword defaults are drag = 0.0 and dilate = all.
-
      
-
      
-
-
-
-
      (Hoover1) Hoover, Phys Rev A, 31, 1695 (1985).
-
      
-
-
-
      (Hoover2) Hoover, Phys Rev A, 34, 2499 (1986).
-
      
-
-
-
      (Melchionna) Melchionna, Ciccotti, Holian, Molecular Physics, 78,
-533-44 (1993).
-
      
-
diff --git a/doc/fix_npt.txt b/doc/fix_npt.txt
deleted file mode 100644
index 81bd495baf..0000000000
--- a/doc/fix_npt.txt
+++ /dev/null
@@ -1,257 +0,0 @@
-"LAMMPS WWW Site"_lws - "LAMMPS Documentation"_ld - "LAMMPS Commands"_lc :c
-
-:link(lws,http://lammps.sandia.gov)
-:link(ld,Manual.html)
-:link(lc,Section_commands.html#comm)
-
-:line
-
-fix npt command :h3
-
-[Syntax:]
-
-fix ID group-ID npt Tstart Tstop Tdamp p-style args keyword value ... :pre
-
-ID, group-ID are documented in "fix"_fix.html command :ulb,l
-npt = style name of this fix command :l
-Tstart,Tstop = desired temperature at start/end of run (temperature units) :l
-Tdamp = temperature damping parameter (time units) :l
-p-style = {xyz} or {xy} or {yz} or {xz} or {aniso} :l
-  {xyz} args = Pstart Pstop Pdamp
-    Pstart,Pstop = desired pressure at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  {xy} or {yz} or {xz} or {aniso} args = Px_start Px_stop Py_start Py_stop Pz_start Pz_stop Pdamp
-    Px_start,Px_stop,... = desired pressure in x,y,z at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units) :pre
-
-zero or more keyword/value pairs may be appended :l
-keyword = {drag} or {dilate} :l
-  {drag} value = drag factor added to barostat/thermostat (0.0 = no drag)
-  {dilate} value = {all} or {partial} :pre
-:ule
-
-[Examples:]
-
-fix 1 all npt 300.0 300.0 100.0 xyz 0.0 0.0 1000.0
-fix 2 all npt 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0
-fix 2 all npt 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0 drag 0.2
-fix 2 water npt 300.0 300.0 100.0 aniso 0.0 0.0 0.0 0.0 NULL NULL 1000.0 dilate partial :pre
-
-[Description:]
-
-Perform constant NPT integration to update positions and velocities
-each timestep for atoms in the group using a Nose/Hoover temperature
-thermostat "(Hoover1)"_#Hoover1 and Nose/Hoover pressure barostat
-"(Hoover2)"_#Hoover2, implemented as described in
-"(Melchionna)"_#Melchionna.  P is pressure; T is temperature.  This
-creates a system trajectory consistent with the isothermal-isobaric
-ensemble.
-
-The thermostat is applied to only the translational degrees of freedom
-for the particles.  The translational degrees of freedom can also have
-a bias velocity removed from them before thermostatting takes place;
-see the description below.
-
-The desired temperature at each timestep is a ramped value during the
-run from {Tstart} to {Tstop}.  The {Tdamp} parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-"units"_units.html command).
-
-The atoms in the fix group are the only ones whose velocities and
-positions are updated by the velocity/position update portion of the
-NPT integration.
-
-Regardless of what atoms are in the fix group, a global pressure is
-computed for all atoms.  Similarly, when the size of the simulation
-box is changed, all atoms are re-scaled to new positions, unless the
-keyword {dilate} is specified with a value of {partial}, in which case
-only the atoms in the fix group are re-scaled.  The latter can be
-useful for leaving the coordinates of atoms in a solid substrate
-unchanged and controlling the pressure of a surrounding fluid.
-
-IMPORTANT NOTE: Unlike the "fix
-temp/berendsen"_fix_temp_berendsen.html command which performs
-thermostatting but NO time integration, this fix performs
-thermostatting/barostatting AND time integration.  Thus you should not
-use any other time integration fix, such as "fix nve"_fix_nve.html on
-atoms to which this fix is applied.  Likewise, this fix should not
-normally be used on atoms that also have their temperature controlled
-by another fix - e.g. by "fix langevin"_fix_nvt.html or "fix
-temp/rescale"_fix_temp_rescale.html commands.
-
-See "this howto section"_Section_howto.html#4_16 of the manual for a
-discussion of different ways to compute temperature and perform
-thermostatting and barostatting.
-
-:line
-
-The pressure can be controlled in one of several styles, as specified
-by the {p-style} argument.  In each case, the desired pressure at each
-timestep is a ramped value during the run from the starting value to
-the end value.
-
-Style {xyz} means couple all dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the dimensions
-together.
-
-Styles {xy} or {yz} or {xz} means that the 2 specified dimensions are
-coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently, using its pressure component as the driving force.
-These styles cannot be used for a 2d simulation.
-
-For style {aniso}, all dimensions dilate/contract independently using
-their individual pressure components as the driving forces.
-
-For any of the styles except {xyz}, any of the independent pressure
-components (e.g. z in {xy}, or any dimension in {aniso}) can have
-their target pressures (both start and stop values) specified as NULL.
-This means that no pressure control is applied to that dimension so
-that the box dimension remains unchanged.  For a 2d simulation the z
-pressure components must be specified as NULL when using style
-{aniso}.
-
-For styles {xy} and {yz} and {xz}, the starting and stopping pressures
-must be the same for the two coupled dimensions and cannot be
-specified as NULL.
-
-In some cases (e.g. for solids) the pressure (volume) and/or
-temperature of the system can oscillate undesirably when a Nose/Hoover
-barostat and thermostat is applied.  The optional {drag} keyword will
-damp these oscillations, although it alters the Nose/Hoover equations.
-A value of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.
-A non-zero value adds a drag term; the larger the value specified, the
-greater the damping effect.  Performing a short run and monitoring the
-pressure and temperature is the best way to determine if the drag term
-is working.  Typically a value between 0.2 to 2.0 is sufficient to
-damp oscillations after a few periods.
-
-For all pressure styles, the simulation box stays rectangular in
-shape.  Parinello-Rahman boundary condition for tilted boxes
-(triclinic symmetry) are supported by other LAMMPS commands (see "this
-section"_Section_howto.html#4_12 of the manual), but not yet by this
-command.
-
-For all styles, the {Pdamp} parameter operates like the {Tdamp}
-parameter, determining the time scale on which pressure is relaxed.
-For example, a value of 1000.0 means to relax the pressure in a
-timespan of (roughly) 1000 time units (tau or fmsec or psec - see the
-"units"_units.html command).
-
-:line
-
-This fix computes a temperature and pressure each timestep.  To do
-this, the fix creates its own computes of style "temp" and "pressure",
-as if these commands had been issued:
-
-compute fix-ID_temp group-ID temp
-compute fix-ID_press group-ID pressure fix-ID_temp :pre
-
-See the "compute temp"_compute_temp.html and "compute
-pressure"_compute_pressure.html commands for details.  Note that the
-IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
-+ underscore + "press", and the group for the new computes is the same
-as the fix group.
-
-Note that these are NOT the computes used by thermodynamic output (see
-the "thermo_style"_thermo_style.html command) with ID = {thermo_temp}
-and {thermo_press}.  This means you can change the attributes of this
-fix's temperature or pressure via the
-"compute_modify"_compute_modify.html command or print this temperature
-or pressure during thermodynamic output via the "thermo_style
-custom"_thermo_style.html command using the appropriate compute-ID.
-It also means that changing attributes of {thermo_temp} or
-{thermo_press} will have no effect on this fix.
-
-Like other fixes that perform thermostatting, this fix can be used
-with "compute commands"_compute.html that calculate a temperature
-after removing a "bias" from the atom velocities.  E.g. removing the
-center-of-mass velocity from a group of atoms or only calculating
-temperature on the x-component of velocity or only calculating
-temperature for atoms in a geometric region.  This is not done by
-default, but only if the "fix_modify"_fix_modify.html command is used
-to assign a temperature compute to this fix that includes such a bias
-term.  See the doc pages for individual "compute
-commands"_compute.html to determine which ones include a bias.  In
-this case, the thermostat works in the following manner: the current
-temperature is calculated taking the bias into account, bias is
-removed from each atom, thermostatting is performed on the remaining
-thermal degrees of freedom, and the bias is added back in.
-
-[Restart, fix_modify, output, run start/stop, minimize info:]
-
-This fix writes the state of the Nose/Hoover thermostat and barostat
-to "binary restart files"_restart.html.  See the
-"read_restart"_read_restart.html command for info on how to re-specify
-a fix in an input script that reads a restart file, so that the
-operation of the fix continues in an uninterrupted fashion.
-
-The "fix_modify"_fix_modify.html {temp} and {press} options are
-supported by this fix.  You can use them to assign a
-"compute"_compute.html you have defined to this fix which will be used
-in its thermostatting or barostatting procedure, as described above.
-If you do this, note that the kinetic energy derived from the compute
-temperature should be consistent with the virial term computed using
-all atoms for the pressure.  LAMMPS will warn you if you choose to
-compute temperature on a subset of atoms.
-
-IMPORTANT NOTE: If both the {temp} and {press} keywords are used in a
-single thermo_modify command (or in two separate commands), then the
-order in which the keywords are specified is important.  Note that a
-"pressure compute"_compute_pressure.html defines its own temperature
-compute as an argument when it is specified.  The {temp} keyword will
-override this (for the pressure compute being used by fix npt), but
-only if the {temp} keyword comes after the {press} keyword.  If the
-{temp} keyword comes before the {press} keyword, then the new pressure
-compute specified by the {press} keyword will be unaffected by the
-{temp} setting.
-
-The "fix_modify"_fix_modify.html {energy} option is supported by this
-fix to add the energy change induced by Nose/Hoover thermostatting and
-barostatting to the system's potential energy as part of
-"thermodynamic output"_thermo_style.html.
-
-The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".
-
-This fix can ramp its target temperature and pressure over multiple
-runs, using the {start} and {stop} keywords of the "run"_run.html
-command.  See the "run"_run.html command for details of how to do
-this.
-
-This fix is not invoked during "energy minimization"_minimize.html.
-
-[Restrictions:]
-
-Any dimension being adjusted by this fix must be periodic.  A
-dimension whose target pressures are specified as NULL can be
-non-periodic or periodic.
-
-The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
-[Related commands:]
-
-"fix nve"_fix_nve.html, "fix nvt"_fix_nvt.html, "fix nph"_fix_nph.html,
-"fix_modify"_fix_modify.html
-
-[Default:]
-
-The keyword defaults are drag = 0.0 and dilate = all.
-
-:line
-
-:link(Hoover1)
-[(Hoover1)] Hoover, Phys Rev A, 31, 1695 (1985).
-
-:link(Hoover2)
-[(Hoover2)] Hoover, Phys Rev A, 34, 2499 (1986).
-
-:link(Melchionna)
-[(Melchionna)] Melchionna, Ciccotti, Holian, Molecular Physics, 78,
-533-44 (1993).
diff --git a/doc/fix_npt_asphere.html b/doc/fix_npt_asphere.html
index 433857642e..b591f626ad 100644
--- a/doc/fix_npt_asphere.html
+++ b/doc/fix_npt_asphere.html
@@ -13,40 +13,18 @@
 
 
      Syntax:
 
      
-
      fix ID group-ID npt/asphere Tstart Tstop Tdamp p-style args keyword value ... 
+
      fix ID group-ID npt/asphere keyword value ... 
 
      
-
      • ID, group-ID are documented in fix command 
-
-
      • npt/asphere = style name of this fix command 
-
-
      • Tstart,Tstop = desired temperature at start/end of run 
-
-
      • Tdamp = temperature damping parameter (time units) 
-
-
      • p-style = xyz or xy or yz or xz or aniso 
-
-
          xyz args = Pstart Pstop Pdamp
-    Pstart,Pstop = desired pressure at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  xy or yz or xz or aniso args = Px_start Px_stop Py_start Py_stop Pz_start Pz_stop Pdamp
-    Px_start,Px_stop,... = desired pressure in x,y,z at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units) 
-
        
-
      • zero or more keyword/value pairs may be appended 
-
-
      • keyword = drag or dilate 
-
-
          drag value = drag factor added to barostat/thermostat (0.0 = no drag)
-  dilate value = all or partial 
-
        
-
+
        • ID, group-ID are documented in fix command
+
        • npt/asphere = style name of this fix command
+
        • additional thermostat and barostat related keyword/value pairs from the fix npt command can be appended 
 
        
 
        Examples:
 
        
-
        fix 1 all npt/asphere 300.0 300.0 100.0 xyz 0.0 0.0 1000.0
-fix 2 all npt/asphere 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0
-fix 2 all npt/asphere 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0 drag 0.2
-fix 2 water npt/asphere 300.0 300.0 100.0 aniso 0.0 0.0 0.0 0.0 NULL NULL 1000.0 dilate partial 
+
        fix 1 all npt/asphere temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
+fix 2 all npt/asphere temp 300.0 300.0 100.0 x 5.0 5.0 1000.0
+fix 2 all npt/asphere temp 300.0 300.0 100.0 x 5.0 5.0 1000.0 drag 0.2
+fix 2 water npt/asphere temp 300.0 300.0 100.0 aniso 0.0 0.0 1000.0 dilate partial 
 
        
 
        Description:
 
        
@@ -57,6 +35,9 @@ thermostat and Nose/Hoover pressure barostat.  P is pressure; T is
 temperature.  This creates a system trajectory consistent with the
 isothermal-isobaric ensemble.
 
        
+
        This fix differs from the fix npt command, which
+assumes point particles and only updates their position and velocity.
+
        
 
        The thermostat is applied to both the translational and rotational
 degrees of freedom for the aspherical particles, assuming a compute is
 used which calculates a temperature that includes the rotational
@@ -64,12 +45,10 @@ degrees of freedom (see below).  The translational degrees of freedom
 can also have a bias velocity removed from them before thermostatting
 takes place; see the description below.
 
        
-
        The desired temperature at each timestep is a ramped value during the
-run from Tstart to Tstop.  The Tdamp parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-units command).
+
        Additional parameters affecting the thermostat and barostat are
+specified by keywords and values documented with the fix
+npt command.  See, for example, discussion of the temp,
+iso, aniso, and dilate keywords.
 
        
 
        The particles in the fix group are the only ones whose velocities and
 positions are updated by the velocity/position update portion of the
@@ -85,71 +64,18 @@ unchanged and controlling the pressure of a surrounding fluid.
 
        
 
        
 
-
        The pressure can be controlled in one of several styles, as specified
-by the p-style argument.  In each case, the desired pressure at each
-timestep is a ramped value during the run from the starting value to
-the end value.
-
        
-
        Style xyz means couple all dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the dimensions
-together.
-
        
-
        Styles xy or yz or xz means that the 2 specified dimensions are
-coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently, using its pressure component as the driving force.
-These styles cannot be used for a 2d simulation.
-
        
-
        For style aniso, all dimensions dilate/contract independently using
-their individual pressure components as the driving forces.
-
        
-
        For any of the styles except xyz, any of the independent pressure
-components (e.g. z in xy, or any dimension in aniso) can have
-their target pressures (both start and stop values) specified as NULL.
-This means that no pressure control is applied to that dimension so
-that the box dimension remains unchanged.  For a 2d simulation the z
-pressure components must be specified as NULL when using style
-aniso.
-
        
-
        For styles xy and yz and xz, the starting and stopping pressures
-must be the same for the two coupled dimensions and cannot be
-specified as NULL.
-
        
-
        In some cases (e.g. for solids) the pressure (volume) and/or
-temperature of the system can oscillate undesirably when a Nose/Hoover
-barostat and thermostat is applied.  The optional drag keyword will
-damp these oscillations, although it alters the Nose/Hoover equations.
-A value of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.
-A non-zero value adds a drag term; the larger the value specified, the
-greater the damping effect.  Performing a short run and monitoring the
-pressure and temperature is the best way to determine if the drag term
-is working.  Typically a value between 0.2 to 2.0 is sufficient to
-damp oscillations after a few periods.
-
        
-
        For all pressure styles, the simulation box stays rectangular in
-shape.  Parinello-Rahman boundary conditions (tilted box) are not yet
-implemented in LAMMPS.
-
        
-
        For all styles, the Pdamp parameter operates like the Tdamp
-parameter, determining the time scale on which pressure is relaxed.
-For example, a value of 1000.0 means to relax the pressure in a
-timespan of (roughly) 1000 time units (tau or fmsec or psec - see the
-units command).
-
        
-
        
-
 
        This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp/asphere" and 
 "pressure", as if these commands had been issued:
 
        
-
        compute fix-ID_temp group-ID temp/asphere
-compute fix-ID_press group-ID pressure fix-ID_temp 
+
        compute fix-ID_temp all temp/asphere
+compute fix-ID_press all pressure fix-ID_temp 
 
        
 
        See the compute temp/asphere and compute
 pressure commands for details.  Note that the
 IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
-+ underscore + "press", and the group for the new computes is the same
-as the fix group.
++ underscore + "press", and the group for the new computes is "all"
+since pressure is computed for the entire system.
 
        
 
        Note that these are NOT the computes used by thermodynamic output (see
 the thermo_style command) with ID = thermo_temp
@@ -198,10 +124,8 @@ fix to add the energy change induced by Nose/Hoover thermostatting and
 barostatting to the system's potential energy as part of
 thermodynamic output.
 
        
-
        The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".
+
        This fix computes the same global scalar and global vector of
+quantities as does the fix npt command.
 
        
 
        This fix can ramp its target temperature and pressure over multiple
 runs, using the start and stop keywords of the run
@@ -225,21 +149,11 @@ diameter or per-particle mass.
 
        All particles in the group must be finite-size.  They cannot be point
 particles, but they can be aspherical or spherical.
 
        
-
        Any dimension being adjusted by this fix must be periodic.  A
-dimension whose target pressures are specified as NULL can be
-non-periodic or periodic.
-
        
-
        The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
        
 
        Related commands:
 
        
-
        fix npt, fix nve_asphere, fix
-npt_asphere, fix_modify
+
        fix npt, fix nve_asphere, fix
+nvt_asphere, fix_modify
 
        
-
        Default:
-
        
-
        The keyword defaults are drag = 0.0 and dilate = all.
+
        Default: none
 
        
 
diff --git a/doc/fix_npt_asphere.txt b/doc/fix_npt_asphere.txt
index 2018dbd6d7..d6dc39461c 100755
--- a/doc/fix_npt_asphere.txt
+++ b/doc/fix_npt_asphere.txt
@@ -10,32 +10,18 @@ fix npt/asphere command :h3
 
 [Syntax:]
 
-fix ID group-ID npt/asphere Tstart Tstop Tdamp p-style args keyword value ... :pre
+fix ID group-ID npt/asphere keyword value ... :pre
 
-ID, group-ID are documented in "fix"_fix.html command :ulb,l
-npt/asphere = style name of this fix command :l
-Tstart,Tstop = desired temperature at start/end of run :l
-Tdamp = temperature damping parameter (time units) :l
-p-style = {xyz} or {xy} or {yz} or {xz} or {aniso} :l
-  {xyz} args = Pstart Pstop Pdamp
-    Pstart,Pstop = desired pressure at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  {xy} or {yz} or {xz} or {aniso} args = Px_start Px_stop Py_start Py_stop Pz_start Pz_stop Pdamp
-    Px_start,Px_stop,... = desired pressure in x,y,z at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units) :pre
-
-zero or more keyword/value pairs may be appended :l
-keyword = {drag} or {dilate} :l
-  {drag} value = drag factor added to barostat/thermostat (0.0 = no drag)
-  {dilate} value = {all} or {partial} :pre
-:ule
+ID, group-ID are documented in "fix"_fix.html command
+npt/asphere = style name of this fix command
+additional thermostat and barostat related keyword/value pairs from the "fix npt"_fix_nh.html command can be appended :ul
 
 [Examples:]
 
-fix 1 all npt/asphere 300.0 300.0 100.0 xyz 0.0 0.0 1000.0
-fix 2 all npt/asphere 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0
-fix 2 all npt/asphere 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0 drag 0.2
-fix 2 water npt/asphere 300.0 300.0 100.0 aniso 0.0 0.0 0.0 0.0 NULL NULL 1000.0 dilate partial :pre
+fix 1 all npt/asphere temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
+fix 2 all npt/asphere temp 300.0 300.0 100.0 x 5.0 5.0 1000.0
+fix 2 all npt/asphere temp 300.0 300.0 100.0 x 5.0 5.0 1000.0 drag 0.2
+fix 2 water npt/asphere temp 300.0 300.0 100.0 aniso 0.0 0.0 1000.0 dilate partial :pre
 
 [Description:]
 
@@ -46,6 +32,9 @@ thermostat and Nose/Hoover pressure barostat.  P is pressure; T is
 temperature.  This creates a system trajectory consistent with the
 isothermal-isobaric ensemble.
 
+This fix differs from the "fix npt"_fix_nh.html command, which
+assumes point particles and only updates their position and velocity.
+
 The thermostat is applied to both the translational and rotational
 degrees of freedom for the aspherical particles, assuming a compute is
 used which calculates a temperature that includes the rotational
@@ -53,12 +42,10 @@ degrees of freedom (see below).  The translational degrees of freedom
 can also have a bias velocity removed from them before thermostatting
 takes place; see the description below.
 
-The desired temperature at each timestep is a ramped value during the
-run from {Tstart} to {Tstop}.  The {Tdamp} parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-"units"_units.html command).
+Additional parameters affecting the thermostat and barostat are
+specified by keywords and values documented with the "fix
+npt"_fix_nh.html command.  See, for example, discussion of the {temp},
+{iso}, {aniso}, and {dilate} keywords.
 
 The particles in the fix group are the only ones whose velocities and
 positions are updated by the velocity/position update portion of the
@@ -74,71 +61,18 @@ unchanged and controlling the pressure of a surrounding fluid.
 
 :line
 
-The pressure can be controlled in one of several styles, as specified
-by the {p-style} argument.  In each case, the desired pressure at each
-timestep is a ramped value during the run from the starting value to
-the end value.
-
-Style {xyz} means couple all dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the dimensions
-together.
-
-Styles {xy} or {yz} or {xz} means that the 2 specified dimensions are
-coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently, using its pressure component as the driving force.
-These styles cannot be used for a 2d simulation.
-
-For style {aniso}, all dimensions dilate/contract independently using
-their individual pressure components as the driving forces.
-
-For any of the styles except {xyz}, any of the independent pressure
-components (e.g. z in {xy}, or any dimension in {aniso}) can have
-their target pressures (both start and stop values) specified as NULL.
-This means that no pressure control is applied to that dimension so
-that the box dimension remains unchanged.  For a 2d simulation the z
-pressure components must be specified as NULL when using style
-{aniso}.
-
-For styles {xy} and {yz} and {xz}, the starting and stopping pressures
-must be the same for the two coupled dimensions and cannot be
-specified as NULL.
-
-In some cases (e.g. for solids) the pressure (volume) and/or
-temperature of the system can oscillate undesirably when a Nose/Hoover
-barostat and thermostat is applied.  The optional {drag} keyword will
-damp these oscillations, although it alters the Nose/Hoover equations.
-A value of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.
-A non-zero value adds a drag term; the larger the value specified, the
-greater the damping effect.  Performing a short run and monitoring the
-pressure and temperature is the best way to determine if the drag term
-is working.  Typically a value between 0.2 to 2.0 is sufficient to
-damp oscillations after a few periods.
-
-For all pressure styles, the simulation box stays rectangular in
-shape.  Parinello-Rahman boundary conditions (tilted box) are not yet
-implemented in LAMMPS.
-
-For all styles, the {Pdamp} parameter operates like the {Tdamp}
-parameter, determining the time scale on which pressure is relaxed.
-For example, a value of 1000.0 means to relax the pressure in a
-timespan of (roughly) 1000 time units (tau or fmsec or psec - see the
-"units"_units.html command).
-
-:line
-
 This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp/asphere" and 
 "pressure", as if these commands had been issued:
 
-compute fix-ID_temp group-ID temp/asphere
-compute fix-ID_press group-ID pressure fix-ID_temp :pre
+compute fix-ID_temp all temp/asphere
+compute fix-ID_press all pressure fix-ID_temp :pre
 
 See the "compute temp/asphere"_compute_temp_asphere.html and "compute
 pressure"_compute_pressure.html commands for details.  Note that the
 IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
-+ underscore + "press", and the group for the new computes is the same
-as the fix group.
++ underscore + "press", and the group for the new computes is "all"
+since pressure is computed for the entire system.
 
 Note that these are NOT the computes used by thermodynamic output (see
 the "thermo_style"_thermo_style.html command) with ID = {thermo_temp}
@@ -187,10 +121,8 @@ fix to add the energy change induced by Nose/Hoover thermostatting and
 barostatting to the system's potential energy as part of
 "thermodynamic output"_thermo_style.html.
 
-The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".
+This fix computes the same global scalar and global vector of
+quantities as does the "fix npt"_fix_nh.html command.
 
 This fix can ramp its target temperature and pressure over multiple
 runs, using the {start} and {stop} keywords of the "run"_run.html
@@ -214,19 +146,9 @@ diameter or per-particle mass.
 All particles in the group must be finite-size.  They cannot be point
 particles, but they can be aspherical or spherical.
 
-Any dimension being adjusted by this fix must be periodic.  A
-dimension whose target pressures are specified as NULL can be
-non-periodic or periodic.
-
-The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
 [Related commands:]
 
-"fix npt"_fix_npt.html, "fix nve_asphere"_fix_nve_asphere.html, "fix
-npt_asphere"_fix_npt_asphere.html, "fix_modify"_fix_modify.html
+"fix npt"_fix_nh.html, "fix nve_asphere"_fix_nve_asphere.html, "fix
+nvt_asphere"_fix_nvt_asphere.html, "fix_modify"_fix_modify.html
 
-[Default:]
-
-The keyword defaults are drag = 0.0 and dilate = all.
+[Default:] none
diff --git a/doc/fix_npt_sphere.html b/doc/fix_npt_sphere.html
index cd5c9edc67..bf96296aa9 100644
--- a/doc/fix_npt_sphere.html
+++ b/doc/fix_npt_sphere.html
@@ -13,40 +13,18 @@
 
 
        Syntax:
 
        
-
        fix ID group-ID npt/sphere Tstart Tstop Tdamp p-style args keyword value ... 
+
        fix ID group-ID npt/sphere keyword value ... 
 
        
-
        • ID, group-ID are documented in fix command 
-
-
        • npt/sphere = style name of this fix command 
-
-
        • Tstart,Tstop = desired temperature at start/end of run 
-
-
        • Tdamp = temperature damping parameter (time units) 
-
-
        • p-style = xyz or xy or yz or xz or aniso 
-
-
            xyz args = Pstart Pstop Pdamp
-    Pstart,Pstop = desired pressure at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  xy or yz or xz or aniso args = Px_start Px_stop Py_start Py_stop Pz_start Pz_stop Pdamp
-    Px_start,Px_stop,... = desired pressure in x,y,z at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units) 
-
          
-
        • zero or more keyword/value pairs may be appended 
-
-
        • keyword = drag or dilate 
-
-
            drag value = drag factor added to barostat/thermostat (0.0 = no drag)
-  dilate value = all or partial 
-
          
-
+
          • ID, group-ID are documented in fix command
+
          • npt/sphere = style name of this fix command
+
          • additional thermostat and barostat related keyword/value pairs from the fix npt command can be appended 
 
          
 
          Examples:
 
          
-
          fix 1 all npt/sphere 300.0 300.0 100.0 xyz 0.0 0.0 1000.0
-fix 2 all npt/sphere 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0
-fix 2 all npt/sphere 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0 drag 0.2
-fix 2 water npt/sphere 300.0 300.0 100.0 aniso 0.0 0.0 0.0 0.0 NULL NULL 1000.0 dilate partial 
+
          fix 1 all npt/sphere temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
+fix 2 all npt/sphere temp 300.0 300.0 100.0 x 5.0 5.0 1000.0
+fix 2 all npt/sphere temp 300.0 300.0 100.0 x 5.0 5.0 1000.0 drag 0.2
+fix 2 water npt/sphere temp 300.0 300.0 100.0 aniso 0.0 0.0 1000.0 dilate partial 
 
          
 
          Description:
 
          
@@ -56,7 +34,7 @@ group using a Nose/Hoover temperature thermostat and Nose/Hoover
 pressure barostat.  P is pressure; T is temperature.  This creates a
 system trajectory consistent with the isothermal-isobaric ensemble.
 
          
-
          This fix differs from the fix npt command, which
+
          This fix differs from the fix npt command, which
 assumes point particles and only updates their position and velocity.
 
          
 
          The thermostat is applied to both the translational and rotational
@@ -66,12 +44,10 @@ degrees of freedom (see below).  The translational degrees of freedom
 can also have a bias velocity removed from them before thermostatting
 takes place; see the description below.
 
          
-
          The desired temperature at each timestep is a ramped value during the
-run from Tstart to Tstop.  The Tdamp parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-units command).
+
          Additional parameters affecting the thermostat and barostat are
+specified by keywords and values documented with the fix
+npt command.  See, for example, discussion of the temp,
+iso, aniso, and dilate keywords.
 
          
 
          The particles in the fix group are the only ones whose velocities and
 positions are updated by the velocity/position update portion of the
@@ -87,71 +63,18 @@ unchanged and controlling the pressure of a surrounding fluid.
 
          
 
          
 
-
          The pressure can be controlled in one of several styles, as specified
-by the p-style argument.  In each case, the desired pressure at each
-timestep is a ramped value during the run from the starting value to
-the end value.
-
          
-
          Style xyz means couple all dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the dimensions
-together.
-
          
-
          Styles xy or yz or xz means that the 2 specified dimensions are
-coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently, using its pressure component as the driving force.
-These styles cannot be used for a 2d simulation.
-
          
-
          For style aniso, all dimensions dilate/contract independently using
-their individual pressure components as the driving forces.
-
          
-
          For any of the styles except xyz, any of the independent pressure
-components (e.g. z in xy, or any dimension in aniso) can have
-their target pressures (both start and stop values) specified as NULL.
-This means that no pressure control is applied to that dimension so
-that the box dimension remains unchanged.  For a 2d simulation the z
-pressure components must be specified as NULL when using style
-aniso.
-
          
-
          For styles xy and yz and xz, the starting and stopping pressures
-must be the same for the two coupled dimensions and cannot be
-specified as NULL.
-
          
-
          In some cases (e.g. for solids) the pressure (volume) and/or
-temperature of the system can oscillate undesirably when a Nose/Hoover
-barostat and thermostat is applied.  The optional drag keyword will
-damp these oscillations, although it alters the Nose/Hoover equations.
-A value of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.
-A non-zero value adds a drag term; the larger the value specified, the
-greater the damping effect.  Performing a short run and monitoring the
-pressure and temperature is the best way to determine if the drag term
-is working.  Typically a value between 0.2 to 2.0 is sufficient to
-damp oscillations after a few periods.
-
          
-
          For all pressure styles, the simulation box stays rectangular in
-shape.  Parinello-Rahman boundary conditions (tilted box) are not yet
-implemented in LAMMPS.
-
          
-
          For all styles, the Pdamp parameter operates like the Tdamp
-parameter, determining the time scale on which pressure is relaxed.
-For example, a value of 1000.0 means to relax the pressure in a
-timespan of (roughly) 1000 time units (tau or fmsec or psec - see the
-units command).
-
          
-
          
-
 
          This fix computes a temperature and pressure each timestep.  To do
-this, the fix creates its own computes of style "temp/asphere" and 
+this, the fix creates its own computes of style "temp/sphere" and 
 "pressure", as if these commands had been issued:
 
          
-
          compute fix-ID_temp group-ID temp/sphere
-compute fix-ID_press group-ID pressure fix-ID_temp 
+
          compute fix-ID_temp all temp/sphere
+compute fix-ID_press all pressure fix-ID_temp 
 
          
 
          See the compute temp/sphere and compute
 pressure commands for details.  Note that the
 IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
-+ underscore + "press", and the group for the new computes is the same
-as the fix group.
++ underscore + "press", and the group for the new computes is "all"
+since pressure is computed for the entire system.
 
          
 
          Note that these are NOT the computes used by thermodynamic output (see
 the thermo_style command) with ID = thermo_temp
@@ -200,10 +123,8 @@ fix to add the energy change induced by Nose/Hoover thermostatting and
 barostatting to the system's potential energy as part of
 thermodynamic output.
 
          
-
          The potential cummulative energy change due to this fix is stored as a
-scalar quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".
+
          This fix computes the same global scalar and global vector of
+quantities as does the fix npt command.
 
          
 
          This fix can ramp its target temperature and pressure over multiple
 runs, using the start and stop keywords of the run
@@ -221,22 +142,12 @@ store either a per-particle diameter or per-type shapeAll particles in the group must be finite-size spheres.  They cannot
 be point particles, nor can they be aspherical.
 
          
-
          Any dimension being adjusted by this fix must be periodic.  A
-dimension whose target pressures are specified as NULL can be
-non-periodic or periodic.
-
          
-
          The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
          
 
          Related commands:
 
          
-
          fix npt, fix nve_sphere, fix
+
          fix npt, fix nve_sphere, fix
 nvt_sphere, fix
 npt_asphere, fix_modify
 
          
-
          Default:
-
          
-
          The keyword defaults are drag = 0.0 and dilate = all.
+
          Default: none
 
          
 
diff --git a/doc/fix_npt_sphere.txt b/doc/fix_npt_sphere.txt
index f9a9049a8a..91b9f49450 100755
--- a/doc/fix_npt_sphere.txt
+++ b/doc/fix_npt_sphere.txt
@@ -10,32 +10,18 @@ fix npt/sphere command :h3
 
 [Syntax:]
 
-fix ID group-ID npt/sphere Tstart Tstop Tdamp p-style args keyword value ... :pre
+fix ID group-ID npt/sphere keyword value ... :pre
 
-ID, group-ID are documented in "fix"_fix.html command :ulb,l
-npt/sphere = style name of this fix command :l
-Tstart,Tstop = desired temperature at start/end of run :l
-Tdamp = temperature damping parameter (time units) :l
-p-style = {xyz} or {xy} or {yz} or {xz} or {aniso} :l
-  {xyz} args = Pstart Pstop Pdamp
-    Pstart,Pstop = desired pressure at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  {xy} or {yz} or {xz} or {aniso} args = Px_start Px_stop Py_start Py_stop Pz_start Pz_stop Pdamp
-    Px_start,Px_stop,... = desired pressure in x,y,z at start/end of run (pressure units)
-    Pdamp = pressure damping parameter (time units) :pre
-
-zero or more keyword/value pairs may be appended :l
-keyword = {drag} or {dilate} :l
-  {drag} value = drag factor added to barostat/thermostat (0.0 = no drag)
-  {dilate} value = {all} or {partial} :pre
-:ule
+ID, group-ID are documented in "fix"_fix.html command
+npt/sphere = style name of this fix command
+additional thermostat and barostat related keyword/value pairs from the "fix npt"_fix_nh.html command can be appended :ul
 
 [Examples:]
 
-fix 1 all npt/sphere 300.0 300.0 100.0 xyz 0.0 0.0 1000.0
-fix 2 all npt/sphere 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0
-fix 2 all npt/sphere 300.0 300.0 100.0 xz 5.0 5.0 NULL NULL 5.0 5.0 1000.0 drag 0.2
-fix 2 water npt/sphere 300.0 300.0 100.0 aniso 0.0 0.0 0.0 0.0 NULL NULL 1000.0 dilate partial :pre
+fix 1 all npt/sphere temp 300.0 300.0 100.0 iso 0.0 0.0 1000.0
+fix 2 all npt/sphere temp 300.0 300.0 100.0 x 5.0 5.0 1000.0
+fix 2 all npt/sphere temp 300.0 300.0 100.0 x 5.0 5.0 1000.0 drag 0.2
+fix 2 water npt/sphere temp 300.0 300.0 100.0 aniso 0.0 0.0 1000.0 dilate partial :pre
 
 [Description:]
 
@@ -45,7 +31,7 @@ group using a Nose/Hoover temperature thermostat and Nose/Hoover
 pressure barostat.  P is pressure; T is temperature.  This creates a
 system trajectory consistent with the isothermal-isobaric ensemble.
 
-This fix differs from the "fix npt"_fix_npt.html command, which
+This fix differs from the "fix npt"_fix_nh.html command, which
 assumes point particles and only updates their position and velocity.
 
 The thermostat is applied to both the translational and rotational
@@ -55,12 +41,10 @@ degrees of freedom (see below).  The translational degrees of freedom
 can also have a bias velocity removed from them before thermostatting
 takes place; see the description below.
 
-The desired temperature at each timestep is a ramped value during the
-run from {Tstart} to {Tstop}.  The {Tdamp} parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-"units"_units.html command).
+Additional parameters affecting the thermostat and barostat are
+specified by keywords and values documented with the "fix
+npt"_fix_nh.html command.  See, for example, discussion of the {temp},
+{iso}, {aniso}, and {dilate} keywords.
 
 The particles in the fix group are the only ones whose velocities and
 positions are updated by the velocity/position update portion of the
@@ -76,71 +60,18 @@ unchanged and controlling the pressure of a surrounding fluid.
 
 :line
 
-The pressure can be controlled in one of several styles, as specified
-by the {p-style} argument.  In each case, the desired pressure at each
-timestep is a ramped value during the run from the starting value to
-the end value.
-
-Style {xyz} means couple all dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the dimensions
-together.
-
-Styles {xy} or {yz} or {xz} means that the 2 specified dimensions are
-coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently, using its pressure component as the driving force.
-These styles cannot be used for a 2d simulation.
-
-For style {aniso}, all dimensions dilate/contract independently using
-their individual pressure components as the driving forces.
-
-For any of the styles except {xyz}, any of the independent pressure
-components (e.g. z in {xy}, or any dimension in {aniso}) can have
-their target pressures (both start and stop values) specified as NULL.
-This means that no pressure control is applied to that dimension so
-that the box dimension remains unchanged.  For a 2d simulation the z
-pressure components must be specified as NULL when using style
-{aniso}.
-
-For styles {xy} and {yz} and {xz}, the starting and stopping pressures
-must be the same for the two coupled dimensions and cannot be
-specified as NULL.
-
-In some cases (e.g. for solids) the pressure (volume) and/or
-temperature of the system can oscillate undesirably when a Nose/Hoover
-barostat and thermostat is applied.  The optional {drag} keyword will
-damp these oscillations, although it alters the Nose/Hoover equations.
-A value of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.
-A non-zero value adds a drag term; the larger the value specified, the
-greater the damping effect.  Performing a short run and monitoring the
-pressure and temperature is the best way to determine if the drag term
-is working.  Typically a value between 0.2 to 2.0 is sufficient to
-damp oscillations after a few periods.
-
-For all pressure styles, the simulation box stays rectangular in
-shape.  Parinello-Rahman boundary conditions (tilted box) are not yet
-implemented in LAMMPS.
-
-For all styles, the {Pdamp} parameter operates like the {Tdamp}
-parameter, determining the time scale on which pressure is relaxed.
-For example, a value of 1000.0 means to relax the pressure in a
-timespan of (roughly) 1000 time units (tau or fmsec or psec - see the
-"units"_units.html command).
-
-:line
-
 This fix computes a temperature and pressure each timestep.  To do
-this, the fix creates its own computes of style "temp/asphere" and 
+this, the fix creates its own computes of style "temp/sphere" and 
 "pressure", as if these commands had been issued:
 
-compute fix-ID_temp group-ID temp/sphere
-compute fix-ID_press group-ID pressure fix-ID_temp :pre
+compute fix-ID_temp all temp/sphere
+compute fix-ID_press all pressure fix-ID_temp :pre
 
 See the "compute temp/sphere"_compute_temp_sphere.html and "compute
 pressure"_compute_pressure.html commands for details.  Note that the
 IDs of the new computes are the fix-ID + underscore + "temp" or fix_ID
-+ underscore + "press", and the group for the new computes is the same
-as the fix group.
++ underscore + "press", and the group for the new computes is "all"
+since pressure is computed for the entire system.
 
 Note that these are NOT the computes used by thermodynamic output (see
 the "thermo_style"_thermo_style.html command) with ID = {thermo_temp}
@@ -189,10 +120,8 @@ fix to add the energy change induced by Nose/Hoover thermostatting and
 barostatting to the system's potential energy as part of
 "thermodynamic output"_thermo_style.html.
 
-The potential cummulative energy change due to this fix is stored as a
-scalar quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".
+This fix computes the same global scalar and global vector of
+quantities as does the "fix npt"_fix_nh.html command.
 
 This fix can ramp its target temperature and pressure over multiple
 runs, using the {start} and {stop} keywords of the "run"_run.html
@@ -210,20 +139,10 @@ store either a per-particle diameter or per-type "shape"_shape.html.
 All particles in the group must be finite-size spheres.  They cannot
 be point particles, nor can they be aspherical.
 
-Any dimension being adjusted by this fix must be periodic.  A
-dimension whose target pressures are specified as NULL can be
-non-periodic or periodic.
-
-The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
 [Related commands:]
 
-"fix npt"_fix_npt.html, "fix nve_sphere"_fix_nve_sphere.html, "fix
+"fix npt"_fix_nh.html, "fix nve_sphere"_fix_nve_sphere.html, "fix
 nvt_sphere"_fix_nvt_sphere.html, "fix
 npt_asphere"_fix_npt_asphere.html, "fix_modify"_fix_modify.html
 
-[Default:]
-
-The keyword defaults are drag = 0.0 and dilate = all.
+[Default:] none
diff --git a/doc/fix_nve.html b/doc/fix_nve.html
index 31847666e0..179718d2b7 100644
--- a/doc/fix_nve.html
+++ b/doc/fix_nve.html
@@ -33,8 +33,8 @@ ensemble.
 
          
 
          No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
@@ -43,7 +43,7 @@ This fix is not invoked during energy minimization
 
          
 
          Related commands:
 
          
-
          fix nvt, fix npt
+
          fix nvt, fix npt
 
          
 
          Default: none
 
          
diff --git a/doc/fix_nve.txt b/doc/fix_nve.txt
index 70d60a15b5..6c153cf492 100644
--- a/doc/fix_nve.txt
+++ b/doc/fix_nve.txt
@@ -30,8 +30,8 @@ ensemble.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
@@ -40,6 +40,6 @@ This fix is not invoked during "energy minimization"_minimize.html.
 
 [Related commands:]
 
-"fix nvt"_fix_nvt.html, "fix npt"_fix_npt.html
+"fix nvt"_fix_nh.html, "fix npt"_fix_nh.html
 
 [Default:] none
diff --git a/doc/fix_nve_asphere.html b/doc/fix_nve_asphere.html
index 4ef3aa5538..7d553b584c 100644
--- a/doc/fix_nve_asphere.html
+++ b/doc/fix_nve_asphere.html
@@ -36,8 +36,8 @@ assumes point particles and only updates their position and velocity.
 
          
 
          No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_nve_asphere.txt b/doc/fix_nve_asphere.txt
index 2b84fc7b67..a0b055a294 100755
--- a/doc/fix_nve_asphere.txt
+++ b/doc/fix_nve_asphere.txt
@@ -33,8 +33,8 @@ assumes point particles and only updates their position and velocity.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_nve_limit.html b/doc/fix_nve_limit.html
index 4dd98a61c1..2713bb1e71 100644
--- a/doc/fix_nve_limit.html
+++ b/doc/fix_nve_limit.html
@@ -56,15 +56,15 @@ very large for overlapped configurations.
 files.  None of the fix_modify options
 are relevant to this fix.
 
          
-
          This fix computes a scalar quantity which is the count of how many
-updates of atom's velocity/position were limited by the maximum
-distance criterion.  This should be roughly the number of atoms so
-affected, except that updates occur at both the beginning and end of a
-timestep in a velocity Verlet timestepping algorithm.  This is a
-cumulative quantity for the current run, but is re-initialized to
-zero each time a run is performed.  This value can be accessed by
-various output commands.  The scalar value
-calculated by this fix is "extensive".
+
          This fix computes a global scalar which can be accessed by various
+output commands.  The scalar is the count of
+how many updates of atom's velocity/position were limited by the
+maximum distance criterion.  This should be roughly the number of
+atoms so affected, except that updates occur at both the beginning and
+end of a timestep in a velocity Verlet timestepping algorithm.  This
+is a cumulative quantity for the current run, but is re-initialized to
+zero each time a run is performed.  The scalar value calculated by
+this fix is "extensive".
 
          
 
          No parameter of this fix can be used with the start/stop keywords of
 the run command.  This fix is not invoked during energy
diff --git a/doc/fix_nve_limit.txt b/doc/fix_nve_limit.txt
index 5cdf8a6f0d..3d3a36d9c9 100644
--- a/doc/fix_nve_limit.txt
+++ b/doc/fix_nve_limit.txt
@@ -53,15 +53,15 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-This fix computes a scalar quantity which is the count of how many
-updates of atom's velocity/position were limited by the maximum
-distance criterion.  This should be roughly the number of atoms so
-affected, except that updates occur at both the beginning and end of a
-timestep in a velocity Verlet timestepping algorithm.  This is a
-cumulative quantity for the current run, but is re-initialized to
-zero each time a run is performed.  This value can be accessed by
-various "output commands"_Section_howto.html#4_15.  The scalar value
-calculated by this fix is "extensive".
+This fix computes a global scalar which can be accessed by various
+"output commands"_Section_howto.html#4_15.  The scalar is the count of
+how many updates of atom's velocity/position were limited by the
+maximum distance criterion.  This should be roughly the number of
+atoms so affected, except that updates occur at both the beginning and
+end of a timestep in a velocity Verlet timestepping algorithm.  This
+is a cumulative quantity for the current run, but is re-initialized to
+zero each time a run is performed.  The scalar value calculated by
+this fix is "extensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.  This fix is not invoked during "energy
diff --git a/doc/fix_nve_noforce.html b/doc/fix_nve_noforce.html
index dcd51a2786..01c32cb80f 100644
--- a/doc/fix_nve_noforce.html
+++ b/doc/fix_nve_noforce.html
@@ -42,8 +42,8 @@ fcm() group function to compute the total force on the group of atoms.
 
          
 
          No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_nve_noforce.txt b/doc/fix_nve_noforce.txt
index 5442888b4b..61abe4e16a 100644
--- a/doc/fix_nve_noforce.txt
+++ b/doc/fix_nve_noforce.txt
@@ -39,8 +39,8 @@ fcm() group function to compute the total force on the group of atoms.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_nve_sphere.html b/doc/fix_nve_sphere.html
index 8bca1c14af..6b18a50188 100644
--- a/doc/fix_nve_sphere.html
+++ b/doc/fix_nve_sphere.html
@@ -53,8 +53,8 @@ where a dipole moment is assigned to particles via the
 
          
 
          No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_nve_sphere.txt b/doc/fix_nve_sphere.txt
index f3c79901a0..6796d55f9e 100755
--- a/doc/fix_nve_sphere.txt
+++ b/doc/fix_nve_sphere.txt
@@ -45,8 +45,8 @@ where a dipole moment is assigned to particles via the
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_nvt.html b/doc/fix_nvt.html
deleted file mode 100644
index b4ac8a6fdc..0000000000
--- a/doc/fix_nvt.html
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
          LAMMPS WWW Site - LAMMPS Documentation - LAMMPS Commands 
-
          
-
-
-
-
-
-
-
          
-
-
          fix nvt command 
-
          
-
          Syntax:
-
          
-
          fix ID group-ID nvt Tstart Tstop Tdamp keyword value ... 
-
          
-
          • ID, group-ID are documented in fix command 
-
-
          • nvt = style name of this fix command 
-
-
          • Tstart,Tstop = desired temperature at start/end of run (temperature units) 
-
-
          • Tdamp = temperature damping parameter (time units) 
-
-
          • zero or more keyword/value pairs may be appended 
-
-
          • keyword = drag or chain 
-
-
              drag value = drag factor added to thermostat (0.0 = no drag)
-  chain value = yes or no 
-
            
-
-
          
-
          Examples:
-
          
-
          fix 1 all nvt 300.0 300.0 100.0
-fix 1 all nvt 300.0 300.0 100.0 drag 0.2 chain no 
-
          
-
          Description:
-
          
-
          Perform constant NVT integration to update positions and velocities
-each timestep for atoms in the group using a Nose/Hoover temperature
-thermostat (Hoover).  V is volume; T is temperature.  This
-creates a system trajectory consistent with the canonical ensemble.
-
          
-
          The thermostat is applied to only the translational degrees of freedom
-for the particles.  The translational degrees of freedom can also have
-a bias velocity removed from them before thermostatting takes place;
-see the description below.
-
          
-
          The desired temperature at each timestep is a ramped value during the
-run from Tstart to Tstop.  The Tdamp parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-units command).
-
          
-
          The chain keyword determines whether Nose/Hoover chains are used or
-not.  If chain is specified as no, then the original Nose/Hoover
-formulation is used.  If chain is specified as yes, which is the
-default, then chains as described in (Martyna) are used
-which include extra non-physical variables which couple to the
-thermostat.  Nose/Hoover chains provide a more robust NVT integrator,
-overcoming non-ergodic sampling issues and energy oscillations found
-with ordinary Nose/Hoover dynamics.  Our implementation uses one chain
-and integrates the equations of motion via a Trotter expansion good to
-2nd order accuracy in the timestep size.
-
          
-
          In some cases (e.g. for solids) the temperature of the system can
-oscillate undesirably when a Nose/Hoover thermostat is applied, though
-this should be less of a problem if Nose/Hoover chains are used.  The
-optional drag keyword will damp these oscillations in an ad-hoc
-fashion, by altering the Nose/Hoover equations so that they no longer
-exactly sample the canonical ensemble.  A value of 0.0 (no drag)
-leaves the Nose/Hoover formalism unchanged.  A non-zero value adds a
-drag term; the larger the value specified, the greater the damping
-effect.  Performing a short run and monitoring the temperature is the
-best way to determine if the drag term is working.  Typically a value
-between 0.2 to 2.0 is sufficient to damp oscillations after a few
-periods.
-
          
-
          IMPORTANT NOTE: Unlike the fix temp/berendsen
-command which performs thermostatting but NO time integration, this
-fix performs thermostatting/barostatting AND time integration.  Thus
-you should not use any other time integration fix, such as fix
-nve on atoms to which this fix is applied.  Likewise,
-this fix should not normally be used on atoms that also have their
-temperature controlled by another fix - e.g. by fix
-langevin or fix temp/rescale
-commands.
-
          
-
          See this howto section of the manual for a
-discussion of different ways to compute temperature and perform
-thermostatting.
-
          
-
          This fix computes a temperature each timestep.  To do this, the fix
-creates its own compute of style "temp", as if this command had been
-issued:
-
          
-
          compute fix-ID_temp group-ID temp 
-
          
-
          See the compute temp command for details.  Note
-that the ID of the new compute is the fix-ID + underscore + "temp",
-and the group for the new compute is the same as the fix group.
-
          
-
          Note that this is NOT the compute used by thermodynamic output (see
-the thermo_style command) with ID = thermo_temp.
-This means you can change the attributes of this fix's temperature
-(e.g. its degrees-of-freedom) via the
-compute_modify command or print this temperature
-during thermodynamic output via the thermo_style
-custom command using the appropriate compute-ID.
-It also means that changing attributes of thermo_temp will have no
-effect on this fix.
-
          
-
          Like other fixes that perform thermostatting, this fix can be used
-with compute commands that calculate a temperature
-after removing a "bias" from the atom velocities.  E.g. removing the
-center-of-mass velocity from a group of atoms or only calculating
-temperature on the x-component of velocity or only calculating
-temperature for atoms in a geometric region.  This is not done by
-default, but only if the fix_modify command is used
-to assign a temperature compute to this fix that includes such a bias
-term.  See the doc pages for individual compute
-commands to determine which ones include a bias.  In
-this case, the thermostat works in the following manner: the current
-temperature is calculated taking the bias into account, bias is
-removed from each atom, thermostatting is performed on the remaining
-thermal degrees of freedom, and the bias is added back in.
-
          
-
          Restart, fix_modify, output, run start/stop, minimize info:
-
          
-
          This fix writes the state of the Nose/Hoover thermostat to binary
-restart files.  See the read_restart
-command for info on how to re-specify a fix in an input script that
-reads a restart file, so that the operation of the fix continues in an
-uninterrupted fashion.
-
          
-
          The fix_modify temp option is supported by this
-fix.  You can use it to assign a temperature compute
-you have defined to this fix which will be used in its thermostatting
-procedure, as described above.  For consistency, the group used by
-this fix and by the compute should be the same.
-
          
-
          The fix_modify energy option is supported by this
-fix to add the energy change induced by Nose/Hoover thermostatting to
-the system's potential energy as part of thermodynamic
-output.
-
          
-
          The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".
-
          
-
          This fix can ramp its target temperature over multiple runs, using the
-start and stop keywords of the run command.  See the
-run command for details of how to do this.
-
          
-
          This fix is not invoked during energy minimization.
-
          
-
          Restrictions:
-
          
-
          The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
          
-
          Related commands:
-
          
-
          fix nve, fix npt, fix
-temp/rescale, fix langevin,
-fix_modify, compute temp
-
          
-
          Default:
-
          
-
          The keyword defaults are drag = 0.0 and chain = yes.
-
          
-
          
-
-
-
-
          (Hoover) Hoover, Phys Rev A, 31, 1695 (1985).
-
          
-
-
-
          (Martyna) Martyna, Klein, Tuckerman, J Chem Phys, 97, 2635 (1992);
-Martyna, Tuckerman, Tobias, Klein, Mol Phys, 87, 1117.
-
          
-
diff --git a/doc/fix_nvt.txt b/doc/fix_nvt.txt
deleted file mode 100644
index b6ce9632a0..0000000000
--- a/doc/fix_nvt.txt
+++ /dev/null
@@ -1,176 +0,0 @@
-"LAMMPS WWW Site"_lws - "LAMMPS Documentation"_ld - "LAMMPS Commands"_lc :c
-
-:link(lws,http://lammps.sandia.gov)
-:link(ld,Manual.html)
-:link(lc,Section_commands.html#comm)
-
-:line
-
-fix nvt command :h3
-
-[Syntax:]
-
-fix ID group-ID nvt Tstart Tstop Tdamp keyword value ... :pre
-
-ID, group-ID are documented in "fix"_fix.html command :ulb,l
-nvt = style name of this fix command :l
-Tstart,Tstop = desired temperature at start/end of run (temperature units) :l
-Tdamp = temperature damping parameter (time units) :l
-
-zero or more keyword/value pairs may be appended :l
-keyword = {drag} or {chain} :l
-  {drag} value = drag factor added to thermostat (0.0 = no drag)
-  {chain} value = {yes} or {no} :pre
-:ule
-
-[Examples:]
-
-fix 1 all nvt 300.0 300.0 100.0
-fix 1 all nvt 300.0 300.0 100.0 drag 0.2 chain no :pre
-
-[Description:]
-
-Perform constant NVT integration to update positions and velocities
-each timestep for atoms in the group using a Nose/Hoover temperature
-thermostat "(Hoover)"_#Hoover.  V is volume; T is temperature.  This
-creates a system trajectory consistent with the canonical ensemble.
-
-The thermostat is applied to only the translational degrees of freedom
-for the particles.  The translational degrees of freedom can also have
-a bias velocity removed from them before thermostatting takes place;
-see the description below.
-
-The desired temperature at each timestep is a ramped value during the
-run from {Tstart} to {Tstop}.  The {Tdamp} parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-"units"_units.html command).
-
-The {chain} keyword determines whether Nose/Hoover chains are used or
-not.  If {chain} is specified as {no}, then the original Nose/Hoover
-formulation is used.  If {chain} is specified as {yes}, which is the
-default, then chains as described in "(Martyna)"_#Martyna are used
-which include extra non-physical variables which couple to the
-thermostat.  Nose/Hoover chains provide a more robust NVT integrator,
-overcoming non-ergodic sampling issues and energy oscillations found
-with ordinary Nose/Hoover dynamics.  Our implementation uses one chain
-and integrates the equations of motion via a Trotter expansion good to
-2nd order accuracy in the timestep size.
-
-In some cases (e.g. for solids) the temperature of the system can
-oscillate undesirably when a Nose/Hoover thermostat is applied, though
-this should be less of a problem if Nose/Hoover chains are used.  The
-optional {drag} keyword will damp these oscillations in an ad-hoc
-fashion, by altering the Nose/Hoover equations so that they no longer
-exactly sample the canonical ensemble.  A value of 0.0 (no drag)
-leaves the Nose/Hoover formalism unchanged.  A non-zero value adds a
-drag term; the larger the value specified, the greater the damping
-effect.  Performing a short run and monitoring the temperature is the
-best way to determine if the drag term is working.  Typically a value
-between 0.2 to 2.0 is sufficient to damp oscillations after a few
-periods.
-
-IMPORTANT NOTE: Unlike the "fix temp/berendsen"_fix_berendsen.html
-command which performs thermostatting but NO time integration, this
-fix performs thermostatting/barostatting AND time integration.  Thus
-you should not use any other time integration fix, such as "fix
-nve"_fix_nve.html on atoms to which this fix is applied.  Likewise,
-this fix should not normally be used on atoms that also have their
-temperature controlled by another fix - e.g. by "fix
-langevin"_fix_nvt.html or "fix temp/rescale"_fix_temp_rescale.html
-commands.
-
-See "this howto section"_Section_howto.html#4_16 of the manual for a
-discussion of different ways to compute temperature and perform
-thermostatting.
-
-This fix computes a temperature each timestep.  To do this, the fix
-creates its own compute of style "temp", as if this command had been
-issued:
-
-compute fix-ID_temp group-ID temp :pre
-
-See the "compute temp"_compute_temp.html command for details.  Note
-that the ID of the new compute is the fix-ID + underscore + "temp",
-and the group for the new compute is the same as the fix group.
-
-Note that this is NOT the compute used by thermodynamic output (see
-the "thermo_style"_thermo_style.html command) with ID = {thermo_temp}.
-This means you can change the attributes of this fix's temperature
-(e.g. its degrees-of-freedom) via the
-"compute_modify"_compute_modify.html command or print this temperature
-during thermodynamic output via the "thermo_style
-custom"_thermo_style.html command using the appropriate compute-ID.
-It also means that changing attributes of {thermo_temp} will have no
-effect on this fix.
-
-Like other fixes that perform thermostatting, this fix can be used
-with "compute commands"_compute.html that calculate a temperature
-after removing a "bias" from the atom velocities.  E.g. removing the
-center-of-mass velocity from a group of atoms or only calculating
-temperature on the x-component of velocity or only calculating
-temperature for atoms in a geometric region.  This is not done by
-default, but only if the "fix_modify"_fix_modify.html command is used
-to assign a temperature compute to this fix that includes such a bias
-term.  See the doc pages for individual "compute
-commands"_compute.html to determine which ones include a bias.  In
-this case, the thermostat works in the following manner: the current
-temperature is calculated taking the bias into account, bias is
-removed from each atom, thermostatting is performed on the remaining
-thermal degrees of freedom, and the bias is added back in.
-
-[Restart, fix_modify, output, run start/stop, minimize info:]
-
-This fix writes the state of the Nose/Hoover thermostat to "binary
-restart files"_restart.html.  See the "read_restart"_read_restart.html
-command for info on how to re-specify a fix in an input script that
-reads a restart file, so that the operation of the fix continues in an
-uninterrupted fashion.
-
-The "fix_modify"_fix_modify.html {temp} option is supported by this
-fix.  You can use it to assign a temperature "compute"_compute.html
-you have defined to this fix which will be used in its thermostatting
-procedure, as described above.  For consistency, the group used by
-this fix and by the compute should be the same.
-
-The "fix_modify"_fix_modify.html {energy} option is supported by this
-fix to add the energy change induced by Nose/Hoover thermostatting to
-the system's potential energy as part of "thermodynamic
-output"_thermo_style.html.
-
-The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".
-
-This fix can ramp its target temperature over multiple runs, using the
-{start} and {stop} keywords of the "run"_run.html command.  See the
-"run"_run.html command for details of how to do this.
-
-This fix is not invoked during "energy minimization"_minimize.html.
-
-[Restrictions:]
-
-The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
-[Related commands:]
-
-"fix nve"_fix_nve.html, "fix npt"_fix_npt.html, "fix
-temp/rescale"_fix_temp_rescale.html, "fix langevin"_fix_langevin.html,
-"fix_modify"_fix_modify.html, "compute temp"_compute_temp.html
-
-[Default:]
-
-The keyword defaults are drag = 0.0 and chain = yes.
-
-:line
-
-:link(Hoover)
-[(Hoover)] Hoover, Phys Rev A, 31, 1695 (1985).
-
-:link(Martyna)
-[(Martyna)] Martyna, Klein, Tuckerman, J Chem Phys, 97, 2635 (1992);
-Martyna, Tuckerman, Tobias, Klein, Mol Phys, 87, 1117.
diff --git a/doc/fix_nvt_asphere.html b/doc/fix_nvt_asphere.html
index 88a07e5a72..09c292126c 100644
--- a/doc/fix_nvt_asphere.html
+++ b/doc/fix_nvt_asphere.html
@@ -13,28 +13,16 @@
 
 
          Syntax:
 
          
-
          fix ID group-ID nvt/asphere Tstart Tstop Tdamp keyword value ... 
+
          fix ID group-ID nvt/asphere keyword value ... 
 
          
-
          • ID, group-ID are documented in fix command 
-
-
          • nvt/asphere = style name of this fix command 
-
-
          • Tstart,Tstop = desired temperature at start/end of run 
-
-
          • Tdamp = temperature damping parameter (time units) 
-
-
          • zero or more keyword/value pairs may be appended 
-
-
          • keyword = drag 
-
-
              drag value = drag factor added to thermostat (0.0 = no drag) 
-
            
-
+
            • ID, group-ID are documented in fix command
+
            • nvt/asphere = style name of this fix command
+
            • additional thermostat related keyword/value pairs from the fix nvt command can be appended 
 
            
 
            Examples:
 
            
-
            fix 1 all nvt/asphere 300.0 300.0 100.0
-fix 1 all nvt/asphere 300.0 300.0 100.0 drag 0.2 
+
            fix 1 all nvt/asphere temp 300.0 300.0 100.0
+fix 1 all nvt/asphere temp 300.0 300.0 100.0 drag 0.2 
 
            
 
            Description:
 
            
@@ -44,6 +32,9 @@ ellipsoidal particles in the group using a Nose/Hoover temperature
 thermostat.  V is volume; T is temperature.  This creates a system
 trajectory consistent with the canonical ensemble.
 
            
+
            This fix differs from the fix nvt command, which
+assumes point particles and only updates their position and velocity.
+
            
 
            The thermostat is applied to both the translational and rotational
 degrees of freedom for the aspherical particles, assuming a compute is
 used which calculates a temperature that includes the rotational
@@ -51,22 +42,10 @@ degrees of freedom (see below).  The translational degrees of freedom
 can also have a bias velocity removed from them before thermostatting
 takes place; see the description below.
 
            
-
            The desired temperature at each timestep is a ramped value during the
-run from Tstart to Tstop.  The Tdamp parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-units command).
-
            
-
            In some cases (e.g. for solids) the temperature of the system can
-oscillate undesirably when a Nose/Hoover thermostat is applied.  The
-optional drag keyword will damp these oscillations, although it
-alters the Nose/Hoover equations.  A value of 0.0 (no drag) leaves the
-Nose/Hoover formalism unchanged.  A non-zero value adds a drag term;
-the larger the value specified, the greater the damping effect.
-Performing a short run and monitoring the temperature is the best way
-to determine if the drag term is working.  Typically a value between
-0.2 to 2.0 is sufficient to damp oscillations after a few periods.
+
            Additional parameters affecting the thermostat are specified by
+keywords and values documented with the fix nvt
+command.  See, for example, discussion of the temp and drag
+keywords.
 
            
 
            This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp/asphere", as if this command 
@@ -122,10 +101,8 @@ fix to add the energy change induced by Nose/Hoover thermostatting to
 the system's potential energy as part of thermodynamic
 output.
 
            
-
            The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".
+
            This fix computes the same global scalar and global vector of
+quantities as does the fix nvt command.
 
            
 
            This fix can ramp its target temperature over multiple runs, using the
 start and stop keywords of the run command.  See the
@@ -148,17 +125,11 @@ diameter or per-particle mass.
 
            All particles in the group must be finite-size.  They cannot be point
 particles, but they can be aspherical or spherical.
 
            
-
            The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
            
 
            Related commands:
 
            
-
            fix nvt, fix nve_asphere, fix
+
            fix nvt, fix nve_asphere, fix
 npt_asphere, fix_modify
 
            
-
            Default:
-
            
-
            The keyword defaults are drag = 0.0.
+
            Default: none
 
            
 
diff --git a/doc/fix_nvt_asphere.txt b/doc/fix_nvt_asphere.txt
index 0399eee9c1..8e32fdeaf8 100755
--- a/doc/fix_nvt_asphere.txt
+++ b/doc/fix_nvt_asphere.txt
@@ -10,22 +10,16 @@ fix nvt/asphere command :h3
 
 [Syntax:]
 
-fix ID group-ID nvt/asphere Tstart Tstop Tdamp keyword value ... :pre
+fix ID group-ID nvt/asphere keyword value ... :pre
 
-ID, group-ID are documented in "fix"_fix.html command :ulb,l
-nvt/asphere = style name of this fix command :l
-Tstart,Tstop = desired temperature at start/end of run :l
-Tdamp = temperature damping parameter (time units) :l
-
-zero or more keyword/value pairs may be appended :l
-keyword = {drag} :l
-  {drag} value = drag factor added to thermostat (0.0 = no drag) :pre
-:ule
+ID, group-ID are documented in "fix"_fix.html command
+nvt/asphere = style name of this fix command
+additional thermostat related keyword/value pairs from the "fix nvt"_fix_nh.html command can be appended :ul
 
 [Examples:]
 
-fix 1 all nvt/asphere 300.0 300.0 100.0
-fix 1 all nvt/asphere 300.0 300.0 100.0 drag 0.2 :pre
+fix 1 all nvt/asphere temp 300.0 300.0 100.0
+fix 1 all nvt/asphere temp 300.0 300.0 100.0 drag 0.2 :pre
 
 [Description:]
 
@@ -35,6 +29,9 @@ ellipsoidal particles in the group using a Nose/Hoover temperature
 thermostat.  V is volume; T is temperature.  This creates a system
 trajectory consistent with the canonical ensemble.
 
+This fix differs from the "fix nvt"_fix_nh.html command, which
+assumes point particles and only updates their position and velocity.
+
 The thermostat is applied to both the translational and rotational
 degrees of freedom for the aspherical particles, assuming a compute is
 used which calculates a temperature that includes the rotational
@@ -42,22 +39,10 @@ degrees of freedom (see below).  The translational degrees of freedom
 can also have a bias velocity removed from them before thermostatting
 takes place; see the description below.
 
-The desired temperature at each timestep is a ramped value during the
-run from {Tstart} to {Tstop}.  The {Tdamp} parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-"units"_units.html command).
-
-In some cases (e.g. for solids) the temperature of the system can
-oscillate undesirably when a Nose/Hoover thermostat is applied.  The
-optional {drag} keyword will damp these oscillations, although it
-alters the Nose/Hoover equations.  A value of 0.0 (no drag) leaves the
-Nose/Hoover formalism unchanged.  A non-zero value adds a drag term;
-the larger the value specified, the greater the damping effect.
-Performing a short run and monitoring the temperature is the best way
-to determine if the drag term is working.  Typically a value between
-0.2 to 2.0 is sufficient to damp oscillations after a few periods.
+Additional parameters affecting the thermostat are specified by
+keywords and values documented with the "fix nvt"_fix_nh.html
+command.  See, for example, discussion of the {temp} and {drag}
+keywords.
 
 This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp/asphere", as if this command 
@@ -113,10 +98,8 @@ fix to add the energy change induced by Nose/Hoover thermostatting to
 the system's potential energy as part of "thermodynamic
 output"_thermo_style.html.
 
-The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".
+This fix computes the same global scalar and global vector of
+quantities as does the "fix nvt"_fix_nh.html command.
 
 This fix can ramp its target temperature over multiple runs, using the
 {start} and {stop} keywords of the "run"_run.html command.  See the
@@ -139,15 +122,9 @@ diameter or per-particle mass.
 All particles in the group must be finite-size.  They cannot be point
 particles, but they can be aspherical or spherical.
 
-The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
 [Related commands:]
 
-"fix nvt"_fix_nvt.html, "fix nve_asphere"_fix_nve_asphere.html, "fix
+"fix nvt"_fix_nh.html, "fix nve_asphere"_fix_nve_asphere.html, "fix
 npt_asphere"_fix_npt_asphere.html, "fix_modify"_fix_modify.html
 
-[Default:]
-
-The keyword defaults are drag = 0.0.
+[Default:] none
diff --git a/doc/fix_nvt_sllod.html b/doc/fix_nvt_sllod.html
index b7af24d340..7b80694207 100644
--- a/doc/fix_nvt_sllod.html
+++ b/doc/fix_nvt_sllod.html
@@ -13,28 +13,16 @@
 
 
            Syntax:
 
            
-
            fix ID group-ID nvt/sllod Tstart Tstop Tdamp keyword value ... 
+
            fix ID group-ID nvt/sllod keyword value ... 
 
            
-
            • ID, group-ID are documented in fix command 
-
-
            • nvt/sllod = style name of this fix command 
-
-
            • Tstart,Tstop = desired temperature at start/end of run 
-
-
            • Tdamp = temperature damping parameter (time units) 
-
-
            • zero or more keyword/value pairs may be appended 
-
-
            • keyword = drag 
-
-
                drag value = drag factor added to thermostat (0.0 = no drag) 
-
              
-
+
              • ID, group-ID are documented in fix command
+
              • nvt/sllod = style name of this fix command
+
              • additional thermostat related keyword/value pairs from the fix nvt command can be appended 
 
              
 
              Examples:
 
              
-
              fix 1 all nvt/sllod 300.0 300.0 100.0
-fix 1 all nvt/sllod 300.0 300.0 100.0 drag 0.2 
+
              fix 1 all nvt/sllod temp 300.0 300.0 100.0
+fix 1 all nvt/sllod temp 300.0 300.0 100.0 drag 0.2 
 
              
 
              Description:
 
              
@@ -70,22 +58,10 @@ error if this setting is not consistent.
 discussed in (Tuckerman) (eqs 4 and 5), which is what is
 implemented in LAMMPS in a velocity Verlet formulation.
 
              
-
              The desired temperature at each timestep is a ramped value during the
-run from Tstart to Tstop.  The Tdamp parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-units command).
-
              
-
              In some cases (e.g. for solids) the temperature of the system can
-oscillate undesirably when a Nose/Hoover thermostat is applied.  The
-optional drag keyword will damp these oscillations, although it
-alters the Nose/Hoover equations.  A value of 0.0 (no drag) leaves the
-Nose/Hoover formalism unchanged.  A non-zero value adds a drag term;
-the larger the value specified, the greater the damping effect.
-Performing a short run and monitoring the temperature is the best way
-to determine if the drag term is working.  Typically a value between
-0.2 to 2.0 is sufficient to damp oscillations after a few periods.
+
              Additional parameters affecting the thermostat are specified by
+keywords and values documented with the fix nvt
+command.  See, for example, discussion of the temp and drag
+keywords.
 
              
 
              This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp/deform", as if this command had
@@ -141,10 +117,8 @@ fix to add the energy change induced by Nose/Hoover thermostatting to
 the system's potential energy as part of thermodynamic
 output.
 
              
-
              The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".
+
              This fix computes the same global scalar and global vector of
+quantities as does the fix nvt command.
 
              
 
              This fix can ramp its target temperature over multiple runs, using the
 start and stop keywords of the run command.  See the
@@ -152,22 +126,16 @@ this fix is "extensive".
 
              
 
              This fix is not invoked during energy minimization.
 
              
-
              Restrictions:
-
              
-
              The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
+
              Restrictions: none
 
              
 
              Related commands:
 
              
-
              fix nve, fix npt, fix
-npt, fix temp/rescale, fix
-langevin, fix_modify,
-compute temp
+
              fix nve, fix nvt, fix
+temp/rescale, fix langevin,
+fix_modify, compute
+temp/deform
 
              
-
              Default:
-
              
-
              The keyword defaults are drag = 0.0.
+
              Default: none
 
              
 
              
 
diff --git a/doc/fix_nvt_sllod.txt b/doc/fix_nvt_sllod.txt
index 62ab5f2600..dc4b4e5fb0 100644
--- a/doc/fix_nvt_sllod.txt
+++ b/doc/fix_nvt_sllod.txt
@@ -10,22 +10,16 @@ fix nvt/sllod command :h3
 
 [Syntax:]
 
-fix ID group-ID nvt/sllod Tstart Tstop Tdamp keyword value ... :pre
+fix ID group-ID nvt/sllod keyword value ... :pre
 
-ID, group-ID are documented in "fix"_fix.html command :ulb,l
-nvt/sllod = style name of this fix command :l
-Tstart,Tstop = desired temperature at start/end of run :l
-Tdamp = temperature damping parameter (time units) :l
-
-zero or more keyword/value pairs may be appended :l
-keyword = {drag} :l
-  {drag} value = drag factor added to thermostat (0.0 = no drag) :pre
-:ule
+ID, group-ID are documented in "fix"_fix.html command
+nvt/sllod = style name of this fix command
+additional thermostat related keyword/value pairs from the "fix nvt"_fix_nh.html command can be appended :ul
 
 [Examples:]
 
-fix 1 all nvt/sllod 300.0 300.0 100.0
-fix 1 all nvt/sllod 300.0 300.0 100.0 drag 0.2 :pre
+fix 1 all nvt/sllod temp 300.0 300.0 100.0
+fix 1 all nvt/sllod temp 300.0 300.0 100.0 drag 0.2 :pre
 
 [Description:]
 
@@ -61,22 +55,10 @@ The SLLOD equations of motion coupled to a Nose/Hoover thermostat are
 discussed in "(Tuckerman)"_#Tuckerman (eqs 4 and 5), which is what is
 implemented in LAMMPS in a velocity Verlet formulation.
 
-The desired temperature at each timestep is a ramped value during the
-run from {Tstart} to {Tstop}.  The {Tdamp} parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-"units"_units.html command).
-
-In some cases (e.g. for solids) the temperature of the system can
-oscillate undesirably when a Nose/Hoover thermostat is applied.  The
-optional {drag} keyword will damp these oscillations, although it
-alters the Nose/Hoover equations.  A value of 0.0 (no drag) leaves the
-Nose/Hoover formalism unchanged.  A non-zero value adds a drag term;
-the larger the value specified, the greater the damping effect.
-Performing a short run and monitoring the temperature is the best way
-to determine if the drag term is working.  Typically a value between
-0.2 to 2.0 is sufficient to damp oscillations after a few periods.
+Additional parameters affecting the thermostat are specified by
+keywords and values documented with the "fix nvt"_fix_nh.html
+command.  See, for example, discussion of the {temp} and {drag}
+keywords.
 
 This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp/deform", as if this command had
@@ -132,10 +114,8 @@ fix to add the energy change induced by Nose/Hoover thermostatting to
 the system's potential energy as part of "thermodynamic
 output"_thermo_style.html.
 
-The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".
+This fix computes the same global scalar and global vector of
+quantities as does the "fix nvt"_fix_nh.html command.
 
 This fix can ramp its target temperature over multiple runs, using the
 {start} and {stop} keywords of the "run"_run.html command.  See the
@@ -143,22 +123,16 @@ This fix can ramp its target temperature over multiple runs, using the
 
 This fix is not invoked during "energy minimization"_minimize.html.
 
-[Restrictions:]
-
-The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
+[Restrictions:] none
 
 [Related commands:]
 
-"fix nve"_fix_nve.html, "fix npt"_fix_npt.html, "fix
-npt"_fix_npt.html, "fix temp/rescale"_fix_temp_rescale.html, "fix
-langevin"_fix_langevin.html, "fix_modify"_fix_modify.html,
-"compute temp"_compute_temp.html
+"fix nve"_fix_nve.html, "fix nvt"_fix_nh.html, "fix
+temp/rescale"_fix_temp_rescale.html, "fix langevin"_fix_langevin.html,
+"fix_modify"_fix_modify.html, "compute
+temp/deform"_compute_temp_deform.html
 
-[Default:]
-
-The keyword defaults are drag = 0.0.
+[Default:] none
 
 :line
 
diff --git a/doc/fix_nvt_sphere.html b/doc/fix_nvt_sphere.html
index 5262709bf6..31bf453926 100644
--- a/doc/fix_nvt_sphere.html
+++ b/doc/fix_nvt_sphere.html
@@ -13,28 +13,16 @@
 
 
              Syntax:
 
              
-
              fix ID group-ID nvt/sphere Tstart Tstop Tdamp keyword value ... 
+
              fix ID group-ID nvt/sphere keyword value ... 
 
              
-
              • ID, group-ID are documented in fix command 
-
-
              • nvt/sphere = style name of this fix command 
-
-
              • Tstart,Tstop = desired temperature at start/end of run 
-
-
              • Tdamp = temperature damping parameter (time units) 
-
-
              • zero or more keyword/value pairs may be appended 
-
-
              • keyword = drag 
-
-
                  drag value = drag factor added to thermostat (0.0 = no drag) 
-
                
-
+
                • ID, group-ID are documented in fix command
+
                • nvt/sphere = style name of this fix command
+
                • additional thermostat related keyword/value pairs from the fix nvt command can be appended 
 
                
 
                Examples:
 
                
-
                fix 1 all nvt/sphere 300.0 300.0 100.0
-fix 1 all nvt/sphere 300.0 300.0 100.0 drag 0.2 
+
                fix 1 all nvt/sphere temp 300.0 300.0 100.0
+fix 1 all nvt/sphere temp 300.0 300.0 100.0 drag 0.2 
 
                
 
                Description:
 
                
@@ -44,7 +32,7 @@ group using a Nose/Hoover temperature thermostat.  V is volume; T is
 temperature.  This creates a system trajectory consistent with the
 canonical ensemble.
 
                
-
                This fix differs from the fix nvt command, which
+
                This fix differs from the fix nvt command, which
 assumes point particles and only updates their position and velocity.
 
                
 
                The thermostat is applied to both the translational and rotational
@@ -54,22 +42,10 @@ degrees of freedom (see below).  The translational degrees of freedom
 can also have a bias velocity removed from them before thermostatting
 takes place; see the description below.
 
                
-
                The desired temperature at each timestep is a ramped value during the
-run from Tstart to Tstop.  The Tdamp parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-units command).
-
                
-
                In some cases (e.g. for solids) the temperature of the system can
-oscillate undesirably when a Nose/Hoover thermostat is applied.  The
-optional drag keyword will damp these oscillations, although it
-alters the Nose/Hoover equations.  A value of 0.0 (no drag) leaves the
-Nose/Hoover formalism unchanged.  A non-zero value adds a drag term;
-the larger the value specified, the greater the damping effect.
-Performing a short run and monitoring the temperature is the best way
-to determine if the drag term is working.  Typically a value between
-0.2 to 2.0 is sufficient to damp oscillations after a few periods.
+
                Additional parameters affecting the thermostat are specified by
+keywords and values documented with the fix nvt
+command.  See, for example, discussion of the temp and drag
+keywords.
 
                
 
                This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp/sphere", as if this command 
@@ -125,10 +101,8 @@ fix to add the energy change induced by Nose/Hoover thermostatting to
 the system's potential energy as part of thermodynamic
 output.
 
                
-
                The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".
+
                This fix computes the same global scalar and global vector of
+quantities as does the fix nvt command.
 
                
 
                This fix can ramp its target temperature over multiple runs, using the
 start and stop keywords of the run command.  See the
@@ -145,18 +119,12 @@ store either a per-particle radius or per-type shape.
 
                All particles in the group must be finite-size spheres.  They cannot
 be point particles, nor can they be aspherical.
 
                
-
                The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
                
 
                Related commands:
 
                
-
                fix nvt, fix nve_sphere, fix
+
                fix nvt, fix nve_sphere, fix
 nvt_asphere, fix
 npt_sphere, fix_modify
 
                
-
                Default:
-
                
-
                The keyword defaults are drag = 0.0.
+
                Default: none
 
                
 
diff --git a/doc/fix_nvt_sphere.txt b/doc/fix_nvt_sphere.txt
index dd46c74cdb..ef7865489e 100755
--- a/doc/fix_nvt_sphere.txt
+++ b/doc/fix_nvt_sphere.txt
@@ -10,22 +10,16 @@ fix nvt/sphere command :h3
 
 [Syntax:]
 
-fix ID group-ID nvt/sphere Tstart Tstop Tdamp keyword value ... :pre
+fix ID group-ID nvt/sphere keyword value ... :pre
 
-ID, group-ID are documented in "fix"_fix.html command :ulb,l
-nvt/sphere = style name of this fix command :l
-Tstart,Tstop = desired temperature at start/end of run :l
-Tdamp = temperature damping parameter (time units) :l
-
-zero or more keyword/value pairs may be appended :l
-keyword = {drag} :l
-  {drag} value = drag factor added to thermostat (0.0 = no drag) :pre
-:ule
+ID, group-ID are documented in "fix"_fix.html command
+nvt/sphere = style name of this fix command
+additional thermostat related keyword/value pairs from the "fix nvt"_fix_nh.html command can be appended :ul
 
 [Examples:]
 
-fix 1 all nvt/sphere 300.0 300.0 100.0
-fix 1 all nvt/sphere 300.0 300.0 100.0 drag 0.2 :pre
+fix 1 all nvt/sphere temp 300.0 300.0 100.0
+fix 1 all nvt/sphere temp 300.0 300.0 100.0 drag 0.2 :pre
 
 [Description:]
 
@@ -35,7 +29,7 @@ group using a Nose/Hoover temperature thermostat.  V is volume; T is
 temperature.  This creates a system trajectory consistent with the
 canonical ensemble.
 
-This fix differs from the "fix nvt"_fix_nvt.html command, which
+This fix differs from the "fix nvt"_fix_nh.html command, which
 assumes point particles and only updates their position and velocity.
 
 The thermostat is applied to both the translational and rotational
@@ -45,22 +39,10 @@ degrees of freedom (see below).  The translational degrees of freedom
 can also have a bias velocity removed from them before thermostatting
 takes place; see the description below.
 
-The desired temperature at each timestep is a ramped value during the
-run from {Tstart} to {Tstop}.  The {Tdamp} parameter is specified in
-time units and determines how rapidly the temperature is relaxed.  For
-example, a value of 100.0 means to relax the temperature in a timespan
-of (roughly) 100 time units (tau or fmsec or psec - see the
-"units"_units.html command).
-
-In some cases (e.g. for solids) the temperature of the system can
-oscillate undesirably when a Nose/Hoover thermostat is applied.  The
-optional {drag} keyword will damp these oscillations, although it
-alters the Nose/Hoover equations.  A value of 0.0 (no drag) leaves the
-Nose/Hoover formalism unchanged.  A non-zero value adds a drag term;
-the larger the value specified, the greater the damping effect.
-Performing a short run and monitoring the temperature is the best way
-to determine if the drag term is working.  Typically a value between
-0.2 to 2.0 is sufficient to damp oscillations after a few periods.
+Additional parameters affecting the thermostat are specified by
+keywords and values documented with the "fix nvt"_fix_nh.html
+command.  See, for example, discussion of the {temp} and {drag}
+keywords.
 
 This fix computes a temperature each timestep.  To do this, the fix
 creates its own compute of style "temp/sphere", as if this command 
@@ -116,10 +98,8 @@ fix to add the energy change induced by Nose/Hoover thermostatting to
 the system's potential energy as part of "thermodynamic
 output"_thermo_style.html.
 
-The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".
+This fix computes the same global scalar and global vector of
+quantities as does the "fix nvt"_fix_nh.html command.
 
 This fix can ramp its target temperature over multiple runs, using the
 {start} and {stop} keywords of the "run"_run.html command.  See the
@@ -136,16 +116,10 @@ store either a per-particle radius or per-type "shape"_shape.html.
 All particles in the group must be finite-size spheres.  They cannot
 be point particles, nor can they be aspherical.
 
-The final Tstop cannot be 0.0 since it would make the target T = 0.0
-at some timestep during the simulation which is not allowed in 
-the Nose/Hoover formulation.
-
 [Related commands:]
 
-"fix nvt"_fix_nvt.html, "fix nve_sphere"_fix_nve_sphere.html, "fix
+"fix nvt"_fix_nh.html, "fix nve_sphere"_fix_nve_sphere.html, "fix
 nvt_asphere"_fix_nvt_asphere.html, "fix
 npt_sphere"_fix_npt_sphere.html, "fix_modify"_fix_modify.html
 
-[Default:]
-
-The keyword defaults are drag = 0.0.
+[Default:] none
diff --git a/doc/fix_orient_fcc.html b/doc/fix_orient_fcc.html
index a3b92fec84..a27d9a6811 100644
--- a/doc/fix_orient_fcc.html
+++ b/doc/fix_orient_fcc.html
@@ -126,10 +126,10 @@ fix to add the potential energy of atom interactions with the grain
 boundary driving force to the system's potential energy as part of
 thermodynamic output.
 
                
-
                The potential energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".
+
                This fix computes a global scalar which can be accessed by various
+output commands.  The scalar is the
+potential energy change due to this fix.  The scalar value calculated
+by this fix is "extensive".
 
                
 
                No parameter of this fix can be used with the start/stop keywords of
 the run command.  This fix is not invoked during energy
diff --git a/doc/fix_orient_fcc.txt b/doc/fix_orient_fcc.txt
index 94f12713be..6918453b4f 100644
--- a/doc/fix_orient_fcc.txt
+++ b/doc/fix_orient_fcc.txt
@@ -123,10 +123,10 @@ fix to add the potential energy of atom interactions with the grain
 boundary driving force to the system's potential energy as part of
 "thermodynamic output"_thermo_style.html.
 
-The potential energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".
+This fix computes a global scalar which can be accessed by various
+"output commands"_Section_howto.html#4_15.  The scalar is the
+potential energy change due to this fix.  The scalar value calculated
+by this fix is "extensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.  This fix is not invoked during "energy
diff --git a/doc/fix_planeforce.html b/doc/fix_planeforce.html
index 3d40580252..aefcd57f82 100644
--- a/doc/fix_planeforce.html
+++ b/doc/fix_planeforce.html
@@ -37,8 +37,8 @@ should continue to move in the plane thereafter.
 
                
 
                No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 
                
diff --git a/doc/fix_planeforce.txt b/doc/fix_planeforce.txt
index 6ad3d9fa61..a36c0f8896 100644
--- a/doc/fix_planeforce.txt
+++ b/doc/fix_planeforce.txt
@@ -34,8 +34,8 @@ should continue to move in the plane thereafter.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 
diff --git a/doc/fix_poems.html b/doc/fix_poems.html
index bd5320a5b5..11806aa60a 100644
--- a/doc/fix_poems.html
+++ b/doc/fix_poems.html
@@ -114,8 +114,8 @@ off, and there is only a single fix poems defined.
 
                
 
                No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_poems.txt b/doc/fix_poems.txt
index 4b7e660dd0..f37f1dd89a 100644
--- a/doc/fix_poems.txt
+++ b/doc/fix_poems.txt
@@ -107,8 +107,8 @@ off, and there is only a single fix poems defined.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_pour.html b/doc/fix_pour.html
index d2d99eebd3..8970402686 100644
--- a/doc/fix_pour.html
+++ b/doc/fix_pour.html
@@ -119,11 +119,11 @@ produce the same behavior if you adjust the fix pour parameters
 appropriately.
 
                
 
                None of the fix_modify options are relevant to this
-fix.  No global scalar or vector or per-atom quantities are stored by
-this fix for access by various output
-commands.  No parameter of this fix can be
-used with the start/stop keywords of the run command.
-This fix is not invoked during energy minimization.
+fix.  No global or per-atom quantities are stored by this fix for
+access by various output commands.  No
+parameter of this fix can be used with the start/stop keywords of
+the run command.  This fix is not invoked during energy
+minimization.
 
                
 
                Restrictions:
 
                
diff --git a/doc/fix_pour.txt b/doc/fix_pour.txt
index dba1e452c0..54e22b66cd 100644
--- a/doc/fix_pour.txt
+++ b/doc/fix_pour.txt
@@ -108,11 +108,11 @@ produce the same behavior if you adjust the fix pour parameters
 appropriately.
 
 None of the "fix_modify"_fix_modify.html options are relevant to this
-fix.  No global scalar or vector or per-atom quantities are stored by
-this fix for access by various "output
-commands"_Section_howto.html#4_15.  No parameter of this fix can be
-used with the {start/stop} keywords of the "run"_run.html command.
-This fix is not invoked during "energy minimization"_minimize.html.
+fix.  No global or per-atom quantities are stored by this fix for
+access by various "output commands"_Section_howto.html#4_15.  No
+parameter of this fix can be used with the {start/stop} keywords of
+the "run"_run.html command.  This fix is not invoked during "energy
+minimization"_minimize.html.
 
 [Restrictions:]
 
diff --git a/doc/fix_press_berendsen.html b/doc/fix_press_berendsen.html
index 12f0a94a70..3e827822ef 100644
--- a/doc/fix_press_berendsen.html
+++ b/doc/fix_press_berendsen.html
@@ -13,45 +13,36 @@
 
 
                Syntax:
 
                
-
                fix ID group-ID press/berendsen p-style args keyword value ... 
+
                fix ID group-ID press/berendsen keyword value ... 
 
                
 
                • ID, group-ID are documented in fix command 
 
 
                • press/berendsen = style name of this fix command 
 
-
                • p-style = xyz or xy or yz or xz or aniso 
-
-
                    xyz args = Pstart Pstop Pdamp
-    Pstart,Pstop = desired pressure at start/end of run (pressure units)
+
                  one or more keyword value pairs may be appended
+keyword = iso or aniso or x or y or z or couple or dilate or modulus
+  iso or aniso values = Pstart Pstop Pdamp
+    Pstart,Pstop = scalar external pressure at start/end of run (pressure units)
     Pdamp = pressure damping parameter (time units)
-  xy or yz or xz args = Px0 Px1 Py0 Py1 Pz0 Pz1 Pdamp
-    Px0,Px1,Py0,Py1,Pz0,Pz1 = desired pressure in x,y,z at 
-      start/end (0/1) of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  aniso args = Px0 Px1 Py0 Py1 Pz0 Pz1 Pdamp
-    Px0,Px1,Py0,Py1,Pz0,Pz1 = desired pressure in x,y,z at
-      start/end (0/1) of run (pressure units)
-    Pdamp = pressure damping parameter (time units) 
-
                  
-
                • zero or more keyword/value pairs may be appended 
-
-
                • keyword = dilate or modulus 
-
-
                    dilate value = all or partial
-  modulus value = bulk modulus of system (pressure units) 
+  x or y or z values = Pstart Pstop Pdamp
+    Pstart,Pstop = external stress tensor component at start/end of run (pressure units)
+    Pdamp = stress damping parameter (time units)
+  couple = none or xyz or xy or yz or xz
+  modulus value = bulk modulus of system (pressure units)
+  dilate value = all or partial 
 
                  
 
 
                
 
                Examples:
 
                
-
                fix 1 all press/berendsen xyz 0.0 0.0 1000.0
-fix 2 all press/berendsen aniso 0.0 0.0 0.0 0.0 NULL NULL 1000.0 dilate partial 
+
                fix 1 all press/berendsen iso 0.0 0.0 1000.0
+fix 2 all press/berendsen aniso 0.0 0.0 1000.0 dilate partial 
 
                
 
                Description:
 
                
 
                Reset the pressure of the system by using a Berendsen barostat
 (Berendsen), which rescales the system volume and
-(optionally) the atoms coordinates withing the simulation box every
+(optionally) the atoms coordinates within the simulation box every
 timestep.
 
                
 
                Regardless of what atoms are in the fix group, a global pressure is
@@ -62,15 +53,15 @@ only the atoms in the fix group are re-scaled.  The latter can be
 useful for leaving the coordinates of atoms in a solid substrate
 unchanged and controlling the pressure of a surrounding fluid.
 
                
-
                IMPORTANT NOTE: Unlike the fix npt or fix
+
                IMPORTANT NOTE: Unlike the fix npt or fix
 nph commands which perform Nose/Hoover barostatting AND
 time integration, this fix does NOT perform time integration.  It only
 modifies the box size and atom coordinates to effect barostatting.
 Thus you must use a separate time integration fix, like fix
-nve or fix nvt to actually update the
+nve or fix nvt to actually update the
 positions and velocities of atoms.  This fix can be used in
 conjunction with thermostatting fixes to control the temperature, such
-as fix nvt or fix langevin or fix
+as fix nvt or fix langevin or fix
 temp/berendsen.
 
                
 
                See this howto section of the manual for a
@@ -79,57 +70,32 @@ thermostatting and barostatting.
 
                
 
                
 
-
                The pressure can be controlled in one of several styles, as specified
-by the p-style argument.  In each case, the desired pressure at each
-timestep is a ramped value during the run from the starting value to
-the end value.
+
                The barostat is specified using one or more of the iso, aniso,
+x, y, z, and couple keywords.  These keywords give you the
+ability to specify the 3 diagonal components of an external stress
+tensor, and to couple various of these components together so that the
+dimensions they represent are varied together during a
+constant-pressure simulation.  Unlike the fix npt and
+fix nph commands, this fix cannot be used with
+triclinic (non-orthogonal) simulation boxes to control all 6
+components of the general pressure tensor.
 
                
-
                Style xyz means couple all dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the dimensions
-together.
+
                The target pressures for each of the 3 diagonal components of the
+stress tensor can be specified independently via the x, y, z,
+keywords, which correspond to the 3 simulation box dimensions.  For
+each component, the external pressure or tensor component at each
+timestep is a ramped value during the run from Pstart to Pstop.
+If a target pressure is specified for a component, then the
+corresponding box dimension will change during a simulation.  For
+example, if the y keyword is used, the y-box length will change.  A
+box dimension will not change if that component is not specified,
+although you have the option to change that dimension via the fix
+deform command.
 
                
-
                Styles xy or yz or xz means that the 2 specified dimensions are
-coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently, using its pressure component as the driving force.
-These styles cannot be used for a 2d simulation.
-
                
-
                For style aniso, all dimensions dilate/contract independently using
-their individual pressure components as the driving forces.
-
                
-
                For any of the styles except xyz, any of the independent pressure
-components (e.g. z in xy, or any dimension in aniso) can have
-their target pressures (both start and stop values) specified as NULL.
-This means that no pressure control is applied to that dimension so
-that the box dimension remains unchanged.  For a 2d simulation the z
-pressure components must be specified as NULL when using style
-aniso.
-
                
-
                For styles xy and yz and xz, the starting and stopping pressures
-must be the same for the two coupled dimensions and cannot be
-specified as NULL.
-
                
-
                In some cases (e.g. for solids) the pressure (volume) and/or
-temperature of the system can oscillate undesirably when a Nose/Hoover
-barostat is applied.  The optional drag keyword will damp these
-oscillations, although it alters the Nose/Hoover equations.  A value
-of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.  A
-non-zero value adds a drag term; the larger the value specified, the
-greater the damping effect.  Performing a short run and monitoring the
-pressure is the best way to determine if the drag term is working.
-Typically a value between 0.2 to 2.0 is sufficient to damp
-oscillations after a few periods.
-
                
-
                For all pressure styles, the simulation box stays rectangular in
-shape.  Parinello-Rahman boundary condition for tilted boxes
-(triclinic symmetry) are supported by other LAMMPS commands (see this
-section of the manual), but not yet by this
-command.
-
                
-
                For all styles, the Pdamp parameter determines the time scale on
-which pressure is relaxed.  For example, a value of 1000.0 means to
-relax the pressure in a timespan of (roughly) 1000 time units (tau or
-fmsec or psec - see the units command).
+
                For all barostat keywords, the Pdamp parameter determines the time
+scale on which pressure is relaxed.  For example, a value of 1000.0
+means to relax the pressure in a timespan of (roughly) 1000 time units
+(tau or fmsec or psec - see the units command).
 
                
 
                IMPORTANT NOTE: The relaxation time is actually also a function of the
 bulk modulus of the system (inverse of isothermal compressibility).
@@ -149,6 +115,47 @@ values of Pdamp and/or the modulus when using this fix.
 
                
 
                
 
+
                The couple keyword allows two or three of the diagonal components of
+the pressure tensor to be "coupled" together.  The value specified
+with the keyword determines which are coupled.  For example, xz
+means the Pxx and Pzz components of the stress tensor are coupled.
+Xyz means all 3 diagonal components are coupled.  Coupling means two
+things: the instantaneous stress will be computed as an average of the
+corresponding diagonal components, and the coupled box dimensions will
+be changed together in lockstep, meaning coupled dimensions will be
+dilated or contracted by the same percentage every timestep.  The
+Pstart, Pstop, Pdamp parameters for any coupled dimensions must
+be identical.  Couple xyz can be used for a 2d simulation; the z
+dimension is simply ignored.
+
                
+
                
+
+
                The iso and aniso keywords are simply shortcuts that are
+equivalent to specifying several other keywords together.
+
                
+
                The keyword iso means couple all 3 diagonal components together when
+pressure is computed (hydrostatic pressure), and dilate/contract the
+dimensions together.  Using "iso Pstart Pstop Pdamp" is the same as
+specifying these 4 keywords:
+
                
+
                x Pstart Pstop Pdamp
+y Pstart Pstop Pdamp
+z Pstart Pstop Pdamp
+couple xyz 
+
                
+
                The keyword aniso means x, y, and z dimensions are controlled
+independently using the Pxx, Pyy, and Pzz components of the
+stress tensor as the driving forces, and the specified scalar external
+pressure.  Using "aniso Pstart Pstop Pdamp" is the same as specifying
+these 4 keywords:
+
                
+
                x Pstart Pstop Pdamp
+y Pstart Pstop Pdamp
+z Pstart Pstop Pdamp
+couple none 
+
                
+
                
+
 
                This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp" and "pressure",
 as if these commands had been issued:
@@ -186,8 +193,8 @@ consistent with the virial term computed using all atoms for the
 pressure.  LAMMPS will warn you if you choose to compute temperature
 on a subset of atoms.
 
                
-
                No global scalar or vector or per-atom quantities are stored by this
-fix for access by various output commands.
+
                No global or per-atom quantities are stored by this fix for access by
+various output commands.
 
                
 
                This fix can ramp its target pressure over multiple runs, using the
 start and stop keywords of the run command.  See the
@@ -203,7 +210,7 @@ non-periodic or periodic.
 
                
 
                Related commands:
 
                
-
                fix nve, fix nph, fix
+
                fix nve, fix nph, fix
 npt, fix temp/berendsen,
 fix_modify
 
                
diff --git a/doc/fix_press_berendsen.txt b/doc/fix_press_berendsen.txt
index 189657768d..fef8af2e34 100644
--- a/doc/fix_press_berendsen.txt
+++ b/doc/fix_press_berendsen.txt
@@ -10,39 +10,33 @@ fix press/berendsen command :h3
 
 [Syntax:]
 
-fix ID group-ID press/berendsen p-style args keyword value ... :pre
+fix ID group-ID press/berendsen keyword value ... :pre
 
 ID, group-ID are documented in "fix"_fix.html command :ulb,l
 press/berendsen = style name of this fix command :l
-p-style = {xyz} or {xy} or {yz} or {xz} or {aniso} :l
-  {xyz} args = Pstart Pstop Pdamp
-    Pstart,Pstop = desired pressure at start/end of run (pressure units)
+one or more keyword value pairs may be appended
+keyword = {iso} or {aniso} or {x} or {y} or {z} or {couple} or {dilate} or {modulus}
+  {iso} or {aniso} values = Pstart Pstop Pdamp
+    Pstart,Pstop = scalar external pressure at start/end of run (pressure units)
     Pdamp = pressure damping parameter (time units)
-  {xy} or {yz} or {xz} args = Px0 Px1 Py0 Py1 Pz0 Pz1 Pdamp
-    Px0,Px1,Py0,Py1,Pz0,Pz1 = desired pressure in x,y,z at 
-      start/end (0/1) of run (pressure units)
-    Pdamp = pressure damping parameter (time units)
-  {aniso} args = Px0 Px1 Py0 Py1 Pz0 Pz1 Pdamp
-    Px0,Px1,Py0,Py1,Pz0,Pz1 = desired pressure in x,y,z at
-      start/end (0/1) of run (pressure units)
-    Pdamp = pressure damping parameter (time units) :pre
-
-zero or more keyword/value pairs may be appended :l
-keyword = {dilate} or {modulus} :l
-  {dilate} value = {all} or {partial}
-  {modulus} value = bulk modulus of system (pressure units) :pre
+  {x} or {y} or {z} values = Pstart Pstop Pdamp
+    Pstart,Pstop = external stress tensor component at start/end of run (pressure units)
+    Pdamp = stress damping parameter (time units)
+  {couple} = {none} or {xyz} or {xy} or {yz} or {xz}
+  {modulus} value = bulk modulus of system (pressure units)
+  {dilate} value = {all} or {partial} :pre
 :ule
 
 [Examples:]
 
-fix 1 all press/berendsen xyz 0.0 0.0 1000.0
-fix 2 all press/berendsen aniso 0.0 0.0 0.0 0.0 NULL NULL 1000.0 dilate partial :pre
+fix 1 all press/berendsen iso 0.0 0.0 1000.0
+fix 2 all press/berendsen aniso 0.0 0.0 1000.0 dilate partial :pre
 
 [Description:]
 
 Reset the pressure of the system by using a Berendsen barostat
 "(Berendsen)"_#Berendsen, which rescales the system volume and
-(optionally) the atoms coordinates withing the simulation box every
+(optionally) the atoms coordinates within the simulation box every
 timestep.
 
 Regardless of what atoms are in the fix group, a global pressure is
@@ -53,15 +47,15 @@ only the atoms in the fix group are re-scaled.  The latter can be
 useful for leaving the coordinates of atoms in a solid substrate
 unchanged and controlling the pressure of a surrounding fluid.
 
-IMPORTANT NOTE: Unlike the "fix npt"_fix_npt.html or "fix
-nph"_fix_nph.html commands which perform Nose/Hoover barostatting AND
+IMPORTANT NOTE: Unlike the "fix npt"_fix_nh.html or "fix
+nph"_fix_nh.html commands which perform Nose/Hoover barostatting AND
 time integration, this fix does NOT perform time integration.  It only
 modifies the box size and atom coordinates to effect barostatting.
 Thus you must use a separate time integration fix, like "fix
-nve"_fix_nve.html or "fix nvt"_fix_nvt.html to actually update the
+nve"_fix_nve.html or "fix nvt"_fix_nh.html to actually update the
 positions and velocities of atoms.  This fix can be used in
 conjunction with thermostatting fixes to control the temperature, such
-as "fix nvt"_fix_nvt.html or "fix langevin"_fix_langevin.html or "fix
+as "fix nvt"_fix_nh.html or "fix langevin"_fix_langevin.html or "fix
 temp/berendsen"_fix_temp_berendsen.html.
 
 See "this howto section"_Section_howto.html#4_16 of the manual for a
@@ -70,57 +64,32 @@ thermostatting and barostatting.
 
 :line
 
-The pressure can be controlled in one of several styles, as specified
-by the {p-style} argument.  In each case, the desired pressure at each
-timestep is a ramped value during the run from the starting value to
-the end value.
+The barostat is specified using one or more of the {iso}, {aniso},
+{x}, {y}, {z}, and {couple} keywords.  These keywords give you the
+ability to specify the 3 diagonal components of an external stress
+tensor, and to couple various of these components together so that the
+dimensions they represent are varied together during a
+constant-pressure simulation.  Unlike the "fix npt"_fix_npt.html and
+"fix nph"_fix_nph.html commands, this fix cannot be used with
+triclinic (non-orthogonal) simulation boxes to control all 6
+components of the general pressure tensor.
 
-Style {xyz} means couple all dimensions together when pressure is
-computed (isotropic pressure), and dilate/contract the dimensions
-together.
+The target pressures for each of the 3 diagonal components of the
+stress tensor can be specified independently via the {x}, {y}, {z},
+keywords, which correspond to the 3 simulation box dimensions.  For
+each component, the external pressure or tensor component at each
+timestep is a ramped value during the run from {Pstart} to {Pstop}.
+If a target pressure is specified for a component, then the
+corresponding box dimension will change during a simulation.  For
+example, if the {y} keyword is used, the y-box length will change.  A
+box dimension will not change if that component is not specified,
+although you have the option to change that dimension via the "fix
+deform"_fix_deform.html command.
 
-Styles {xy} or {yz} or {xz} means that the 2 specified dimensions are
-coupled together, both for pressure computation and for
-dilation/contraction.  The 3rd dimension dilates/contracts
-independently, using its pressure component as the driving force.
-These styles cannot be used for a 2d simulation.
-
-For style {aniso}, all dimensions dilate/contract independently using
-their individual pressure components as the driving forces.
-
-For any of the styles except {xyz}, any of the independent pressure
-components (e.g. z in {xy}, or any dimension in {aniso}) can have
-their target pressures (both start and stop values) specified as NULL.
-This means that no pressure control is applied to that dimension so
-that the box dimension remains unchanged.  For a 2d simulation the z
-pressure components must be specified as NULL when using style
-{aniso}.
-
-For styles {xy} and {yz} and {xz}, the starting and stopping pressures
-must be the same for the two coupled dimensions and cannot be
-specified as NULL.
-
-In some cases (e.g. for solids) the pressure (volume) and/or
-temperature of the system can oscillate undesirably when a Nose/Hoover
-barostat is applied.  The optional {drag} keyword will damp these
-oscillations, although it alters the Nose/Hoover equations.  A value
-of 0.0 (no drag) leaves the Nose/Hoover formalism unchanged.  A
-non-zero value adds a drag term; the larger the value specified, the
-greater the damping effect.  Performing a short run and monitoring the
-pressure is the best way to determine if the drag term is working.
-Typically a value between 0.2 to 2.0 is sufficient to damp
-oscillations after a few periods.
-
-For all pressure styles, the simulation box stays rectangular in
-shape.  Parinello-Rahman boundary condition for tilted boxes
-(triclinic symmetry) are supported by other LAMMPS commands (see "this
-section"_Section_howto.html#4_12 of the manual), but not yet by this
-command.
-
-For all styles, the {Pdamp} parameter determines the time scale on
-which pressure is relaxed.  For example, a value of 1000.0 means to
-relax the pressure in a timespan of (roughly) 1000 time units (tau or
-fmsec or psec - see the "units"_units.html command).
+For all barostat keywords, the {Pdamp} parameter determines the time
+scale on which pressure is relaxed.  For example, a value of 1000.0
+means to relax the pressure in a timespan of (roughly) 1000 time units
+(tau or fmsec or psec - see the "units"_units.html command).
 
 IMPORTANT NOTE: The relaxation time is actually also a function of the
 bulk modulus of the system (inverse of isothermal compressibility).
@@ -140,6 +109,47 @@ values of {Pdamp} and/or the {modulus} when using this fix.
 
 :line
 
+The {couple} keyword allows two or three of the diagonal components of
+the pressure tensor to be "coupled" together.  The value specified
+with the keyword determines which are coupled.  For example, {xz}
+means the {Pxx} and {Pzz} components of the stress tensor are coupled.
+{Xyz} means all 3 diagonal components are coupled.  Coupling means two
+things: the instantaneous stress will be computed as an average of the
+corresponding diagonal components, and the coupled box dimensions will
+be changed together in lockstep, meaning coupled dimensions will be
+dilated or contracted by the same percentage every timestep.  The
+{Pstart}, {Pstop}, {Pdamp} parameters for any coupled dimensions must
+be identical.  {Couple xyz} can be used for a 2d simulation; the {z}
+dimension is simply ignored.
+
+:line
+
+The {iso} and {aniso} keywords are simply shortcuts that are
+equivalent to specifying several other keywords together.
+
+The keyword {iso} means couple all 3 diagonal components together when
+pressure is computed (hydrostatic pressure), and dilate/contract the
+dimensions together.  Using "iso Pstart Pstop Pdamp" is the same as
+specifying these 4 keywords:
+
+x Pstart Pstop Pdamp
+y Pstart Pstop Pdamp
+z Pstart Pstop Pdamp
+couple xyz :pre
+
+The keyword {aniso} means {x}, {y}, and {z} dimensions are controlled
+independently using the {Pxx}, {Pyy}, and {Pzz} components of the
+stress tensor as the driving forces, and the specified scalar external
+pressure.  Using "aniso Pstart Pstop Pdamp" is the same as specifying
+these 4 keywords:
+
+x Pstart Pstop Pdamp
+y Pstart Pstop Pdamp
+z Pstart Pstop Pdamp
+couple none :pre
+
+:line
+
 This fix computes a temperature and pressure each timestep.  To do
 this, the fix creates its own computes of style "temp" and "pressure",
 as if these commands had been issued:
@@ -177,8 +187,8 @@ consistent with the virial term computed using all atoms for the
 pressure.  LAMMPS will warn you if you choose to compute temperature
 on a subset of atoms.
 
-No global scalar or vector or per-atom quantities are stored by this
-fix for access by various "output commands"_Section_howto.html#4_15.
+No global or per-atom quantities are stored by this fix for access by
+various "output commands"_Section_howto.html#4_15.
 
 This fix can ramp its target pressure over multiple runs, using the
 {start} and {stop} keywords of the "run"_run.html command.  See the
@@ -194,8 +204,8 @@ non-periodic or periodic.
 
 [Related commands:]
 
-"fix nve"_fix_nve.html, "fix nph"_fix_nph.html, "fix
-npt"_fix_npt.html, "fix temp/berendsen"_fix_temp_berendsen.html,
+"fix nve"_fix_nve.html, "fix nph"_fix_nh.html, "fix
+npt"_fix_nh.html, "fix temp/berendsen"_fix_temp_berendsen.html,
 "fix_modify"_fix_modify.html
 
 [Default:]
diff --git a/doc/fix_print.html b/doc/fix_print.html
index 2ac9747303..5a4282a777 100644
--- a/doc/fix_print.html
+++ b/doc/fix_print.html
@@ -80,8 +80,8 @@ keyword was used.  By default, the title line is as follows:
 
                
 
                No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_print.txt b/doc/fix_print.txt
index 393f841868..7827bc6aef 100644
--- a/doc/fix_print.txt
+++ b/doc/fix_print.txt
@@ -70,8 +70,8 @@ where ID is replaced with the fix-ID.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_reax_bonds.html b/doc/fix_reax_bonds.html
index aa60548fa8..113b2c9827 100644
--- a/doc/fix_reax_bonds.html
+++ b/doc/fix_reax_bonds.html
@@ -39,8 +39,8 @@ including timestep 0.
 
                
 
                No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_reax_bonds.txt b/doc/fix_reax_bonds.txt
index 5e59485444..7414083e04 100644
--- a/doc/fix_reax_bonds.txt
+++ b/doc/fix_reax_bonds.txt
@@ -36,8 +36,8 @@ The format of the output file should be self-explantory.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_recenter.html b/doc/fix_recenter.html
index b14b01f64a..d4a08370d8 100644
--- a/doc/fix_recenter.html
+++ b/doc/fix_recenter.html
@@ -76,7 +76,7 @@ velocities with zero aggregate linear and/or angular momentum.
 
                
 
                IMPORTANT NOTE: This fix performs its operations at the same point in
 the timestep as other time integration fixes, such as fix
-nve, fix nvt, or fix npt.
+nve, fix nvt, or fix npt.
 Thus fix recenter should normally be the last such fix specified in
 the input script, since the adjustments it makes to atom coordinates
 should come after the changes made by time integration.  LAMMPS will
@@ -99,8 +99,8 @@ to tether the molecule in place.
 
                
 
                No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_recenter.txt b/doc/fix_recenter.txt
index 17fa345772..6040f51780 100644
--- a/doc/fix_recenter.txt
+++ b/doc/fix_recenter.txt
@@ -68,7 +68,7 @@ velocities with zero aggregate linear and/or angular momentum.
 
 IMPORTANT NOTE: This fix performs its operations at the same point in
 the timestep as other time integration fixes, such as "fix
-nve"_fix_nve.html, "fix nvt"_fix_nvt.html, or "fix npt"_fix_npt.html.
+nve"_fix_nve.html, "fix nvt"_fix_nh.html, or "fix npt"_fix_nh.html.
 Thus fix recenter should normally be the last such fix specified in
 the input script, since the adjustments it makes to atom coordinates
 should come after the changes made by time integration.  LAMMPS will
@@ -91,8 +91,8 @@ to tether the molecule in place.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_setforce.html b/doc/fix_setforce.html
index 8a5cbba152..5adc3a666a 100644
--- a/doc/fix_setforce.html
+++ b/doc/fix_setforce.html
@@ -41,11 +41,11 @@ alter the force component in that dimension.
 files.  None of the fix_modify options
 are relevant to this fix.
 
                
-
                This fix computes a 3-vector of forces, which can be accessed by
-various output commands.  This is the total
-force on the group of atoms before the forces on individual atoms are
-changed by the fix.  The vector values calculated by this fix are
-"extensive".
+
                This fix computes a global 3-vector of forces, which can be accessed
+by various output commands.  This is the
+total force on the group of atoms before the forces on individual
+atoms are changed by the fix.  The vector values calculated by this
+fix are "extensive".
 
                
 
                No parameter of this fix can be used with the start/stop keywords of
 the run command.
diff --git a/doc/fix_setforce.txt b/doc/fix_setforce.txt
index 4e3b98aa90..7f46b8de66 100644
--- a/doc/fix_setforce.txt
+++ b/doc/fix_setforce.txt
@@ -38,11 +38,11 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-This fix computes a 3-vector of forces, which can be accessed by
-various "output commands"_Section_howto.html#4_15.  This is the total
-force on the group of atoms before the forces on individual atoms are
-changed by the fix.  The vector values calculated by this fix are
-"extensive".
+This fix computes a global 3-vector of forces, which can be accessed
+by various "output commands"_Section_howto.html#4_15.  This is the
+total force on the group of atoms before the forces on individual
+atoms are changed by the fix.  The vector values calculated by this
+fix are "extensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.
diff --git a/doc/fix_shake.html b/doc/fix_shake.html
index 1e1c0260d5..60889344b4 100644
--- a/doc/fix_shake.html
+++ b/doc/fix_shake.html
@@ -90,8 +90,8 @@ for.
 
                
 
                No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_shake.txt b/doc/fix_shake.txt
index 9f3193bc7b..82a5361aca 100644
--- a/doc/fix_shake.txt
+++ b/doc/fix_shake.txt
@@ -79,8 +79,8 @@ for.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_spring.html b/doc/fix_spring.html
index 51615579a0..d8f83fa3fb 100644
--- a/doc/fix_spring.html
+++ b/doc/fix_spring.html
@@ -100,20 +100,20 @@ files.
 fix to add the energy stored in the spring to the system's potential
 energy as part of thermodynamic output.
 
                
-
                This fix computes a scalar energy which can be accessed by various
-output commands.  This energy is spring
+
                This fix computes a global scalar which can be accessed by various
+output commands.  The scalar is the spring
 energy = 0.5 * K * r^2.
 
                
-
                This fix also computes 4 output quantities stored in a vector of
-length 4, which can be accessed by various output
-commands.  The first 3 quantities are xyz
-components of the total force added to the group of atoms by the
-spring.  In the case of the couple style, it is the force on the fix
-group (group-ID) or the negative of the force on the 2nd group
-(group-ID2).  The 4th quantity is the magnitude of the force added by
-the spring, as a positive value if (r-R0) > 0 and a negative value if
-(r-R0) < 0.  This sign convention can be useful when using the spring
-force to compute a potential of mean force (PMF).
+
                This fix also computes global 4-vector which can be accessed by
+various output commands.  The first 3
+quantities in the vector are xyz components of the total force added
+to the group of atoms by the spring.  In the case of the couple
+style, it is the force on the fix group (group-ID) or the negative of
+the force on the 2nd group (group-ID2).  The 4th quantity in the
+vector is the magnitude of the force added by the spring, as a
+positive value if (r-R0) > 0 and a negative value if (r-R0) < 0.  This
+sign convention can be useful when using the spring force to compute a
+potential of mean force (PMF).
 
                
 
                The scalar and vector values calculated by this fix are "extensive".
 
                
diff --git a/doc/fix_spring.txt b/doc/fix_spring.txt
index 9508d0abab..cf8478b327 100644
--- a/doc/fix_spring.txt
+++ b/doc/fix_spring.txt
@@ -93,20 +93,20 @@ The "fix_modify"_fix_modify.html {energy} option is supported by this
 fix to add the energy stored in the spring to the system's potential
 energy as part of "thermodynamic output"_thermo_style.html.
 
-This fix computes a scalar energy which can be accessed by various
-"output commands"_Section_howto.html#4_15.  This energy is spring
+This fix computes a global scalar which can be accessed by various
+"output commands"_Section_howto.html#4_15.  The scalar is the spring
 energy = 0.5 * K * r^2.
 
-This fix also computes 4 output quantities stored in a vector of
-length 4, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The first 3 quantities are xyz
-components of the total force added to the group of atoms by the
-spring.  In the case of the {couple} style, it is the force on the fix
-group (group-ID) or the negative of the force on the 2nd group
-(group-ID2).  The 4th quantity is the magnitude of the force added by
-the spring, as a positive value if (r-R0) > 0 and a negative value if
-(r-R0) < 0.  This sign convention can be useful when using the spring
-force to compute a potential of mean force (PMF).
+This fix also computes global 4-vector which can be accessed by
+various "output commands"_Section_howto.html#4_15.  The first 3
+quantities in the vector are xyz components of the total force added
+to the group of atoms by the spring.  In the case of the {couple}
+style, it is the force on the fix group (group-ID) or the negative of
+the force on the 2nd group (group-ID2).  The 4th quantity in the
+vector is the magnitude of the force added by the spring, as a
+positive value if (r-R0) > 0 and a negative value if (r-R0) < 0.  This
+sign convention can be useful when using the spring force to compute a
+potential of mean force (PMF).
 
 The scalar and vector values calculated by this fix are "extensive".
 
diff --git a/doc/fix_spring_rg.html b/doc/fix_spring_rg.html
index 3c3d7b0fab..e2ceba3dee 100644
--- a/doc/fix_spring_rg.html
+++ b/doc/fix_spring_rg.html
@@ -54,8 +54,8 @@ the time the fix is specified, and that value is used as the target.
 
                
 
                No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_spring_rg.txt b/doc/fix_spring_rg.txt
index 58808bed55..c87fd486ff 100644
--- a/doc/fix_spring_rg.txt
+++ b/doc/fix_spring_rg.txt
@@ -50,8 +50,8 @@ the time the fix is specified, and that value is used as the target.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_spring_self.html b/doc/fix_spring_self.html
index 19e5e1ccc3..69d612edc3 100644
--- a/doc/fix_spring_self.html
+++ b/doc/fix_spring_self.html
@@ -45,10 +45,11 @@ operation of the fix continues in an uninterrupted fashion.
 fix to add the energy stored in the per-atom springs to the system's
 potential energy as part of thermodynamic output.
 
                
-
                This fix computes a scalar energy which can be accessed by various
-output commands.  This energy is the sum of
-the spring energy for each atom, where the per-atom energy is 0.5 * K
-* r^2.
+
                This fix computes a global scalar which can be accessed by various
+output commands.  The scalar is an energy
+which is the sum of the spring energy for each atom, where the
+per-atom energy is 0.5 * K * r^2.  The scalar value calculated by this
+fix is "extensive".
 
                
 
                No parameter of this fix can be used with the start/stop keywords of
 the run command.
diff --git a/doc/fix_spring_self.txt b/doc/fix_spring_self.txt
index a7a36b0020..fe385f5db5 100644
--- a/doc/fix_spring_self.txt
+++ b/doc/fix_spring_self.txt
@@ -42,10 +42,11 @@ The "fix_modify"_fix_modify.html {energy} option is supported by this
 fix to add the energy stored in the per-atom springs to the system's
 potential energy as part of "thermodynamic output"_thermo_style.html.
 
-This fix computes a scalar energy which can be accessed by various
-"output commands"_Section_howto.html#4_15.  This energy is the sum of
-the spring energy for each atom, where the per-atom energy is 0.5 * K
-* r^2.
+This fix computes a global scalar which can be accessed by various
+"output commands"_Section_howto.html#4_15.  The scalar is an energy
+which is the sum of the spring energy for each atom, where the
+per-atom energy is 0.5 * K * r^2.  The scalar value calculated by this
+fix is "extensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.
diff --git a/doc/fix_temp_berendsen.html b/doc/fix_temp_berendsen.html
index 7439e8cec0..6a1a6d36d8 100644
--- a/doc/fix_temp_berendsen.html
+++ b/doc/fix_temp_berendsen.html
@@ -44,14 +44,14 @@ example, a value of 100.0 means to relax the temperature in a timespan
 of (roughly) 100 time units (tau or fmsec or psec - see the
 units command).
 
                
-
                IMPORTANT NOTE: Unlike the fix nvt command which
+
                IMPORTANT NOTE: Unlike the fix nvt command which
 performs Nose/Hoover thermostatting AND time integration, this fix
 does NOT perform time integration.  It only modifies velocities to
 effect thermostatting.  Thus you must use a separate time integration
 fix, like fix nve to actually update the positions of
 atoms using the modified velocities.  Likewise, this fix should not
 normally be used on atoms that also have their temperature controlled
-by another fix - e.g. by fix nvt or fix
+by another fix - e.g. by fix nvt or fix
 langevin commands.
 
                
 
                See this howto section of the manual for a
@@ -104,8 +104,8 @@ you have defined to this fix which will be used in its thermostatting
 procedure, as described above.  For consistency, the group used by
 this fix and by the compute should be the same.
 
                
-
                No global scalar or vector or per-atom quantities are stored by this
-fix for access by various output commands.
+
                No global or per-atom quantities are stored by this fix for access by
+various output commands.
 
                
 
                This fix can ramp its target temperature over multiple runs, using the
 start and stop keywords of the run command.  See the
@@ -117,7 +117,7 @@ fix for access by various output commands
 
                Related commands:
 
                
-
                fix nve, fix nvt, fix
+
                fix nve, fix nvt, fix
 temp/rescale, fix langevin,
 fix_modify, compute temp,
 fix press/berendsen
diff --git a/doc/fix_temp_berendsen.txt b/doc/fix_temp_berendsen.txt
index b06435a9cb..b480ec9632 100644
--- a/doc/fix_temp_berendsen.txt
+++ b/doc/fix_temp_berendsen.txt
@@ -41,14 +41,14 @@ example, a value of 100.0 means to relax the temperature in a timespan
 of (roughly) 100 time units (tau or fmsec or psec - see the
 "units"_units.html command).
 
-IMPORTANT NOTE: Unlike the "fix nvt"_fix_nvt.html command which
+IMPORTANT NOTE: Unlike the "fix nvt"_fix_nh.html command which
 performs Nose/Hoover thermostatting AND time integration, this fix
 does NOT perform time integration.  It only modifies velocities to
 effect thermostatting.  Thus you must use a separate time integration
 fix, like "fix nve"_fix_nve.html to actually update the positions of
 atoms using the modified velocities.  Likewise, this fix should not
 normally be used on atoms that also have their temperature controlled
-by another fix - e.g. by "fix nvt"_fix_nvt.html or "fix
+by another fix - e.g. by "fix nvt"_fix_nh.html or "fix
 langevin"_fix_langevin.html commands.
 
 See "this howto section"_Section_howto.html#4_16 of the manual for a
@@ -101,8 +101,8 @@ you have defined to this fix which will be used in its thermostatting
 procedure, as described above.  For consistency, the group used by
 this fix and by the compute should be the same.
 
-No global scalar or vector or per-atom quantities are stored by this
-fix for access by various "output commands"_Section_howto.html#4_15.
+No global or per-atom quantities are stored by this fix for access by
+various "output commands"_Section_howto.html#4_15.
 
 This fix can ramp its target temperature over multiple runs, using the
 {start} and {stop} keywords of the "run"_run.html command.  See the
@@ -114,7 +114,7 @@ This fix is not invoked during "energy minimization"_minimize.html.
 
 [Related commands:]
 
-"fix nve"_fix_nve.html, "fix nvt"_fix_nvt.html, "fix
+"fix nve"_fix_nve.html, "fix nvt"_fix_nh.html, "fix
 temp/rescale"_fix_temp_rescale.html, "fix langevin"_fix_langevin.html,
 "fix_modify"_fix_modify.html, "compute temp"_compute_temp.html,
 "fix press/berendsen"_fix_press_berendsen.html
diff --git a/doc/fix_temp_rescale.html b/doc/fix_temp_rescale.html
index d320c24957..05896d6c36 100644
--- a/doc/fix_temp_rescale.html
+++ b/doc/fix_temp_rescale.html
@@ -51,14 +51,14 @@ difference between the actual and desired temperature.  E.g. if
 fraction = 1.0, the temperature is reset to exactly the desired
 value.
 
                
-
                IMPORTANT NOTE: Unlike the fix nvt command which
+
                IMPORTANT NOTE: Unlike the fix nvt command which
 performs Nose/Hoover thermostatting AND time integration, this fix
 does NOT perform time integration.  It only modifies velocities to
 effect thermostatting.  Thus you must use a separate time integration
 fix, like fix nve to actually update the positions of
 atoms using the modified velocities.  Likewise, this fix should not
 normally be used on atoms that also have their temperature controlled
-by another fix - e.g. by fix nvt or fix
+by another fix - e.g. by fix nvt or fix
 langevin commands.
 
                
 
                See this howto section of the manual for a
@@ -116,10 +116,10 @@ fix to add the energy change implied by a velocity rescaling to the
 system's potential energy as part of thermodynamic
 output.
 
                
-
                The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various output
-commands.  The scalar value calculated by
-this fix is "extensive".
+
                This fix computes a global scalar which can be accessed by various
+output commands.  The scalar is the
+cummulative energy change due to this fix.  The scalar value
+calculated by this fix is "extensive".
 
                
 
                This fix can ramp its target temperature over multiple runs, using the
 start and stop keywords of the run command.  See the
@@ -131,7 +131,7 @@ this fix is "extensive".
 
                
 
                Related commands:
 
                
-
                fix langevin, fix nvt,
+
                fix langevin, fix nvt,
 fix_modify
 
                
 
                Default: none
diff --git a/doc/fix_temp_rescale.txt b/doc/fix_temp_rescale.txt
index 353c8a08d8..f972ce7413 100644
--- a/doc/fix_temp_rescale.txt
+++ b/doc/fix_temp_rescale.txt
@@ -48,14 +48,14 @@ difference between the actual and desired temperature.  E.g. if
 {fraction} = 1.0, the temperature is reset to exactly the desired
 value.
 
-IMPORTANT NOTE: Unlike the "fix nvt"_fix_nvt.html command which
+IMPORTANT NOTE: Unlike the "fix nvt"_fix_nh.html command which
 performs Nose/Hoover thermostatting AND time integration, this fix
 does NOT perform time integration.  It only modifies velocities to
 effect thermostatting.  Thus you must use a separate time integration
 fix, like "fix nve"_fix_nve.html to actually update the positions of
 atoms using the modified velocities.  Likewise, this fix should not
 normally be used on atoms that also have their temperature controlled
-by another fix - e.g. by "fix nvt"_fix_nvt.html or "fix
+by another fix - e.g. by "fix nvt"_fix_nh.html or "fix
 langevin"_fix_langevin.html commands.
 
 See "this howto section"_Section_howto.html#4_16 of the manual for a
@@ -113,10 +113,10 @@ fix to add the energy change implied by a velocity rescaling to the
 system's potential energy as part of "thermodynamic
 output"_thermo_style.html.
 
-The cummulative energy change due to this fix is stored as a scalar
-quantity, which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar value calculated by
-this fix is "extensive".
+This fix computes a global scalar which can be accessed by various
+"output commands"_Section_howto.html#4_15.  The scalar is the
+cummulative energy change due to this fix.  The scalar value
+calculated by this fix is "extensive".
 
 This fix can ramp its target temperature over multiple runs, using the
 {start} and {stop} keywords of the "run"_run.html command.  See the
@@ -128,7 +128,7 @@ This fix is not invoked during "energy minimization"_minimize.html.
 
 [Related commands:]
 
-"fix langevin"_fix_langevin.html, "fix nvt"_fix_nvt.html,
+"fix langevin"_fix_langevin.html, "fix nvt"_fix_nh.html,
 "fix_modify"_fix_modify.html
 
 [Default:] none
diff --git a/doc/fix_thermal_conductivity.html b/doc/fix_thermal_conductivity.html
index 719af29a8a..180bf80f65 100644
--- a/doc/fix_thermal_conductivity.html
+++ b/doc/fix_thermal_conductivity.html
@@ -107,15 +107,14 @@ increasing the Nevery parameter.
 files.  None of the fix_modify options
 are relevant to this fix.
 
                
-
                The cummulative kinetic energy transferred between the bottom and
-middle of the simulation box (in the edim direction) is stored as a
-scalar quantity by this fix.  This quantity is zeroed when the fix is
-defined and accumlates thereafter, once every N steps.  The units of
-the quantity are energy; see the units command for
-details.  This quantity can be accessed by various output
-commands, such as thermo_style
-custom.  The scalar value calculated by this fix is
-"intensive".
+
                This fix computes a global scalar which can be accessed by various
+output commands.  The scalar is the
+cummulative kinetic energy transferred between the bottom and middle
+of the simulation box (in the edim direction) is stored as a scalar
+quantity by this fix.  This quantity is zeroed when the fix is defined
+and accumlates thereafter, once every N steps.  The units of the
+quantity are energy; see the units command for details.
+The scalar value calculated by this fix is "intensive".
 
                
 
                No parameter of this fix can be used with the start/stop keywords of
 the run command.  This fix is not invoked during energy
diff --git a/doc/fix_thermal_conductivity.txt b/doc/fix_thermal_conductivity.txt
index 5a1c65248a..f82b2aa474 100644
--- a/doc/fix_thermal_conductivity.txt
+++ b/doc/fix_thermal_conductivity.txt
@@ -97,15 +97,14 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-The cummulative kinetic energy transferred between the bottom and
-middle of the simulation box (in the {edim} direction) is stored as a
-scalar quantity by this fix.  This quantity is zeroed when the fix is
-defined and accumlates thereafter, once every N steps.  The units of
-the quantity are energy; see the "units"_units.html command for
-details.  This quantity can be accessed by various "output
-commands"_Section_howto.html#4_15, such as "thermo_style
-custom"_thermo_style.html.  The scalar value calculated by this fix is
-"intensive".
+This fix computes a global scalar which can be accessed by various
+"output commands"_Section_howto.html#4_15.  The scalar is the
+cummulative kinetic energy transferred between the bottom and middle
+of the simulation box (in the {edim} direction) is stored as a scalar
+quantity by this fix.  This quantity is zeroed when the fix is defined
+and accumlates thereafter, once every N steps.  The units of the
+quantity are energy; see the "units"_units.html command for details.
+The scalar value calculated by this fix is "intensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.  This fix is not invoked during "energy
diff --git a/doc/fix_tmd.html b/doc/fix_tmd.html
index 68609efac3..bf9c8f5d6b 100644
--- a/doc/fix_tmd.html
+++ b/doc/fix_tmd.html
@@ -92,8 +92,8 @@ to prevent it being overwritten.
 
                
 
                No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.
 
                
 
                This fix can ramp its rho parameter over multiple runs, using the
diff --git a/doc/fix_tmd.txt b/doc/fix_tmd.txt
index a522a31441..7ff51ce50c 100644
--- a/doc/fix_tmd.txt
+++ b/doc/fix_tmd.txt
@@ -89,8 +89,8 @@ For more information about TMD, see "(Schlitter1)"_#Schlitter1 and
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.
 
 This fix can ramp its rho parameter over multiple runs, using the
diff --git a/doc/fix_ttm.html b/doc/fix_ttm.html
index 9eafa09048..5c42749f95 100644
--- a/doc/fix_ttm.html
+++ b/doc/fix_ttm.html
@@ -142,7 +142,7 @@ slowest.
 their velocities.  Thus a time integration fix (e.g. fix
 nve) should still be used to time integrate the affected
 atoms.  This fix should not normally be used on atoms that have their
-temperature controlled by another fix - e.g. fix nvt or
+temperature controlled by another fix - e.g. fix nvt or
 fix langevin.
 
                
 
                This fix computes 2 output quantities stored in a vector of
@@ -182,12 +182,12 @@ fix, where the simulation continues on the same as if no restart had
 taken place.  However, in a statistical sense, a restarted simulation
 should produce the same behavior.
 
                
-
                None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
-commands.  No parameter of this fix can be
-used with the start/stop keywords of the run command.
-This fix is not invoked during energy minimization.
+
                None of the fix_modify options are relevant to this
+fix.  No global or per-atom quantities are stored by this fix for
+access by various output commands.  No
+parameter of this fix can be used with the start/stop keywords of
+the run command.  This fix is not invoked during energy
+minimization.
 
                
 
                Restrictions:
 
                
diff --git a/doc/fix_ttm.txt b/doc/fix_ttm.txt
index 63eecb4d2e..01f7b920c6 100644
--- a/doc/fix_ttm.txt
+++ b/doc/fix_ttm.txt
@@ -139,7 +139,7 @@ This fix does not change the coordinates of its atoms; it only scales
 their velocities.  Thus a time integration fix (e.g. "fix
 nve"_fix_nve.html) should still be used to time integrate the affected
 atoms.  This fix should not normally be used on atoms that have their
-temperature controlled by another fix - e.g. "fix nvt"_fix_nvt.html or
+temperature controlled by another fix - e.g. "fix nvt"_fix_nh.html or
 "fix langevin"_fix_langevin.html.
 
 This fix computes 2 output quantities stored in a vector of
@@ -179,12 +179,12 @@ fix, where the simulation continues on the same as if no restart had
 taken place.  However, in a statistical sense, a restarted simulation
 should produce the same behavior.
 
-None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
-commands"_Section_howto.html#4_15.  No parameter of this fix can be
-used with the {start/stop} keywords of the "run"_run.html command.
-This fix is not invoked during "energy minimization"_minimize.html.
+None of the "fix_modify"_fix_modify.html options are relevant to this
+fix.  No global or per-atom quantities are stored by this fix for
+access by various "output commands"_Section_howto.html#4_15.  No
+parameter of this fix can be used with the {start/stop} keywords of
+the "run"_run.html command.  This fix is not invoked during "energy
+minimization"_minimize.html.
 
 [Restrictions:]
 
diff --git a/doc/fix_viscosity.html b/doc/fix_viscosity.html
index 394c452e38..8bd3775f69 100644
--- a/doc/fix_viscosity.html
+++ b/doc/fix_viscosity.html
@@ -116,14 +116,14 @@ box orthogonal; thus it does not suffer from this limitation.
 files.  None of the fix_modify options
 are relevant to this fix.
 
                
-
                The cummulative momentum transferred between the bottom and middle of
-the simulation box (in the pdim direction) is stored as a scalar
+
                This fix computes a global scalar which can be accessed by various
+output commands.  The scalar is the
+cummulative momentum transferred between the bottom and middle of the
+simulation box (in the pdim direction) is stored as a scalar
 quantity by this fix.  This quantity is zeroed when the fix is defined
 and accumlates thereafter, once every N steps.  The units of the
-quantity are momentum = mass*velocity.  This quantity can be accessed
-by various output commands, such as
-thermo_style custom.  The scalar value calculated
-by this fix is "intensive".
+quantity are momentum = mass*velocity.  The scalar value calculated by
+this fix is "intensive".
 
                
 
                No parameter of this fix can be used with the start/stop keywords of
 the run command.  This fix is not invoked during energy
diff --git a/doc/fix_viscosity.txt b/doc/fix_viscosity.txt
index 0c57240719..4ce3861015 100644
--- a/doc/fix_viscosity.txt
+++ b/doc/fix_viscosity.txt
@@ -105,14 +105,14 @@ No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
 are relevant to this fix.
 
-The cummulative momentum transferred between the bottom and middle of
-the simulation box (in the {pdim} direction) is stored as a scalar
+This fix computes a global scalar which can be accessed by various
+"output commands"_Section_howto.html#4_15.  The scalar is the
+cummulative momentum transferred between the bottom and middle of the
+simulation box (in the {pdim} direction) is stored as a scalar
 quantity by this fix.  This quantity is zeroed when the fix is defined
 and accumlates thereafter, once every N steps.  The units of the
-quantity are momentum = mass*velocity.  This quantity can be accessed
-by various "output commands"_Section_howto.html#4_15, such as
-"thermo_style custom"_thermo_style.html.  The scalar value calculated
-by this fix is "intensive".
+quantity are momentum = mass*velocity.  The scalar value calculated by
+this fix is "intensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.  This fix is not invoked during "energy
diff --git a/doc/fix_viscous.html b/doc/fix_viscous.html
index 452f7eadd2..1ee960646c 100644
--- a/doc/fix_viscous.html
+++ b/doc/fix_viscous.html
@@ -88,8 +88,8 @@ so that it can more easily be used as a thermostat.
 
                
 
                No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_viscous.txt b/doc/fix_viscous.txt
index bd9e0c258b..8ea40ec1e5 100644
--- a/doc/fix_viscous.txt
+++ b/doc/fix_viscous.txt
@@ -78,8 +78,8 @@ so that it can more easily be used as a thermostat.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_wall.html b/doc/fix_wall.html
index 98dc04de1a..620fb89204 100644
--- a/doc/fix_wall.html
+++ b/doc/fix_wall.html
@@ -189,17 +189,17 @@ fix to add the energy of interaction between atoms and each wall to
 the system's potential energy as part of thermodynamic
 output.
 
                
-
                This fix computes a scalar energy and a 6-length vector of forces (one
-force magnitude per wall), which can be accessed by various output
-commands.  The scalar and vector values
-calculated by this fix are "extensive".  Note that the scalar energy
-is the sum of interactions with all defined walls.  If you want the
-energy on a per-wall basis, you need to use multiple fix wall
-commands.  The 6 vector quantities are the force on the xlo wall,
-the xhi wall, ylo, yhi, zlo, zhi.  These values will only be
-non-zero if the corresponding wall is defined.  Note that an outward
-force on a wall will be a negative value for lo walls and a positive
-value for hi walls.
+
                This fix computes a global scalar energy and a global 6-length vector
+of forces (one force magnitude per wall), which can be accessed by
+various output commands.  Note that the
+scalar energy is the sum of interactions with all defined walls.  If
+you want the energy on a per-wall basis, you need to use multiple fix
+wall commands.  The 6 vector quantities are the force on the xlo
+wall, the xhi wall, ylo, yhi, zlo, zhi.  These values will
+only be non-zero if the corresponding wall is defined.  Note that an
+outward force on a wall will be a negative value for lo walls and a
+positive value for hi walls.  The scalar and vector values
+calculated by this fix are "extensive".
 
                
 
                No parameter of this fix can be used with the start/stop keywords of
 the run command.
diff --git a/doc/fix_wall.txt b/doc/fix_wall.txt
index 9c5b5a7c31..8bd6a118bf 100644
--- a/doc/fix_wall.txt
+++ b/doc/fix_wall.txt
@@ -178,17 +178,17 @@ fix to add the energy of interaction between atoms and each wall to
 the system's potential energy as part of "thermodynamic
 output"_thermo_style.html.
 
-This fix computes a scalar energy and a 6-length vector of forces (one
-force magnitude per wall), which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar and vector values
-calculated by this fix are "extensive".  Note that the scalar energy
-is the sum of interactions with all defined walls.  If you want the
-energy on a per-wall basis, you need to use multiple fix wall
-commands.  The 6 vector quantities are the force on the {xlo} wall,
-the {xhi} wall, {ylo}, {yhi}, {zlo}, {zhi}.  These values will only be
-non-zero if the corresponding wall is defined.  Note that an outward
-force on a wall will be a negative value for {lo} walls and a positive
-value for {hi} walls.
+This fix computes a global scalar energy and a global 6-length vector
+of forces (one force magnitude per wall), which can be accessed by
+various "output commands"_Section_howto.html#4_15.  Note that the
+scalar energy is the sum of interactions with all defined walls.  If
+you want the energy on a per-wall basis, you need to use multiple fix
+wall commands.  The 6 vector quantities are the force on the {xlo}
+wall, the {xhi} wall, {ylo}, {yhi}, {zlo}, {zhi}.  These values will
+only be non-zero if the corresponding wall is defined.  Note that an
+outward force on a wall will be a negative value for {lo} walls and a
+positive value for {hi} walls.  The scalar and vector values
+calculated by this fix are "extensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.
diff --git a/doc/fix_wall_gran.html b/doc/fix_wall_gran.html
index ef59d44127..55e4ef2cdc 100644
--- a/doc/fix_wall_gran.html
+++ b/doc/fix_wall_gran.html
@@ -153,11 +153,11 @@ restart file, so that the operation of the fix continues in an
 uninterrupted fashion.
 
                
 
                None of the fix_modify options are relevant to this
-fix.  No global scalar or vector or per-atom quantities are stored by
-this fix for access by various output
-commands.  No parameter of this fix can be
-used with the start/stop keywords of the run command.
-This fix is not invoked during energy minimization.
+fix.  No global or per-atom quantities are stored by this fix for
+access by various output commands.  No
+parameter of this fix can be used with the start/stop keywords of
+the run command.  This fix is not invoked during energy
+minimization.
 
                
 
                Restrictions:
 
                
diff --git a/doc/fix_wall_gran.txt b/doc/fix_wall_gran.txt
index d3be85abbd..0f6bcbea11 100644
--- a/doc/fix_wall_gran.txt
+++ b/doc/fix_wall_gran.txt
@@ -136,11 +136,11 @@ restart file, so that the operation of the fix continues in an
 uninterrupted fashion.
 
 None of the "fix_modify"_fix_modify.html options are relevant to this
-fix.  No global scalar or vector or per-atom quantities are stored by
-this fix for access by various "output
-commands"_Section_howto.html#4_15.  No parameter of this fix can be
-used with the {start/stop} keywords of the "run"_run.html command.
-This fix is not invoked during "energy minimization"_minimize.html.
+fix.  No global or per-atom quantities are stored by this fix for
+access by various "output commands"_Section_howto.html#4_15.  No
+parameter of this fix can be used with the {start/stop} keywords of
+the "run"_run.html command.  This fix is not invoked during "energy
+minimization"_minimize.html.
 
 [Restrictions:]
 
diff --git a/doc/fix_wall_reflect.html b/doc/fix_wall_reflect.html
index 009f4df84b..d57efeb8a8 100644
--- a/doc/fix_wall_reflect.html
+++ b/doc/fix_wall_reflect.html
@@ -47,8 +47,8 @@ velocity-Verlet integration without reflective walls.
 
                
 
                No information about this fix is written to binary restart
 files.  None of the fix_modify options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various output
 commands.  No parameter of this fix can be
 used with the start/stop keywords of the run command.
 This fix is not invoked during energy minimization.
diff --git a/doc/fix_wall_reflect.txt b/doc/fix_wall_reflect.txt
index 7c89f1a460..23bb6c9a94 100644
--- a/doc/fix_wall_reflect.txt
+++ b/doc/fix_wall_reflect.txt
@@ -44,8 +44,8 @@ velocity-Verlet integration without reflective walls.
 
 No information about this fix is written to "binary restart
 files"_restart.html.  None of the "fix_modify"_fix_modify.html options
-are relevant to this fix.  No global scalar or vector or per-atom
-quantities are stored by this fix for access by various "output
+are relevant to this fix.  No global or per-atom quantities are stored
+by this fix for access by various "output
 commands"_Section_howto.html#4_15.  No parameter of this fix can be
 used with the {start/stop} keywords of the "run"_run.html command.
 This fix is not invoked during "energy minimization"_minimize.html.
diff --git a/doc/fix_wall_region.html b/doc/fix_wall_region.html
index ab537bead9..85ec827106 100644
--- a/doc/fix_wall_region.html
+++ b/doc/fix_wall_region.html
@@ -158,14 +158,14 @@ fix to add the energy of interaction between atoms and the wall to the
 system's potential energy as part of thermodynamic
 output.
 
                
-
                This fix computes a scalar energy and a 3-length vector of forces,
-which can be accessed by various output
-commands.  The scalar and vector values
-calculated by this fix are "extensive".  The scalar energy is the sum
-of energy interactions for all particles interacting with the wall
+
                This fix computes a global scalar energy and a global 3-length vector
+of forces, which can be accessed by various output
+commands.  The scalar energy is the sum of
+energy interactions for all particles interacting with the wall
 represented by the region surface.  The 3 vector quantities are the
 x,y,z components of the total force acting on the wall due to the
-particles.
+particles.  The scalar and vector values calculated by this fix are
+"extensive".
 
                
 
                No parameter of this fix can be used with the start/stop keywords of
 the run command.
diff --git a/doc/fix_wall_region.txt b/doc/fix_wall_region.txt
index f15f2231a6..a6f070bbf4 100644
--- a/doc/fix_wall_region.txt
+++ b/doc/fix_wall_region.txt
@@ -155,14 +155,14 @@ fix to add the energy of interaction between atoms and the wall to the
 system's potential energy as part of "thermodynamic
 output"_thermo_style.html.
 
-This fix computes a scalar energy and a 3-length vector of forces,
-which can be accessed by various "output
-commands"_Section_howto.html#4_15.  The scalar and vector values
-calculated by this fix are "extensive".  The scalar energy is the sum
-of energy interactions for all particles interacting with the wall
+This fix computes a global scalar energy and a global 3-length vector
+of forces, which can be accessed by various "output
+commands"_Section_howto.html#4_15.  The scalar energy is the sum of
+energy interactions for all particles interacting with the wall
 represented by the region surface.  The 3 vector quantities are the
 x,y,z components of the total force acting on the wall due to the
-particles.
+particles.  The scalar and vector values calculated by this fix are
+"extensive".
 
 No parameter of this fix can be used with the {start/stop} keywords of
 the "run"_run.html command.
diff --git a/doc/pair_modify.html b/doc/pair_modify.html
index 1110cdf0ff..9dd042d769 100644
--- a/doc/pair_modify.html
+++ b/doc/pair_modify.html
@@ -118,8 +118,8 @@ option.  These corrections are included in the calculation and
 printing of thermodynamic quantities (see the
 thermo_style command).  Their effect will also be
 included in constant NPT or NPH simulations where the pressure
-influences the simulation box dimensions (e.g. the fix
-npt and fix nph commands).  The formulas
+influences the simulation box dimensions (e.g. the fix
+npt and fix nph commands).  The formulas
 used for the long-range corrections come from equation 5 of
 (Sun).
 
                
diff --git a/doc/pair_modify.txt b/doc/pair_modify.txt
index e206d5e3cb..4c36c0372b 100644
--- a/doc/pair_modify.txt
+++ b/doc/pair_modify.txt
@@ -113,7 +113,7 @@ printing of thermodynamic quantities (see the
 "thermo_style"_thermo_style.html command).  Their effect will also be
 included in constant NPT or NPH simulations where the pressure
 influences the simulation box dimensions (e.g. the "fix
-npt"_fix_npt.html and "fix nph"_fix_nph.html commands).  The formulas
+npt"_fix_nh.html and "fix nph"_fix_nh.html commands).  The formulas
 used for the long-range corrections come from equation 5 of
 "(Sun)"_#Sun.
 
diff --git a/doc/reset_timestep.html b/doc/reset_timestep.html
index 021ee37155..5ed24e8711 100644
--- a/doc/reset_timestep.html
+++ b/doc/reset_timestep.html
@@ -58,7 +58,7 @@ and orientation.
 
                There are other fixes which use the current timestep which may produce
 unexpected behavior, but LAMMPS allows them to be in place when
 resetting the timestep.  For example, commands which thermostat the
-system, e.g. fix nvt, allow you to specify a target
+system, e.g. fix nvt, allow you to specify a target
 temperature which ramps from Tstart to Tstop which may persist over
 several runs.  If you change the timestep, you may change the target
 temperature.
diff --git a/doc/reset_timestep.txt b/doc/reset_timestep.txt
index db11a2f0f0..afe4809a64 100644
--- a/doc/reset_timestep.txt
+++ b/doc/reset_timestep.txt
@@ -55,7 +55,7 @@ and orientation.
 There are other fixes which use the current timestep which may produce
 unexpected behavior, but LAMMPS allows them to be in place when
 resetting the timestep.  For example, commands which thermostat the
-system, e.g. "fix nvt"_fix_nvt.html, allow you to specify a target
+system, e.g. "fix nvt"_fix_nh.html, allow you to specify a target
 temperature which ramps from Tstart to Tstop which may persist over
 several runs.  If you change the timestep, you may change the target
 temperature.
diff --git a/doc/temper.html b/doc/temper.html
index 1fbd82ff02..911466e785 100644
--- a/doc/temper.html
+++ b/doc/temper.html
@@ -36,7 +36,7 @@ processor partitions are defined using the -partition command-line
 switch (see this section).  Each ensemble's
 temperature is typically controlled at a different value by a fix with
 ID fix-ID that controls temperature.  Possible fix styles are
-nvt, temp/berendsen,
+nvt, temp/berendsen,
 langevin and temp/rescale.
 The desired temperature is specified by temp, which is typically a
 variable previously set in the input script, so that each partition is
diff --git a/doc/temper.txt b/doc/temper.txt
index ac0f99d7ce..7472c5f92b 100644
--- a/doc/temper.txt
+++ b/doc/temper.txt
@@ -33,7 +33,7 @@ processor partitions are defined using the -partition command-line
 switch (see "this section"_Section_start.html#2_6).  Each ensemble's
 temperature is typically controlled at a different value by a fix with
 ID {fix-ID} that controls temperature.  Possible fix styles are
-"nvt"_fix_nvt.html, "temp/berendsen"_fix_npt.html,
+"nvt"_fix_nh.html, "temp/berendsen"_fix_nh.html,
 "langevin"_fix_langevin.html and "temp/rescale"_fix_temp_rescale.html.
 The desired temperature is specified by {temp}, which is typically a
 variable previously set in the input script, so that each partition is