Unverified Commit a3fd7345 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into next_patch_version

parents e243ca92 18a0cd3e

.github/CODEOWNERS

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ src/exceptions.h @rbberger 
src/fix_nh.*              @athomps

src/info.*                @akohlmey @rbberger

src/timer.*               @akohlmey

src/min*                  @sjplimp @stanmoore1



# tools

tools/msi2lmp/*       @akohlmey

doc/src/fix_ave_atom.rst

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ command creates a per-atom array with 6 columns: 


   compute my_stress all stress/atom NULL

   fix 1 all ave/atom 10 20 1000 c_my_stress[\*]

   fix 1 all ave/atom 10 20 1000 c_my_stress[1] c_my_stress[1] &

   fix 1 all ave/atom 10 20 1000 c_my_stress[1] c_my_stress[2] &

                                 c_my_stress[3] c_my_stress[4] &

                                 c_my_stress[5] c_my_stress[6]

doc/src/pair_lj.rst

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ pair\_style lj/cut/tip4p/long/omp command 
pair\_style lj/cut/tip4p/long/opt command

=========================================



pair\_style lj/cut/tip4p/long/gpu command

=====================================



Syntax

""""""

doc/txt/fix_ave_atom.txt

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ command creates a per-atom array with 6 columns: 


compute my_stress all stress/atom NULL

fix 1 all ave/atom 10 20 1000 c_my_stress\[*\]

fix 1 all ave/atom 10 20 1000 c_my_stress\[1\] c_my_stress\[1\] &

fix 1 all ave/atom 10 20 1000 c_my_stress\[1\] c_my_stress\[2\] &

                              c_my_stress\[3\] c_my_stress\[4\] &

                              c_my_stress\[5\] c_my_stress\[6\] :pre

examples/TIP4P/gpu_dump/data.spce

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../rdf-adf/data.spce
 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE