ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:lammps/lammps into kk_finalize

Browse Source
This commit is contained in:
Stan Gerald Moore
2021-06-30 10:18:12 -06:00
parent 9a740a4a60 105c86399b
commit 4928bd8b3d
10 changed files with 161 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/fix_temp_csvr.rst
View File

@ -176,9 +176,9 @@ These fixes are not invoked during :doc:`energy minimization <minimize>`.
Restrictions
""""""""""""
These fixes are not compatible with :doc:`fix shake <fix_shake>`.
Fix *temp/csld* is not compatible with :doc:`fix shake <fix_shake>`.
The fix can be used with dynamic groups as defined by the
These fixes can be used with dynamic groups as defined by the
:doc:`group <group>` command. Likewise it can be used with groups to
which atoms are added or deleted over time, e.g. a deposition
simulation. However, the conservation properties of the thermostat

2
doc/src/if.rst
View File

@ -26,7 +26,7 @@ Examples
if "${steps} > 1000" then quit
if "${myString} == a10" then quit
if "$x <= $y" then "print X is smaller = $x" else "print Y is smaller = $y"
if "(${eng} > 0.0) \|\| ($n < 1000)" then &
if "(${eng} > 0.0) || ($n < 1000)" then &
"timestep 0.005" &
elif $n<10000 &
"timestep 0.01" &

2
doc/src/variable.rst
View File

@ -574,7 +574,7 @@ division and the modulo operator "%" are next; addition and
subtraction are next; the 4 relational operators "<", "<=", ">", and
">=" are next; the two remaining relational operators "==" and "!="
are next; then the logical AND operator "&&"; and finally the logical
OR operator "\|\|" and logical XOR (exclusive or) operator "\|\^" have the
OR operator "||" and logical XOR (exclusive or) operator "\|^" have the
lowest precedence. Parenthesis can be used to group one or more
portions of a formula and/or enforce a different order of evaluation
than what would occur with the default precedence.