diff --git a/doc/src/kspace_modify.txt b/doc/src/kspace_modify.txt index 7a6c7191f053702655fef2a66ba162f35c094037..b488df9627800e47d27d62849d0e0e18c0348e7d 100644 --- a/doc/src/kspace_modify.txt +++ b/doc/src/kspace_modify.txt @@ -290,9 +290,10 @@ to be specified using the {gewald/disp}, {mesh/disp}, {force/disp/real} or {force/disp/kspace} keywords, or the code will stop with an error message. When this option is set to {yes}, the error message will not appear and the simulation will start. -For a typical application, using the automatic parameter generation will provide -simulations that are either inaccurate or slow. Using this option is thus not -recommended. For guidelines on how to obtain good parameters, see the "How-To"_Section_howto.html#howto_23 discussion. +For a typical application, using the automatic parameter generation +will provide simulations that are either inaccurate or slow. Using this +option is thus not recommended. For guidelines on how to obtain good +parameters, see the "How-To"_Section_howto.html#howto_24 discussion. [Restrictions:] none diff --git a/src/ASPHERE/compute_temp_asphere.cpp b/src/ASPHERE/compute_temp_asphere.cpp index 029b76cb27f16a94d96ed4bd793e2b7745fb237c..e8d3fcb52776d99d0323699e08cad6d69f85ba50 100644 --- a/src/ASPHERE/compute_temp_asphere.cpp +++ b/src/ASPHERE/compute_temp_asphere.cpp @@ -73,6 +73,11 @@ ComputeTempAsphere::ComputeTempAsphere(LAMMPS *lmp, int narg, char **arg) : } else error->all(FLERR,"Illegal compute temp/asphere command"); } + // when computing only the rotational temperature, + // do not remove DOFs for translation as set by default + + if (mode == ROTATE) extra_dof = 0; + vector = new double[6]; } diff --git a/src/COMPRESS/Install.sh b/src/COMPRESS/Install.sh index ef1c8920c8686f3a4737cd6114b445c7aedc83ec..ab9dac33dc92f2b9bfa70f13c32438dfa20d6108 100644 --- a/src/COMPRESS/Install.sh +++ b/src/COMPRESS/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/Install.sh b/src/Install.sh index 307188a09f7e4b2453be98a9c60dd2342584a14b..e9c8b8059554567183dacd6d25324c03a07ee187 100644 --- a/src/Install.sh +++ b/src/Install.sh @@ -33,5 +33,5 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done diff --git a/src/KIM/Install.sh b/src/KIM/Install.sh index bac9d97cc62cc620d618c77a880cf608b6ffdd06..7ddb9c8227ce027476157f9829fd644a2a6e9071 100644 --- a/src/KIM/Install.sh +++ b/src/KIM/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/MEAM/Install.sh b/src/MEAM/Install.sh index 1825d4327f461af90310f5a7aa646793b302e291..7bfc76c0e2ed72390f980347ea1130e8d5850c82 100644 --- a/src/MEAM/Install.sh +++ b/src/MEAM/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/MPIIO/Install.sh b/src/MPIIO/Install.sh index 3834aea5c5c7498f31dbd8edb5dce3aed9e734ee..902bff2fc8cc2ff23b8742d75f69f6ab2d3712de 100644 --- a/src/MPIIO/Install.sh +++ b/src/MPIIO/Install.sh @@ -36,7 +36,7 @@ touch ../write_restart.cpp # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package to include/exclude LMP_MPIIO setting diff --git a/src/MSCG/Install.sh b/src/MSCG/Install.sh index f7c7452101897ef3d9778072a927fc9d6f8ca69f..353403c7da5b2c09d0023fd49ba6826a2abf6fc9 100755 --- a/src/MSCG/Install.sh +++ b/src/MSCG/Install.sh @@ -25,7 +25,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/POEMS/Install.sh b/src/POEMS/Install.sh index 7996f542be37dc8e8a4d5f358329067d9e8e0afe..be407d76f0a65fa58e15fdd7abdb2da48439bdb9 100644 --- a/src/POEMS/Install.sh +++ b/src/POEMS/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/PYTHON/Install.sh b/src/PYTHON/Install.sh index 3d6f71958a7f9caf30ad8365a71eb67622e453f7..71288cf3774127d44970449d7fcf06921caf0e2b 100755 --- a/src/PYTHON/Install.sh +++ b/src/PYTHON/Install.sh @@ -35,7 +35,7 @@ touch ../variable.cpp # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/REAX/Install.sh b/src/REAX/Install.sh index f0083810e9b403acc48710010531d217c90621c9..bf8c8dbca2cbdfe488ef3cce5320cf8c4b1dee34 100644 --- a/src/REAX/Install.sh +++ b/src/REAX/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/USER-ATC/Install.sh b/src/USER-ATC/Install.sh index 113738901843421f6d5d3e9a6f4fef6372203f3a..f719fe220f7c60438c55e28ddd22458d20897b1a 100755 --- a/src/USER-ATC/Install.sh +++ b/src/USER-ATC/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/USER-AWPMD/Install.sh b/src/USER-AWPMD/Install.sh index 7922c53395e986a62699b24a61a4f6b48faa59e3..094e10c157549e27405f539bb0824ea96516399a 100644 --- a/src/USER-AWPMD/Install.sh +++ b/src/USER-AWPMD/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/USER-COLVARS/Install.sh b/src/USER-COLVARS/Install.sh index c01719e76630a4a170c4a3f7b715cfbf3bb1dc08..d67883a41614fd9028453aac9a18f0ad79948d79 100755 --- a/src/USER-COLVARS/Install.sh +++ b/src/USER-COLVARS/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/USER-H5MD/Install.sh b/src/USER-H5MD/Install.sh index bdda732807b033c6631a26ae74c124e9d98734d1..1070afaa9618eaed1debcab9bb528a648224fdf8 100644 --- a/src/USER-H5MD/Install.sh +++ b/src/USER-H5MD/Install.sh @@ -27,7 +27,7 @@ action () { } for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/USER-MISC/Install.sh b/src/USER-MISC/Install.sh index 203d9231641ee7fe7013e2b06c456c691808fa7b..2d42125ec3a79cdb00cc88cb31d12b8be3959f4d 100644 --- a/src/USER-MISC/Install.sh +++ b/src/USER-MISC/Install.sh @@ -35,6 +35,6 @@ for file in *.cpp *.h; do elif (test $file = "pair_cdeam.h") then action pair_cdeam.h pair_eam_alloy.cpp else - action $file + test -f ${file} && action $file fi done diff --git a/src/USER-MOLFILE/Install.sh b/src/USER-MOLFILE/Install.sh index 19fd3bd361fab307063d032ec346e0ea8224572d..85885f66b921a118b5a05b5a365556a2db9f5f77 100644 --- a/src/USER-MOLFILE/Install.sh +++ b/src/USER-MOLFILE/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/USER-NC-DUMP/Install.sh b/src/USER-NC-DUMP/Install.sh index 37ebd0a0a5b5abda1dfe33545f899e5c46a5afaf..4d21f0f894b9cba4abd69549852f7c72ee3a7549 100644 --- a/src/USER-NC-DUMP/Install.sh +++ b/src/USER-NC-DUMP/Install.sh @@ -27,7 +27,7 @@ action () { } for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/USER-QMMM/Install.sh b/src/USER-QMMM/Install.sh index 089b880a777f8c236f203866eccd5c1f820edb23..4bede66d80676acc18fbc9fd7f004eab2e79cb1c 100755 --- a/src/USER-QMMM/Install.sh +++ b/src/USER-QMMM/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/USER-QUIP/Install.sh b/src/USER-QUIP/Install.sh index ee7faaf62aad7697b3f1f2e64eeb28d1522ea312..20174e664a4478a067f6a0014146b6966e641d76 100644 --- a/src/USER-QUIP/Install.sh +++ b/src/USER-QUIP/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/USER-SMD/Install.sh b/src/USER-SMD/Install.sh index c0f48c54603b2ce0140e83d04cb65ac5f20443f2..cb9aa5452bc08d71135c82bb21381fcf840acca9 100644 --- a/src/USER-SMD/Install.sh +++ b/src/USER-SMD/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/USER-VTK/Install.sh b/src/USER-VTK/Install.sh index d02dc8777269b9bd37d9ef03b99acb836584b121..3749242fb2183eaa2d7bf75738f32e838c431d4a 100644 --- a/src/USER-VTK/Install.sh +++ b/src/USER-VTK/Install.sh @@ -27,7 +27,7 @@ action () { } for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/VORONOI/Install.sh b/src/VORONOI/Install.sh index f21e9404ebee3408d20b1880c29dd7129d334491..6373506b19cf21dfbf16830dfe38bf344f7171aa 100755 --- a/src/VORONOI/Install.sh +++ b/src/VORONOI/Install.sh @@ -29,7 +29,7 @@ action () { # all package files with no dependencies for file in *.cpp *.h; do - action $file + test -f ${file} && action $file done # edit 2 Makefile.package files to include/exclude package info diff --git a/src/compute_temp_sphere.cpp b/src/compute_temp_sphere.cpp index 50995dfa8405eff4ae937eb05b4441839b381948..febb9339b4888e9d74875ae4ccfd8e0e583f33d7 100644 --- a/src/compute_temp_sphere.cpp +++ b/src/compute_temp_sphere.cpp @@ -67,6 +67,11 @@ ComputeTempSphere::ComputeTempSphere(LAMMPS *lmp, int narg, char **arg) : } else error->all(FLERR,"Illegal compute temp/sphere command"); } + // when computing only the rotational temperature, + // do not remove DOFs for translation as set by default + + if (mode == ROTATE) extra_dof = 0; + vector = new double[6]; // error checks diff --git a/src/fix_ave_histo.cpp b/src/fix_ave_histo.cpp index e0d010aacb4f8a33c0850400a8603da0e9c7579d..b4516a0fd29f6149370acede868c089c793f59ff 100644 --- a/src/fix_ave_histo.cpp +++ b/src/fix_ave_histo.cpp @@ -205,14 +205,18 @@ FixAveHisto::FixAveHisto(LAMMPS *lmp, int narg, char **arg) : for (int i = 0; i < nvalues; i++) { if (which[i] == X || which[i] == V || which[i] == F) kindflag = PERATOM; else if (which[i] == COMPUTE) { - Compute *compute = modify->compute[modify->find_compute(ids[i])]; + int c_id = modify->find_compute(ids[i]); + if (c_id < 0) error->all(FLERR,"Fix ave/histo input is invalid compute"); + Compute *compute = modify->compute[c_id]; if (compute->scalar_flag || compute->vector_flag || compute->array_flag) kindflag = GLOBAL; else if (compute->peratom_flag) kindflag = PERATOM; else if (compute->local_flag) kindflag = LOCAL; else error->all(FLERR,"Fix ave/histo input is invalid compute"); } else if (which[i] == FIX) { - Fix *fix = modify->fix[modify->find_fix(ids[i])]; + int f_id = modify->find_fix(ids[i]); + if (f_id < 0) error->all(FLERR,"Fix ave/histo input is invalid fix"); + Fix *fix = modify->fix[f_id]; if (fix->scalar_flag || fix->vector_flag || fix->array_flag) kindflag = GLOBAL; else if (fix->peratom_flag) kindflag = PERATOM; @@ -220,6 +224,7 @@ FixAveHisto::FixAveHisto(LAMMPS *lmp, int narg, char **arg) : else error->all(FLERR,"Fix ave/histo input is invalid fix"); } else if (which[i] == VARIABLE) { int ivariable = input->variable->find(ids[i]); + if (ivariable < 0) error->all(FLERR,"Fix ave/histo input is invalid variable"); if (input->variable->equalstyle(ivariable)) kindflag = GLOBAL; else if (input->variable->atomstyle(ivariable)) kindflag = PERATOM; else error->all(FLERR,"Fix ave/histo input is invalid variable");