Skip to content

Commit ba46b0a

Browse files
Merge branch 'main' into review-livecoms
2 parents 6c093ba + 9a9b0fa commit ba46b0a

File tree

9 files changed

+24
-16
lines changed

9 files changed

+24
-16
lines changed

docs/sphinx/source/tutorial1/tutorial.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,8 @@ the following:
495495
view 80 10 box yes 0.025 axes no 0.0 0.0 center s 0.483725 0.510373 0.510373
496496
dump_modify viz pad 9 boxcolor royalblue backcolor white adiam 1 1.6 adiam 2 4.8
497497
498-
This command tells LAMMPS to generate NetPBM format images every 100
498+
The $\&$ is used to continue the command on a new line.
499+
These commands tell LAMMPS to generate NetPBM format images every 100
499500
steps. The two ``type`` keywords are for *color* and
500501
*diameter*, respectively. Run the **initial.lmp** using
501502
LAMMPS again, and a new window named ``Slide Show`` will pop up.

docs/sphinx/source/tutorial3/tutorial.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ lines into **water.lmp**:
8686
molecule h2omol water.mol
8787
create_atoms 0 random 700 87910 NULL mol h2omol 454756 overlap 1.0 maxtry 50
8888
89+
The first parameter is 0, meaning that the atom IDs from
90+
the **water.mol** file will be used.
8991
The ``overlap 1.0`` option of the ``create_atoms`` command ensures
9092
that no atoms are placed exactly in the same position, as this would cause the
9193
simulation to crash. The ``maxtry 50`` asks LAMMPS to try at most 50 times
@@ -139,7 +141,9 @@ Resetting the step of the simulation to 0 using the
139141
``reset_timestep`` command is optional.
140142
It is used here because the number of iterations performed by the ``minimize``
141143
command is usually not a round number, since the minimization stops when one of
142-
four criteria is reached. We will use ``fix npt`` to control the temperature
144+
four criteria is reached, which can disrupt the intended frequency
145+
of outputs such as ``dump`` commands that depend on the timestep count.
146+
We will use ``fix npt`` to control the temperature
143147
and pressure of the molecules with a Nosé-Hoover thermostat and barostat,
144148
respectively :cite:`nose1984unified, hoover1985canonical, martyna1994constant`.
145149
Add the following line into **water.lmp**:

docs/sphinx/source/tutorial4/tutorial.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ of ``lj/cut/tip4p/long`` instead of ``lj/cut/coul/long``, and ``pppm/tip4p``
4848
instead of ``pppm``. When using ``lj/cut/tip4p/long`` and ``pppm/tip4p``,
4949
the interactions resemble the conventional Lennard-Jones and Coulomb interactions,
5050
except that they are specifically designed for the four-point water model. As a result,
51-
LAMMPS automatically creates a four-point water molecule, assigning type O
51+
LAMMPS automatically adds the fourth point to the water molecules, assigning type O
5252
atoms as oxygen and type H atoms as hydrogen. The fourth massless atom (M) of the
5353
TIP4P water molecule does not have to be defined explicitly, and the value of
5454
:math:`0.1546\,\text{Å}` corresponds to the O-M distance of the
@@ -532,8 +532,8 @@ commands to **shearing.lmp**:
532532
velocity walltop set 2e-4 NULL NULL
533533
534534
The ``setforce`` commands cancel the forces on ``walltop`` and
535-
``wallbot``. As a result, the atoms in these two groups will not
536-
experience any forces from the rest of the system. Consequently, in the absence of
535+
``wallbot`` in the :math:`x` direction. As a result, the atoms in these two groups will not
536+
experience any forces along :math:`x` from the rest of the system. Consequently, in the absence of
537537
external forces, these atoms will conserve the initial velocities imposed by the
538538
two ``velocity`` commands. As seen previously, although the
539539
forces on these atoms are set to zero, the ``fix setforce`` still stores the

docs/sphinx/source/tutorial6/tutorial.rst

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,17 @@ classical textbooks like Ref. :cite:`frenkel2023understanding`.
226226
Adapting the pair style
227227
-----------------------
228228

229-
For this next step, we need to define the parameters for the water molecules and
230-
the cross-interactions between water and silica. The TIP4P/2005 model is employed
231-
for the water :cite:`abascal2005general`, while no specific parameters are set
232-
for the silica itself. The atoms of the silica will remain frozen during this part.
229+
For this next step, we need to specify the force field used to
230+
model the interactions in the system. The TIP4P/2005 model is employed
231+
for the water :cite:`abascal2005general`, while no interaction within
232+
silica is defined, as it will be seen farther below. This is be-
233+
cause atoms of the silica will remain frozen during this part of the simulation.
233234
Only the cross-interactions between water and silica need
234235
to be defined. Create a new file called **gcmc.lmp**, and copy the following
235236
lines into it:
236237

238+
Create a new file called **gcmc.lmp**, and copy the following lines into it:
239+
237240
.. code-block:: lammps
238241
239242
units metal

docs/sphinx/source/tutorial7/tutorial.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,15 +388,15 @@ central part of the box.
388388
Add FIGURE US-system-biased Snapshot of the system simulated during the umbrella sampling
389389
step of \hyperref[umbrella-sampling-label]{Tutorial 7}, showing type-1 atoms
390390
in cyan and the type-2 atom in red. Only the type-2 atom explores the central part of the box,
391-
``mymes``, due to the additional biasing potential :math:`V`. Parmaeters are
391+
``mymes``, due to the additional biasing potential :math:`V`. Parameters are
392392
:math:`U_0 = 2.38~\text{kcal/mol}`, :math:`\delta = 1.0~\text{Å}`, and :math:`x_0 = 10~\text{Å}`.
393393
394394
Now, we create a loop with 15 steps and progressively move the center of the
395395
bias potential by increments of 0.4 nm. Add the following lines to **umbrella-sampling.lmp**:
396396

397397
.. code-block:: lammps
398398
399-
variable a loop 25
399+
variable a loop 15
400400
label loop
401401
402402
variable xdes equal 4*${a}-32
2.22 KB
Loading
2.21 KB
Loading

docs/sphinx/source/tutorial8/figures/mixing.ipynb

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

docs/sphinx/source/tutorial8/tutorial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ For visualization purposes, the atoms from the CNT ``group`` is moved
124124
to the center of the box using ``fix recenter``.
125125
As the time progresses, the system density,
126126
:math:`\rho`, gradually converges toward the target value
127-
of :math:`0.8`\,g/cm:math:`^3`.
127+
of :math:`0.9`\,g/cm:math:`^3`.
128128
Meanwhile, the total energy of the system initially evolves rapidly, reflecting the
129129
densification process, and then eventually stabilizes.
130130

0 commit comments

Comments
 (0)