Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to current develop and some cosmetic changes #3

Merged
merged 660 commits into from
May 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
660 commits
Select commit Hold shift + click to select a range
fbded8d
include fix from @ndtrung81
akohlmey Apr 12, 2023
ca2222e
update contact info
akohlmey Apr 14, 2023
32f9800
testing new version of coupling
sjplimp Apr 14, 2023
82e17c8
add image outputs to both couple codes
sjplimp Apr 14, 2023
213a6d8
silence compiler warning
akohlmey Apr 14, 2023
88dcad5
silence compiler warnings
akohlmey Apr 14, 2023
7e4d180
silence compiler warnings
akohlmey Apr 16, 2023
a746044
simplify and modernize. apply clang-format.
akohlmey Apr 16, 2023
08bf9e2
apply clang-format
akohlmey Apr 16, 2023
43cf7e9
mention DIFFRACTION package under Restrictions
akohlmey Apr 17, 2023
fcea2cc
zero out fix external local data when allocated to avoid uninitialize…
akohlmey Apr 18, 2023
5547492
Updated log file contents with species counts
athomps Apr 18, 2023
c2a58a6
Updated SMTBQ doc-page citations
athomps Apr 18, 2023
c1eecf0
Fix compile error with latest Kokkos lib
stanmoore1 Apr 18, 2023
94c773e
Merge pull request #3738 from athomps/smtbq-cites
akohlmey Apr 18, 2023
3b0eede
Merge pull request #3731 from yury-lysogorskiy/patch-1
akohlmey Apr 19, 2023
f436bd6
Merge pull request #3734 from lammps/example-couple-lammps-spparks
akohlmey Apr 19, 2023
bc27e96
Merge pull request #3737 from athomps/gcmc-region-triclinic
akohlmey Apr 19, 2023
1404424
Merge branch 'develop' into collected-small-changes
akohlmey Apr 19, 2023
4e466d8
whitespace
akohlmey Apr 19, 2023
a9e715b
KOKKOS updates
akohlmey Apr 19, 2023
040a43b
add false positives
akohlmey Apr 19, 2023
76afaef
Merge pull request #3735 from akohlmey/collected-small-changes
akohlmey Apr 19, 2023
9aa8f1b
Merge pull request #3739 from stanmoore1/kk_hash
akohlmey Apr 19, 2023
29ad47c
cosmetic changes to comments and code structure
sjplimp Apr 19, 2023
dab0239
whitespace
akohlmey Apr 19, 2023
58be6dc
Merge branch 'develop' into taylor
akohlmey Apr 19, 2023
2cf690c
fix typo
akohlmey Apr 19, 2023
e99a411
Merge pull request #3727 from taylor-a-barnes/taylor
akohlmey Apr 19, 2023
5cb3d15
Add Kokkos support for atom sorting on device
stanmoore1 Apr 19, 2023
f5e55bb
Need to set var
stanmoore1 Apr 19, 2023
cf2e55f
Update docs
stanmoore1 Apr 19, 2023
b58368d
whitespace
stanmoore1 Apr 19, 2023
b7ea2cc
Merge branch 'develop' of https://github.com/lammps/lammps into kk_sort
stanmoore1 Apr 19, 2023
28d31de
Add missing BinOp struct
stanmoore1 Apr 19, 2023
313b3a6
Fix typo
stanmoore1 Apr 19, 2023
bf32d21
fix typo
akohlmey Apr 20, 2023
c2027d7
correct logic error when applying group masks
akohlmey Apr 20, 2023
b548a06
Redefining already used variable name a->A in pair granular doc
jtclemm Apr 20, 2023
6ef6d6f
Fixing group mask bug in gran wall, clean up redundant nullptr assign…
jtclemm Apr 20, 2023
5c8f3a0
avoid 32-bit integer overflow when allocating memory for neighbor lis…
akohlmey Apr 20, 2023
b511681
Revert binsize change
stanmoore1 Apr 20, 2023
7c7e626
Revert docs
stanmoore1 Apr 20, 2023
e6e7121
Merge pull request #3744 from jtclemm/granular-updates
akohlmey Apr 20, 2023
2197d62
Merge remote-tracking branch 'github/develop' into collected-small-fixes
akohlmey Apr 21, 2023
8cfac6f
consolidate enum into header file
akohlmey Apr 21, 2023
30cdb63
modernize
akohlmey Apr 21, 2023
b735018
use ubuf() to encode/decode tagints into communication buffers
akohlmey Apr 21, 2023
4890d82
enable and apply clang-format
akohlmey Apr 21, 2023
d1ecb20
fix spelling and reformat
akohlmey Apr 21, 2023
77ad4fd
must initialize vest_temp to null to avoid segfaults
akohlmey Apr 21, 2023
7c723b4
add support for a region keyword to fix edpd/source and fix tdpd/source
akohlmey Apr 21, 2023
3e05efa
must initialize vest_temp to null to avoid segfaults
akohlmey Apr 21, 2023
f60ed39
docs: upgrade lammps_theme based on sphinx_rtd_theme 1.2.0
rbberger Apr 22, 2023
2667543
docs: set language to en
rbberger Apr 22, 2023
4c0705a
Be more specific about web browser support after tests on browserstac…
akohlmey Apr 22, 2023
601f2bf
Merge pull request #3747 from rbberger/doc_theme_upgrade
akohlmey Apr 22, 2023
6ca91b0
Merge branch 'develop' into collected-small-fixes
akohlmey Apr 22, 2023
94f8440
make choice of Sphinx version more conservative
akohlmey Apr 22, 2023
c6c470a
compilation fix for Fedora 38 from upstream
akohlmey Apr 22, 2023
ddf801f
add missing override properties
akohlmey Apr 22, 2023
b9c9409
silence compiler warnings
akohlmey Apr 22, 2023
07de4ab
refactor and reformat granular submodels
akohlmey Apr 23, 2023
31a7d10
silence compiler warning
akohlmey Apr 23, 2023
289601e
Adding changes to doc page
jtclemm Apr 24, 2023
bbbdfd5
Merge pull request #74 from jtclemm/collected-small-fixes
akohlmey Apr 24, 2023
c1da9c2
Merge pull request #3746 from akohlmey/fix-dpd-source-region
akohlmey Apr 24, 2023
a83c112
Merge remote-tracking branch 'github/develop' into collected-small-fixes
akohlmey Apr 24, 2023
3cd6c77
ignore GranSubModel styles until we have a more regularized granular …
akohlmey Apr 24, 2023
b28e650
add deprecation warning for cuboid and sphere keywords
akohlmey Apr 24, 2023
d76c9a1
fix spelling
akohlmey Apr 24, 2023
90496a6
Minor changes to the style/contribute modify pages
jtclemm Apr 24, 2023
cbc6351
Merge pull request #75 from jtclemm/collected-small-fixes
akohlmey Apr 24, 2023
217be1f
improve error message handling for code shared between fix nvt/nph/npt
akohlmey Apr 24, 2023
9f11cac
updated apptainer build definitions for almalinux 8/9
akohlmey Apr 25, 2023
58ec69c
plug memory leak in FixNHIntel class
akohlmey Apr 25, 2023
4aee151
Merge pull request #3745 from akohlmey/collected-small-fixes
akohlmey Apr 25, 2023
9b9b14e
add mechanism to record when Pair::ev_tally() was called and the corr…
akohlmey Apr 26, 2023
367b0af
document additional pair style restrictions for /tally computes
akohlmey Apr 26, 2023
d4a3903
improve error messages
akohlmey Apr 26, 2023
f686037
add false positive
akohlmey Apr 26, 2023
717c320
Merge pull request #3753 from akohlmey/tally-compute-warn
akohlmey Apr 26, 2023
89aa45e
Merge branch 'develop' of github.com:lammps/lammps into kk_sort
stanmoore1 Apr 26, 2023
449f543
fix grid index in read_electron_temperatures
kawai125 Apr 27, 2023
787399f
Reorganizing the programming manual and editing some text
jtclemm Apr 27, 2023
a4d56b5
Fix bug in atom sorting with triclinic boxes
stanmoore1 Apr 27, 2023
1f54dc3
Port changes to Kokkos
stanmoore1 Apr 27, 2023
c95a349
Small tweak
stanmoore1 Apr 27, 2023
4705f46
Merge branch 'triclinic_sort' of github.com:stanmoore1/lammps into kk…
stanmoore1 Apr 27, 2023
7c3deba
whitespace
stanmoore1 Apr 27, 2023
7791ab7
Fix small issue
stanmoore1 Apr 27, 2023
50adf2b
Add a couple notes to the docs
stanmoore1 Apr 27, 2023
b17f9ac
Small tweak to docs
stanmoore1 Apr 27, 2023
4a608dc
Merge pull request #3756 from stanmoore1/triclinic_sort
akohlmey Apr 27, 2023
8d6c3a7
Fix Markdown table in tools/tabulate/README.md
Apr 28, 2023
235372d
Fuse some Kokkos kernels to reduce launch latency for small systems
stanmoore1 Apr 28, 2023
29a2b58
Small cleanup
stanmoore1 Apr 28, 2023
24e7204
whitespace
stanmoore1 Apr 28, 2023
f66cf7c
Revert testing change
stanmoore1 Apr 28, 2023
2c8a49b
new compute count_type
sjplimp Apr 30, 2023
f644f70
doc page for new command
sjplimp Apr 30, 2023
c282d8d
add group support to new command
sjplimp May 1, 2023
2fe423c
bug fix
sjplimp May 1, 2023
e679936
Merge branch 'develop' into kk_sort
stanmoore1 May 1, 2023
370ec56
Whitespace
stanmoore1 May 1, 2023
0596017
Fix issues
stanmoore1 May 1, 2023
fd65000
Small refactor
stanmoore1 May 1, 2023
757130f
whitespace
stanmoore1 May 1, 2023
cd97288
Clarify with comment
stanmoore1 May 1, 2023
76f9336
whitespace
stanmoore1 May 1, 2023
f1b2994
Port changes to nve/sphere
stanmoore1 May 1, 2023
ef9ce62
update broken bond doc page
sjplimp May 1, 2023
fae0ef6
update count/type doc page
sjplimp May 1, 2023
f8058f0
Fix bug
stanmoore1 May 1, 2023
dbcc19a
Fix uninitialized variables
stanmoore1 May 1, 2023
41a0196
Merge pull request #3740 from stanmoore1/kk_sort
akohlmey May 1, 2023
53848be
improve error messages
akohlmey Apr 28, 2023
d1f64c0
show/explain alternate LJ potential using the minimum energy distance
akohlmey May 2, 2023
4780581
integrate CMake build procedure for tools/phonon
akohlmey Apr 29, 2023
39a7706
update so it can be built either standalone or as subdir with LAMMPS
akohlmey Apr 29, 2023
a2b74c8
small doc update
akohlmey May 2, 2023
73b8bb8
fix bug that breaks compilation with -DLAMMPS_BIGBIG
akohlmey May 2, 2023
b38544a
apply clang-format
akohlmey May 2, 2023
ff29ef7
use more obvious representation of 2^53
akohlmey May 2, 2023
ba747e5
suppress bogus warnings with gcc 13.0 and later
akohlmey May 2, 2023
c8d5b9e
avoid uninitialized pointers
akohlmey May 2, 2023
56f791e
avoid uninitialized data access for scalar data
akohlmey May 2, 2023
12135ba
add unit tests for compute count/type
akohlmey May 2, 2023
eacb420
whitespace
akohlmey May 2, 2023
d2bb1b4
simplify and cleanup
akohlmey May 2, 2023
c5e4f7c
modernize
akohlmey May 2, 2023
8ca1e2d
add OpenMP suppression for GNU 13 compilers
akohlmey May 2, 2023
d13096e
improve error message
akohlmey May 2, 2023
fdf9288
Merge branch 'develop' into kk_fuse
stanmoore1 May 2, 2023
aa44474
expand to angles, dihedrals, impropers
sjplimp May 2, 2023
22eb09e
sunc with GHub version
sjplimp May 2, 2023
8a90915
Revert "use more obvious representation of 2^53"
akohlmey May 2, 2023
3119434
apply clang-format
akohlmey May 2, 2023
e8a77c6
whitespace
akohlmey May 2, 2023
b6e211d
consistently declare variables when used only
akohlmey May 2, 2023
3f8cd45
update unit test
akohlmey May 2, 2023
6d05037
fix compilation with -DLAMMPS_BIGBIG
akohlmey May 2, 2023
36632e3
Clarifying how BPM package works
jtclemm May 2, 2023
7b5fecf
make phana installation in LAMMPS compatible with ubuntu 18.04LTS
akohlmey May 2, 2023
a8dcb39
silence compiler warning
akohlmey May 2, 2023
3e3ed89
avoid out-of-range access if an angle/dihedral/improper type is set to 0
akohlmey May 2, 2023
7ab30aa
add versionadded tag
akohlmey May 2, 2023
81523b7
Merge branch 'patch-2' of github.com:srtee/lammps into collected-smal…
akohlmey May 2, 2023
25bc0bd
Merge pull request #3762 from akohlmey/phana-cmake-build
akohlmey May 2, 2023
db38d99
Merge pull request #3758 from stanmoore1/kk_fuse
akohlmey May 3, 2023
8054923
Merge pull request #3761 from lammps/count-types
akohlmey May 3, 2023
89d59fa
Merge branch 'develop' into collected-small-fixes
akohlmey May 3, 2023
2542a7e
avoid integer overflow
akohlmey May 3, 2023
6285811
offset positions so bin indices are >= 0 even for positions < 0
akohlmey May 3, 2023
b560559
Fix issues with Kokkos minimize
stanmoore1 May 3, 2023
5a52369
Reading mask too
stanmoore1 May 3, 2023
c9cfc95
polishing variable doc page and code
sjplimp May 3, 2023
936b24e
allow vector variable to be initialized
sjplimp May 3, 2023
42e090d
replace tabs and remove trailing whitespace
akohlmey May 4, 2023
b61e06a
must initialize fp to avoid crash in destructor
akohlmey May 4, 2023
de45437
apply clang-format
akohlmey May 4, 2023
a0d9854
more thorough tests and PBC handling for compute stress/cartesian
akohlmey May 4, 2023
ccc1b20
add output option for vector-style vars
sjplimp May 4, 2023
40f7c90
correct underline
akohlmey May 4, 2023
042829c
Start document about per-atom properties and atom data access
akohlmey May 4, 2023
8fe4394
spelling
akohlmey May 4, 2023
77ea3ed
reduce sphinx warnings
akohlmey May 4, 2023
d4554fc
Merge branch 'develop' into doc-edits
akohlmey May 4, 2023
269f07a
fix a few more sphinx issues and inconsistencies
akohlmey May 4, 2023
93100ad
debugging and doc pages
sjplimp May 4, 2023
5da1df5
add versionadded tag
akohlmey May 5, 2023
0c10184
whitespace, simplify
akohlmey May 5, 2023
67b6a1d
fixup broken unit tests
akohlmey May 5, 2023
0b71371
reax/species: variable input for Nlimit keyword
jrgissing May 5, 2023
b3130a2
Merge pull request #3763 from akohlmey/collected-small-fixes
akohlmey May 5, 2023
6ffa720
Merge branch 'develop' into vector-variable
akohlmey May 5, 2023
0de35de
spelling
akohlmey May 5, 2023
366b645
add a few unit tests for static vector style variables
akohlmey May 5, 2023
1b7f943
simplify parse_vector() method by using Tokenizer class
akohlmey May 5, 2023
0facd4c
support vector variable definitions with embedded blanks
akohlmey May 5, 2023
c328761
Merge branch 'develop' into doc-edits
akohlmey May 5, 2023
56f06bc
Reordering styles by priority, misc clean ups
jtclemm May 5, 2023
aa62a2a
Merge branch 'doc-edits' of https://github.com/jtclemm/lammps into do…
akohlmey May 5, 2023
b916184
more robust variable error checks
jrgissing May 5, 2023
806af53
Kokkos package optimizations
stanmoore1 May 6, 2023
6074303
whitespace
stanmoore1 May 6, 2023
0cd95d6
Merge pull request #3768 from jrgissing/fix_reaxff/species-variable_N…
akohlmey May 6, 2023
d8584bb
Hacky first pass at kim scaling
ilia-nikiforov-umn May 6, 2023
15116a0
Merge pull request #3766 from stanmoore1/kk_min_bug
akohlmey May 7, 2023
b1d0f4a
correct timer time output format for timeouts > 24 hours
akohlmey May 5, 2023
7b46f15
use macOS consistently (missed a few places in the last round)
akohlmey May 6, 2023
7342f27
clarify download info
akohlmey May 6, 2023
8ed42f6
remove unused communication API
akohlmey May 8, 2023
69f60c5
bugfix in fix_ttm
kawai125 May 8, 2023
a6f6040
resolve formatting issues and add a few style tweaks from languagetoo…
akohlmey May 8, 2023
abe238c
use correct spelling for semicolon
akohlmey May 8, 2023
49ac79f
change error checks for computes that are not current
sjplimp May 8, 2023
fceff84
Merge pull request #3754 from kawai125/bugfix-fix_ttm_mod-read_electr…
akohlmey May 8, 2023
200f740
update variable doc page to explain new behavior
sjplimp May 8, 2023
820899c
use more obvious pair style dpd thermostat examples
akohlmey May 8, 2023
a6310f1
streamlined scaling implementation
ilia-nikiforov-umn May 8, 2023
9512568
improve pair_coeff error message for pair styles derived from PairHybrid
akohlmey May 9, 2023
c54ff43
compile time compatibility with swig 4.1
akohlmey May 9, 2023
4c51264
explain how to keep pairs in the neighbor list even if the scaling fa…
akohlmey May 9, 2023
ee5a300
updated doc for kim adapt
ilia-nikiforov-umn May 9, 2023
9890987
Merge remote-tracking branch 'github/develop' into variable-current
akohlmey May 10, 2023
f015aaf
compile time compatibility with swig 4.1
akohlmey May 9, 2023
d2361ff
add workaround for reset_atoms image
akohlmey May 10, 2023
a92e003
whitespace
akohlmey May 10, 2023
f74947a
Fixed read-in of initial electron temperature file
May 10, 2023
7c48837
upgrade sphinx-tabs
akohlmey May 10, 2023
4c65aa5
Prefer custom python interpreter set via -DPython_EXECUTABLE if possible
akohlmey May 10, 2023
dd3d4e2
bump minimum requirement for building docs to python 3.8
akohlmey May 10, 2023
54b2a5c
allow internal variables in reset_atoms to be used before first run
sjplimp May 12, 2023
9ef4d7f
allow internal variables in reset_atoms to be used before first run
sjplimp May 12, 2023
f1a3d0c
whitespace
akohlmey May 12, 2023
b54d39a
minor editing changes
sjplimp May 12, 2023
cbb0558
correct comments
akohlmey May 12, 2023
5f34f53
also use 1-based indexing when writing out the electron temperature
akohlmey May 12, 2023
0abb217
whitespace
akohlmey May 12, 2023
9a8640c
Merge pull request #3767 from lammps/vector-variable
akohlmey May 12, 2023
aa069b2
fix typos
akohlmey May 12, 2023
cd79276
small formatting tweaks
akohlmey May 12, 2023
96af466
as a few details to the discussion of programming languages and their…
akohlmey May 12, 2023
ac4cf2d
Merge pull request #3776 from inflowencer/develop
akohlmey May 12, 2023
8414d23
use symbolic constants
akohlmey May 12, 2023
d6d8252
Merge pull request #3771 from lammps/variable-current
akohlmey May 12, 2023
c76e85c
Merge pull request #3770 from akohlmey/collected-small-fixes
akohlmey May 13, 2023
2d18883
Merge pull request #3755 from jtclemm/doc-edits
akohlmey May 13, 2023
17747a3
moved scaling to immediately after compute and removed virial scaling
ilia-nikiforov-umn May 14, 2023
d584f2f
follow LAMMMPS' programming style more closely
akohlmey May 15, 2023
ed958d8
Merge branch 'develop' into kim_adapt
akohlmey May 15, 2023
cf51c94
update unit test for presence of Pair::extract() function in pair sty…
akohlmey May 15, 2023
91e0d04
one more programming style tweak
akohlmey May 15, 2023
2328cae
Merge branch 'develop' of https://github.com/lammps/lammps into kk_op…
stanmoore1 May 15, 2023
a844703
Merge pull request #3777 from ilia-nikiforov-umn/kim_adapt
akohlmey May 16, 2023
b9256fa
Reduce memory allocations
stanmoore1 May 16, 2023
b1ee177
Must use local variable for lambda capture
stanmoore1 May 16, 2023
858fd4c
Small optimization
stanmoore1 May 16, 2023
4f57026
whitespace
akohlmey May 17, 2023
e044ccb
Bugfix fix_efield.cpp for atom-style energy
May 17, 2023
1663011
Merge pull request #3769 from stanmoore1/kk_optimize
akohlmey May 17, 2023
377c652
Update Colvars library to version 2023-05-01
giacomofiorin May 17, 2023
5be9eda
Merge pull request #3780 from srtee/patch-3
akohlmey May 17, 2023
39f61b6
Merge branch 'develop' into pimd_langevin
akohlmey May 17, 2023
8736f97
remove dead code
akohlmey May 17, 2023
79f3eb6
remove debug code
akohlmey May 17, 2023
5d66dc6
apply clang-format
akohlmey May 17, 2023
1088033
Merge pull request #3783 from Colvars/colvars-update
akohlmey May 17, 2023
d8ca627
Merge branch 'develop' into pimd_langevin
akohlmey May 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 13 additions & 13 deletions bench/in.chain
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# FENE beadspring benchmark

units lj
atom_style bond
units lj
atom_style bond
special_bonds fene

read_data data.chain
read_data data.chain

neighbor 0.4 bin
neigh_modify every 1 delay 1
neighbor 0.4 bin
neigh_modify every 1 delay 1

bond_style fene
bond_coeff 1 30.0 1.5 1.0 1.0
bond_coeff 1 30.0 1.5 1.0 1.0

pair_style lj/cut 1.12
pair_modify shift yes
pair_coeff 1 1 1.0 1.0 1.12
pair_style lj/cut 1.12
pair_modify shift yes
pair_coeff 1 1 1.0 1.0 1.12

fix 1 all nve
fix 2 all langevin 1.0 1.0 10.0 904297
fix 1 all nve
fix 2 all langevin 1.0 1.0 10.0 904297

thermo 100
timestep 0.012
timestep 0.012

run 100
run 100
36 changes: 18 additions & 18 deletions bench/in.chain.scaled
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
# FENE beadspring benchmark

variable x index 1
variable y index 1
variable z index 1
variable x index 1
variable y index 1
variable z index 1

units lj
atom_style bond
atom_modify map hash
units lj
atom_style bond
atom_modify map hash
special_bonds fene

read_data data.chain
read_data data.chain

replicate $x $y $z
replicate $x $y $z

neighbor 0.4 bin
neigh_modify every 1 delay 1
neighbor 0.4 bin
neigh_modify every 1 delay 1

bond_style fene
bond_coeff 1 30.0 1.5 1.0 1.0
bond_coeff 1 30.0 1.5 1.0 1.0

pair_style lj/cut 1.12
pair_modify shift yes
pair_coeff 1 1 1.0 1.0 1.12
pair_style lj/cut 1.12
pair_modify shift yes
pair_coeff 1 1 1.0 1.0 1.12

fix 1 all nve
fix 2 all langevin 1.0 1.0 10.0 904297
fix 1 all nve
fix 2 all langevin 1.0 1.0 10.0 904297

thermo 100
timestep 0.012
timestep 0.012

run 100
run 100
44 changes: 22 additions & 22 deletions bench/in.chute
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
# LAMMPS benchmark of granular flow
# chute flow of 32000 atoms with frozen base at 26 degrees

units lj
atom_style sphere
boundary p p fs
newton off
comm_modify vel yes
units lj
atom_style sphere
boundary p p fs
newton off
comm_modify vel yes

read_data data.chute
read_data data.chute

pair_style gran/hooke/history 200000.0 NULL 50.0 NULL 0.5 0
pair_coeff * *
pair_style gran/hooke/history 200000.0 NULL 50.0 NULL 0.5 0
pair_coeff * *

neighbor 0.1 bin
neigh_modify every 1 delay 0
neighbor 0.1 bin
neigh_modify every 1 delay 0

timestep 0.0001
timestep 0.0001

group bottom type 2
group active subtract all bottom
neigh_modify exclude group bottom bottom
group bottom type 2
group active subtract all bottom
neigh_modify exclude group bottom bottom

fix 1 all gravity 1.0 chute 26.0
fix 2 bottom freeze
fix 3 active nve/sphere
fix 1 all gravity 1.0 chute 26.0
fix 2 bottom freeze
fix 3 active nve/sphere

compute 1 all erotate/sphere
thermo_style custom step atoms ke c_1 vol
thermo_modify norm no
thermo 100
compute 1 all erotate/sphere
thermo_style custom step atoms ke c_1 vol
thermo_modify norm no
thermo 100

run 100
run 100
50 changes: 25 additions & 25 deletions bench/in.chute.scaled
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# LAMMPS benchmark of granular flow
# chute flow of 32000 atoms with frozen base at 26 degrees

variable x index 1
variable y index 1
variable x index 1
variable y index 1

units lj
atom_style sphere
boundary p p fs
newton off
comm_modify vel yes
units lj
atom_style sphere
boundary p p fs
newton off
comm_modify vel yes

read_data data.chute
read_data data.chute

replicate $x $y 1
replicate $x $y 1

pair_style gran/hooke/history 200000.0 NULL 50.0 NULL 0.5 0
pair_coeff * *
pair_style gran/hooke/history 200000.0 NULL 50.0 NULL 0.5 0
pair_coeff * *

neighbor 0.1 bin
neigh_modify every 1 delay 0
neighbor 0.1 bin
neigh_modify every 1 delay 0

timestep 0.0001
timestep 0.0001

group bottom type 2
group active subtract all bottom
neigh_modify exclude group bottom bottom
group bottom type 2
group active subtract all bottom
neigh_modify exclude group bottom bottom

fix 1 all gravity 1.0 chute 26.0
fix 2 bottom freeze
fix 3 active nve/sphere
fix 1 all gravity 1.0 chute 26.0
fix 2 bottom freeze
fix 3 active nve/sphere

compute 1 all erotate/sphere
thermo_style custom step atoms ke c_1 vol
thermo_modify norm no
thermo 100
compute 1 all erotate/sphere
thermo_style custom step atoms ke c_1 vol
thermo_modify norm no
thermo 100

run 100
run 100
40 changes: 20 additions & 20 deletions bench/in.eam
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
# bulk Cu lattice

variable x index 1
variable y index 1
variable z index 1
variable x index 1
variable y index 1
variable z index 1

variable xx equal 20*$x
variable yy equal 20*$y
variable zz equal 20*$z
variable xx equal 20*$x
variable yy equal 20*$y
variable zz equal 20*$z

units metal
atom_style atomic
units metal
atom_style atomic

lattice fcc 3.615
region box block 0 ${xx} 0 ${yy} 0 ${zz}
create_box 1 box
create_atoms 1 box
lattice fcc 3.615
region box block 0 ${xx} 0 ${yy} 0 ${zz}
create_box 1 box
create_atoms 1 box

pair_style eam
pair_coeff 1 1 Cu_u3.eam
pair_style eam
pair_coeff 1 1 Cu_u3.eam

velocity all create 1600.0 376847 loop geom
velocity all create 1600.0 376847 loop geom

neighbor 1.0 bin
neighbor 1.0 bin
neigh_modify every 1 delay 5 check yes

fix 1 all nve
fix 1 all nve

timestep 0.005
thermo 50
timestep 0.005
thermo 50

run 100
run 100
40 changes: 20 additions & 20 deletions bench/in.lj
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
# 3d Lennard-Jones melt

variable x index 1
variable y index 1
variable z index 1
variable x index 1
variable y index 1
variable z index 1

variable xx equal 20*$x
variable yy equal 20*$y
variable zz equal 20*$z
variable xx equal 20*$x
variable yy equal 20*$y
variable zz equal 20*$z

units lj
atom_style atomic
units lj
atom_style atomic

lattice fcc 0.8442
region box block 0 ${xx} 0 ${yy} 0 ${zz}
create_box 1 box
create_atoms 1 box
mass 1 1.0
lattice fcc 0.8442
region box block 0 ${xx} 0 ${yy} 0 ${zz}
create_box 1 box
create_atoms 1 box
mass 1 1.0

velocity all create 1.44 87287 loop geom
velocity all create 1.44 87287 loop geom

pair_style lj/cut 2.5
pair_coeff 1 1 1.0 1.0 2.5
pair_style lj/cut 2.5
pair_coeff 1 1 1.0 1.0 2.5

neighbor 0.3 bin
neigh_modify delay 0 every 20 check no
neighbor 0.3 bin
neigh_modify delay 0 every 20 check no

fix 1 all nve
fix 1 all nve

run 100
run 100
28 changes: 14 additions & 14 deletions bench/in.rhodo
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# Rhodopsin model

units real
neigh_modify delay 5 every 1
units real
neigh_modify delay 5 every 1

atom_style full
bond_style harmonic
angle_style charmm
dihedral_style charmm
improper_style harmonic
pair_style lj/charmm/coul/long 8.0 10.0
pair_modify mix arithmetic
kspace_style pppm 1e-4
atom_style full
bond_style harmonic
angle_style charmm
dihedral_style charmm
improper_style harmonic
pair_style lj/charmm/coul/long 8.0 10.0
pair_modify mix arithmetic
kspace_style pppm 1e-4

read_data data.rhodo

fix 1 all shake 0.0001 5 0 m 1.0 a 232
fix 2 all npt temp 300.0 300.0 100.0 &
z 0.0 0.0 1000.0 mtk no pchain 0 tchain 1
z 0.0 0.0 1000.0 mtk no pchain 0 tchain 1

special_bonds charmm

thermo 50
thermo_style multi
thermo_style multi
timestep 2.0

run 100
run 100