Skip to content

Commit 916ba48

Browse files
Merge branch 'main' into add-tutorial8
2 parents 8100973 + 68ed992 commit 916ba48

42 files changed

Lines changed: 5673 additions & 4771 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ lammps-tutorials.suppinfo
1111
lammps-tutorials.fls
1212
lammps-tutorials.synctex*
1313
lammps-tutorials.fdb*
14+
pdflatex*.fls
1415

1516
# LaTex files for the presubmission letter
1617
presubmission-letter/*.log
@@ -31,5 +32,6 @@ _region_.*
3132

3233
# LAMMPS output files
3334
dump.*.jpg
34-
dump.*.ppn
35-
dump.*.ppm
35+
dump.*.ppm
36+
dump.*.ppm
37+
myimage-*.ppm

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[submodule "files/pyplot-perso"]
2-
path = files/pyplot-perso
2+
path = files/shared-pyplot
33
url = git@github.com:simongravelle/pyplot-perso.git
44
branch = LAMMPS-livecom
55
[submodule "dependencies/.github"]

DESCRIPTION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ more accessible to new users.
55

66
## Tutorials
77

8-
- Tutorial 1: Lennard-Jones fluid
8+
- Tutorial 1: Lennard-Jones fluid
99
- Tutorial 2: Pulling on a carbon nanotube
1010
- Tutorial 3: Polymer in water
1111
- Tutorial 4: Nanosheared electrolyte

figures/LJ-coords.png

-19.4 KB
Loading

figures/LJ-energy.png

-4.65 KB
Loading

figures/LJ-evolution.png

202 KB
Loading

figures/LJ-mixing.png

-9.52 KB
Loading

figures/chart-1.png

5.75 KB
Loading

figures/output-1.png

22.9 KB
Loading

0 commit comments

Comments
 (0)