diff --git a/doc/html/Section_commands.html b/doc/html/Section_commands.html
index 7e3ed814a7..39665a53c2 100644
--- a/doc/html/Section_commands.html
+++ b/doc/html/Section_commands.html
@@ -618,13 +618,13 @@ This is indicated by additional letters in parenthesis: c = USER-CUDA,
g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t = OPT.
diff --git a/doc/html/Section_howto.html b/doc/html/Section_howto.html
index 09a635b422..4b3b3446a4 100644
--- a/doc/html/Section_howto.html
+++ b/doc/html/Section_howto.html
@@ -2001,15 +2001,17 @@ periodic box. By holding the two regions at different temperatures
with a thermostatting fix, the energy
added to the hot region should equal the energy subtracted from the
cold region and be proportional to the heat flux moving between the
-regions. See the paper by Ikeshoji and Hafskjold for
-details of this idea. Note that thermostatting fixes such as fix nvt, fix langevin, and fix temp/rescale store the cumulative energy they
+regions. See the papers by Ikeshoji and Hafskjold
+and Wirnsberger et al for details of this idea.
+Note that thermostatting fixes such as fix nvt, fix langevin, and fix temp/rescale store the cumulative energy they
add/subtract.
-Alternatively, as a second method, the fix heat
-command can used in place of thermostats on each of two regions to
-add/subtract specified amounts of energy to both regions. In both
-cases, the resulting temperatures of the two regions can be monitored
-with the “compute temp/region” command and the temperature profile of
-the intermediate region can be monitored with the fix ave/spatial and compute ke/atom commands.
+Alternatively, as a second method, the fix heat or
+fix ehex commands can be used in place of thermostats
+on each of two regions to add/subtract specified amounts of energy to
+both regions. In both cases, the resulting temperatures of the two
+regions can be monitored with the “compute temp/region” command and
+the temperature profile of the intermediate region can be monitored
+with the fix ave/spatial and compute ke/atom commands.
The third method is to perform a reverse non-equilibrium MD simulation
using the fix thermal/conductivity
command which implements the rNEMD algorithm of Muller-Plathe.
@@ -2782,8 +2784,10 @@ too close, which can cause numerical issues.
Spellmeyer, Fox, Caldwell, Kollman, JACS 117, 5179-5197 (1995).
(Horn) Horn, Swope, Pitera, Madura, Dick, Hura, and Head-Gordon,
J Chem Phys, 120, 9665 (2004).
-(Ikeshoji) Ikeshoji and Hafskjold, Molecular Physics, 81, 251-261
+
(Ikeshoji) Ikeshoji and Hafskjold, Molecular Physics, 81, 251-261
(1994).
+(Wirnsberger) Wirnsberger, Frenkel, and Dellago, J Chem Phys, 143, 124104
+(2015).
(MacKerell) MacKerell, Bashford, Bellott, Dunbrack, Evanseck, Field,
Fischer, Gao, Guo, Ha, et al, J Phys Chem, 102, 3586 (1998).
(Mayo) Mayo, Olfason, Goddard III, J Phys Chem, 94, 8897-8909
diff --git a/doc/html/_sources/Section_commands.txt b/doc/html/_sources/Section_commands.txt
index 5d96287717..75e742a27c 100644
--- a/doc/html/_sources/Section_commands.txt
+++ b/doc/html/_sources/Section_commands.txt
@@ -457,37 +457,37 @@ with the :doc:`appropriate accelerated package `.
This is indicated by additional letters in parenthesis: c = USER-CUDA,
g = GPU, i = USER-INTEL, k = KOKKOS, o = USER-OMP, t = OPT.
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`adapt ` | :doc:`addforce (c) ` | :doc:`append/atoms ` | :doc:`atom/swap ` | :doc:`aveforce (c) ` | :doc:`ave/atom ` | :doc:`ave/chunk ` | :doc:`ave/correlate ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`ave/histo ` | :doc:`ave/histo/weight ` | :doc:`ave/spatial ` | :doc:`ave/time ` | :doc:`balance ` | :doc:`bond/break ` | :doc:`bond/create ` | :doc:`bond/swap ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`box/relax ` | :doc:`deform (k) ` | :doc:`deposit ` | :doc:`drag ` | :doc:`dt/reset ` | :doc:`efield ` | :doc:`enforce2d (c) ` | :doc:`evaporate ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`external ` | :doc:`freeze (c) ` | :doc:`gcmc ` | :doc:`gld ` | :doc:`gravity (co) ` | :doc:`heat ` | :doc:`indent ` | :doc:`langevin (k) ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`lineforce ` | :doc:`momentum ` | :doc:`move ` | :doc:`msst ` | :doc:`neb ` | :doc:`nph (ko) ` | :doc:`nphug (o) ` | :doc:`nph/asphere (o) ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`nph/body ` | :doc:`nph/sphere (o) ` | :doc:`npt (ckio) ` | :doc:`npt/asphere (o) ` | :doc:`npt/body ` | :doc:`npt/sphere (o) ` | :doc:`nve (ckio) ` | :doc:`nve/asphere (i) ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`nve/asphere/noforce ` | :doc:`nve/body ` | :doc:`nve/limit ` | :doc:`nve/line ` | :doc:`nve/noforce ` | :doc:`nve/sphere (o) ` | :doc:`nve/tri ` | :doc:`nvt (ciko) ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`nvt/asphere (o) ` | :doc:`nvt/body ` | :doc:`nvt/sllod (io) ` | :doc:`nvt/sphere (o) ` | :doc:`oneway ` | :doc:`orient/fcc ` | :doc:`planeforce ` | :doc:`poems ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`pour ` | :doc:`press/berendsen ` | :doc:`print ` | :doc:`property/atom ` | :doc:`qeq/comb (o) ` | :doc:`qeq/dynamic ` | :doc:`qeq/fire ` | :doc:`qeq/point ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`qeq/shielded ` | :doc:`qeq/slater ` | :doc:`rattle ` | :doc:`reax/bonds ` | :doc:`recenter ` | :doc:`restrain ` | :doc:`rigid (o) ` | :doc:`rigid/nph (o) ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`rigid/npt (o) ` | :doc:`rigid/nve (o) ` | :doc:`rigid/nvt (o) ` | :doc:`rigid/small (o) ` | :doc:`rigid/small/nph ` | :doc:`rigid/small/npt ` | :doc:`rigid/small/nve ` | :doc:`rigid/small/nvt ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`setforce (ck) ` | :doc:`shake (c) ` | :doc:`spring ` | :doc:`spring/rg ` | :doc:`spring/self ` | :doc:`srd ` | :doc:`store/force ` | :doc:`store/state ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`temp/berendsen (c) ` | :doc:`temp/csld ` | :doc:`temp/csvr ` | :doc:`temp/rescale (c) ` | :doc:`tfmc ` | :doc:`thermal/conductivity ` | :doc:`tmd ` | :doc:`ttm ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`tune/kspace ` | :doc:`vector ` | :doc:`viscosity ` | :doc:`viscous (c) ` | :doc:`wall/colloid ` | :doc:`wall/gran ` | :doc:`wall/harmonic ` | :doc:`wall/lj1043 ` |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
-| :doc:`wall/lj126 ` | :doc:`wall/lj93 ` | :doc:`wall/piston ` | :doc:`wall/reflect (k) ` | :doc:`wall/region ` | :doc:`wall/srd ` | | |
-+------------------------------------------------------+----------------------------------------------+----------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+--------------------------------------+------------------------------------------+
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`adapt ` | :doc:`addforce (c) ` | :doc:`append/atoms ` | :doc:`atom/swap ` | :doc:`aveforce (c) ` | :doc:`ave/atom ` | :doc:`ave/chunk ` | :doc:`ave/correlate ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`ave/histo ` | :doc:`ave/histo/weight ` | :doc:`ave/spatial ` | :doc:`ave/time ` | :doc:`balance ` | :doc:`bond/break ` | :doc:`bond/create ` | :doc:`bond/swap ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`box/relax ` | :doc:`deform (k) ` | :doc:`deposit ` | :doc:`drag ` | :doc:`dt/reset ` | :doc:`efield ` | :doc:`ehex ` | :doc:`enforce2d (c) ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`evaporate ` | :doc:`external ` | :doc:`freeze (c) ` | :doc:`gcmc ` | :doc:`gld ` | :doc:`gravity (co) ` | :doc:`heat ` | :doc:`indent ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`langevin (k) ` | :doc:`lineforce ` | :doc:`momentum ` | :doc:`move ` | :doc:`msst ` | :doc:`neb ` | :doc:`nph (ko) ` | :doc:`nphug (o) ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`nph/asphere (o) ` | :doc:`nph/body ` | :doc:`nph/sphere (o) ` | :doc:`npt (ckio) ` | :doc:`npt/asphere (o) ` | :doc:`npt/body ` | :doc:`npt/sphere (o) ` | :doc:`nve (ckio) ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`nve/asphere (i) ` | :doc:`nve/asphere/noforce ` | :doc:`nve/body ` | :doc:`nve/limit ` | :doc:`nve/line ` | :doc:`nve/noforce ` | :doc:`nve/sphere (o) ` | :doc:`nve/tri ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`nvt (ciko) ` | :doc:`nvt/asphere (o) ` | :doc:`nvt/body ` | :doc:`nvt/sllod (io) ` | :doc:`nvt/sphere (o) ` | :doc:`oneway ` | :doc:`orient/fcc ` | :doc:`planeforce ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`poems ` | :doc:`pour ` | :doc:`press/berendsen ` | :doc:`print ` | :doc:`property/atom ` | :doc:`qeq/comb (o) ` | :doc:`qeq/dynamic ` | :doc:`qeq/fire ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`qeq/point ` | :doc:`qeq/shielded ` | :doc:`qeq/slater ` | :doc:`rattle ` | :doc:`reax/bonds ` | :doc:`recenter ` | :doc:`restrain ` | :doc:`rigid (o) ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`rigid/nph (o) ` | :doc:`rigid/npt (o) ` | :doc:`rigid/nve (o) ` | :doc:`rigid/nvt (o) ` | :doc:`rigid/small (o) ` | :doc:`rigid/small/nph ` | :doc:`rigid/small/npt ` | :doc:`rigid/small/nve ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`rigid/small/nvt ` | :doc:`setforce (ck) ` | :doc:`shake (c) ` | :doc:`spring ` | :doc:`spring/rg ` | :doc:`spring/self ` | :doc:`srd ` | :doc:`store/force ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`store/state ` | :doc:`temp/berendsen (c) ` | :doc:`temp/csld ` | :doc:`temp/csvr ` | :doc:`temp/rescale (c) ` | :doc:`tfmc ` | :doc:`thermal/conductivity ` | :doc:`tmd ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`ttm ` | :doc:`tune/kspace ` | :doc:`vector ` | :doc:`viscosity ` | :doc:`viscous (c) ` | :doc:`wall/colloid ` | :doc:`wall/gran ` | :doc:`wall/harmonic ` |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
+| :doc:`wall/lj1043 ` | :doc:`wall/lj126 ` | :doc:`wall/lj93 ` | :doc:`wall/piston ` | :doc:`wall/reflect (k) ` | :doc:`wall/region ` | :doc:`wall/srd ` | |
++------------------------------------------+------------------------------------------------------+----------------------------------------------+---------------------------------------+--------------------------------------------+--------------------------------------+--------------------------------------------------------+------------------------------------------+
These are additional fix styles in USER packages, which can be used if
:ref:`LAMMPS is built with the appropriate package `.
diff --git a/doc/html/_sources/Section_howto.txt b/doc/html/_sources/Section_howto.txt
index 7ed9d38f56..17b2d8f89c 100644
--- a/doc/html/_sources/Section_howto.txt
+++ b/doc/html/_sources/Section_howto.txt
@@ -2139,16 +2139,18 @@ periodic box. By holding the two regions at different temperatures
with a :ref:`thermostatting fix `, the energy
added to the hot region should equal the energy subtracted from the
cold region and be proportional to the heat flux moving between the
-regions. See the paper by :ref:`Ikeshoji and Hafskjold ` for
-details of this idea. Note that thermostatting fixes such as :doc:`fix nvt `, :doc:`fix langevin `, and :doc:`fix temp/rescale ` store the cumulative energy they
+regions. See the papers by :ref:`Ikeshoji and Hafskjold `
+and :ref:`Wirnsberger et al ` for details of this idea.
+Note that thermostatting fixes such as :doc:`fix nvt `, :doc:`fix langevin `, and :doc:`fix temp/rescale ` store the cumulative energy they
add/subtract.
-Alternatively, as a second method, the :doc:`fix heat `
-command can used in place of thermostats on each of two regions to
-add/subtract specified amounts of energy to both regions. In both
-cases, the resulting temperatures of the two regions can be monitored
-with the "compute temp/region" command and the temperature profile of
-the intermediate region can be monitored with the :doc:`fix ave/spatial ` and :doc:`compute ke/atom ` commands.
+Alternatively, as a second method, the :doc:`fix heat