fixing broken doc references
This commit is contained in:
@ -91,6 +91,7 @@ OPT.
|
|||||||
* :doc:`grem <fix_grem>`
|
* :doc:`grem <fix_grem>`
|
||||||
* :doc:`halt <fix_halt>`
|
* :doc:`halt <fix_halt>`
|
||||||
* :doc:`heat <fix_heat>`
|
* :doc:`heat <fix_heat>`
|
||||||
|
* :doc:`heat/flow/sphere/temp <fix_heat_flow_sphere_temp>`
|
||||||
* :doc:`hyper/global <fix_hyper_global>`
|
* :doc:`hyper/global <fix_hyper_global>`
|
||||||
* :doc:`hyper/local <fix_hyper_local>`
|
* :doc:`hyper/local <fix_hyper_local>`
|
||||||
* :doc:`imd <fix_imd>`
|
* :doc:`imd <fix_imd>`
|
||||||
@ -235,7 +236,6 @@ OPT.
|
|||||||
* :doc:`temp/berendsen <fix_temp_berendsen>`
|
* :doc:`temp/berendsen <fix_temp_berendsen>`
|
||||||
* :doc:`temp/csld <fix_temp_csvr>`
|
* :doc:`temp/csld <fix_temp_csvr>`
|
||||||
* :doc:`temp/csvr <fix_temp_csvr>`
|
* :doc:`temp/csvr <fix_temp_csvr>`
|
||||||
* :doc:`temp/integrate <fix_temp_integrate>`
|
|
||||||
* :doc:`temp/rescale <fix_temp_rescale>`
|
* :doc:`temp/rescale <fix_temp_rescale>`
|
||||||
* :doc:`temp/rescale/eff <fix_temp_rescale_eff>`
|
* :doc:`temp/rescale/eff <fix_temp_rescale_eff>`
|
||||||
* :doc:`tfmc <fix_tfmc>`
|
* :doc:`tfmc <fix_tfmc>`
|
||||||
|
|||||||
@ -46,7 +46,7 @@ atoms, and should be used for granular system instead of the fix style
|
|||||||
To model heat conduction, one must use the atom style:
|
To model heat conduction, one must use the atom style:
|
||||||
* :doc:`atom_style sphere/temp <atom_style>`
|
* :doc:`atom_style sphere/temp <atom_style>`
|
||||||
a temperature integration fix
|
a temperature integration fix
|
||||||
* :doc:`fix temp/integrate <fix_temp_integrate>`
|
* :doc:`fix heat/flow/sphere/temp <fix_heat_flow_sphere_temp>`
|
||||||
and a heat conduction option defined in both
|
and a heat conduction option defined in both
|
||||||
* :doc:`pair_style granular <pair_granular>`
|
* :doc:`pair_style granular <pair_granular>`
|
||||||
* :doc:`fix wall/gran <fix_wall_gran>`
|
* :doc:`fix wall/gran <fix_wall_gran>`
|
||||||
@ -65,4 +65,4 @@ computations between frozen atoms by using this command:
|
|||||||
doc page, where 2d simulations are discussed.
|
doc page, where 2d simulations are discussed.
|
||||||
|
|
||||||
To add custom granular contact models, see the
|
To add custom granular contact models, see the
|
||||||
:doc:`modifying granular submodels page <Modify_gsm>`.
|
:doc:`modifying granular sub-models page <Modify_gran_sub_mod>`.
|
||||||
|
|||||||
@ -238,6 +238,7 @@ accelerated styles exist.
|
|||||||
* :doc:`grem <fix_grem>` - implements the generalized replica exchange method
|
* :doc:`grem <fix_grem>` - implements the generalized replica exchange method
|
||||||
* :doc:`halt <fix_halt>` - terminate a dynamics run or minimization
|
* :doc:`halt <fix_halt>` - terminate a dynamics run or minimization
|
||||||
* :doc:`heat <fix_heat>` - add/subtract momentum-conserving heat
|
* :doc:`heat <fix_heat>` - add/subtract momentum-conserving heat
|
||||||
|
* :doc:`heat/flow/sphere/temp <fix_heat_flow_sphere_temp>` - plain time integration of heat flow with per-atom temperature updates
|
||||||
* :doc:`hyper/global <fix_hyper_global>` - global hyperdynamics
|
* :doc:`hyper/global <fix_hyper_global>` - global hyperdynamics
|
||||||
* :doc:`hyper/local <fix_hyper_local>` - local hyperdynamics
|
* :doc:`hyper/local <fix_hyper_local>` - local hyperdynamics
|
||||||
* :doc:`imd <fix_imd>` - implements the "Interactive MD" (IMD) protocol
|
* :doc:`imd <fix_imd>` - implements the "Interactive MD" (IMD) protocol
|
||||||
@ -382,7 +383,6 @@ accelerated styles exist.
|
|||||||
* :doc:`temp/berendsen <fix_temp_berendsen>` - temperature control by Berendsen thermostat
|
* :doc:`temp/berendsen <fix_temp_berendsen>` - temperature control by Berendsen thermostat
|
||||||
* :doc:`temp/csld <fix_temp_csvr>` - canonical sampling thermostat with Langevin dynamics
|
* :doc:`temp/csld <fix_temp_csvr>` - canonical sampling thermostat with Langevin dynamics
|
||||||
* :doc:`temp/csvr <fix_temp_csvr>` - canonical sampling thermostat with Hamiltonian dynamics
|
* :doc:`temp/csvr <fix_temp_csvr>` - canonical sampling thermostat with Hamiltonian dynamics
|
||||||
* :doc:`temp/integrate <fix_temp_integrate>` - plain time integration with per-atom temperature updates
|
|
||||||
* :doc:`temp/rescale <fix_temp_rescale>` - temperature control by velocity rescaling
|
* :doc:`temp/rescale <fix_temp_rescale>` - temperature control by velocity rescaling
|
||||||
* :doc:`temp/rescale/eff <fix_temp_rescale_eff>` - temperature control by velocity rescaling in the electron force field model
|
* :doc:`temp/rescale/eff <fix_temp_rescale_eff>` - temperature control by velocity rescaling in the electron force field model
|
||||||
* :doc:`tfmc <fix_tfmc>` - perform force-bias Monte Carlo with time-stamped method
|
* :doc:`tfmc <fix_tfmc>` - perform force-bias Monte Carlo with time-stamped method
|
||||||
|
|||||||
@ -659,8 +659,9 @@ where :math:`\Delta T` is the difference in the two particles' temperature,
|
|||||||
:math:`a` is the area of the contact and depends on the normal force model.
|
:math:`a` is the area of the contact and depends on the normal force model.
|
||||||
|
|
||||||
Note that the option *none* must either be used in all or none of of the
|
Note that the option *none* must either be used in all or none of of the
|
||||||
*pair_coeff* calls. See :doc:`fix temp/integrate <fix_temp_integrate>` for
|
*pair_coeff* calls. See
|
||||||
more information on this option.
|
:doc:`fix heat/flow/sphere/temp <fix_heat_flow_sphere_temp>` for more
|
||||||
|
information on this option.
|
||||||
|
|
||||||
----------
|
----------
|
||||||
|
|
||||||
|
|||||||
@ -409,7 +409,6 @@ void GranularModel::calculate_forces()
|
|||||||
vrel = len3(vtr);
|
vrel = len3(vtr);
|
||||||
|
|
||||||
// calculate forces/torques
|
// calculate forces/torques
|
||||||
forces[0] = 0.0;
|
|
||||||
double Fdamp, dist_to_contact;
|
double Fdamp, dist_to_contact;
|
||||||
if (area_flag)
|
if (area_flag)
|
||||||
area = normal_model->calculate_area();
|
area = normal_model->calculate_area();
|
||||||
|
|||||||
Reference in New Issue
Block a user