Commit Graph

282 Commits

Author SHA1 Message Date
f704079fb7 remove trailing whitespace 2019-11-12 16:13:01 -05:00
c5b0f0afcf add documention to FixPour::outside(), simplify logic a bit 2019-11-07 17:06:38 -07:00
fed1a72bb5 Merge pull request #1569 from JunChiehWang/random_deposit
throw away random numbers to avoid unexpected correlations
2019-10-30 16:55:45 -04:00
224ea41838 Merge pull request #1751 from akohlmey/user-vtk-bugfix
USER-VTK bug fix
2019-10-30 16:54:54 -04:00
5b2301c2b5 whitespace cleanup to re-trigger jenkins 2019-10-30 16:28:05 -04:00
3e2b572efd Fix special case for outside check in fix pour
If the range between lo and hi is bigger than the extent in that dimension, in
the periodic case the value will always be inside.
2019-10-30 12:01:38 -04:00
4a0495aefc Fixes issue #1695
There was a logic error in the outside() function used by fix pour.
The previous implementation was essentially doing this:

outside = outside_pbc_range || outside_regular_range

It should have been:

outside = outside_pbc_range && outside_regular_range
2019-10-29 17:09:29 -04:00
22288e06b7 Merge branch 'master' into fix-compiler-warnings 2019-10-25 14:07:50 -04:00
5b47b0b098 formatting and reduce compiler warnings 2019-10-18 07:14:35 -04:00
dcb1b6500b allow regexp matches for Modify::find_fix_by_style() and consolidate usage of searching for fixes 2019-10-18 06:59:27 -04:00
fe20490891 more use of utils::sfread() 2019-10-17 17:06:12 -04:00
6e244bc8dc Merge pull request #1631 from jibril-b-coulibaly/patch-2
Bug fixes for pair style granular
2019-10-09 14:14:48 +02:00
f864a52720 Merge branch 'master' into random_deposit 2019-10-04 14:55:29 +02:00
747bfa31f2 apply changes suggested by Andrew Santos 2019-10-03 18:31:42 +02:00
12803b7dcf add newton_pair flag to ev_tally_xyz function 2019-09-26 16:01:24 -05:00
bfacab7be7 remove non-compliant comments 2019-09-25 08:55:33 -05:00
42b282fe36 Merge pull request #1637 from dsbolin/granular_bug_fixes
Bug fix for fix/wall/gran
2019-08-21 00:09:04 -04:00
cc14103f28 Bug fixes in granular pair style:
- correct formula for tangent forces in style with no history in compute() and in single() functions
- remove tangent history update in the single() function
- implement correct output for tangent, normal and rolling forces in single() function
- correct typos in documentation
2019-08-16 15:28:36 -05:00
578bcf0fb0 Fixes normal force calculation bug in fix wall granular, allows twisting to be used without rolling in fix/wall/gran 2019-08-16 01:19:08 -06:00
37a046cf1e Update pair_granular.cpp
Modified PairGranular::single function to return the total normal force into argument fforce.

This was done for pair styles gran/* but not for the granular pari_style, resulting in the variable fforce being uninitialized.
2019-08-14 17:39:56 -05:00
2d93a713e2 Merge branch 'master' into collected-small-changes 2019-07-30 14:14:11 -04:00
b0bccfd8a1 fix typo 2019-07-30 06:55:47 -04:00
180c90acfb use utils::strmatch() to more safely detect gravity fix 2019-07-29 20:21:31 -04:00
0f9112d986 transfer pRNG init changes from fix deposit to fix pour 2019-07-29 20:03:16 -04:00
06dcc9e283 Merge branch 'master' into improve-include-consistency
# Conflicts:
#	src/USER-MESO/atom_vec_tdpd.cpp
2019-07-09 14:50:00 -04:00
03418be645 minor tweaks to already processed files 2019-07-08 16:22:55 -04:00
316554297c clean up includes in packages DIPOLE and GRANULAR 2019-07-06 10:00:24 -04:00
5b3a15bd94 putting implementation header first in package folder sources 2019-07-03 19:58:25 -04:00
e08146c31f Allow twisting torque to be used without rolling torque in pair granular 2019-06-25 12:06:18 -06:00
113b8b4be2 Fixes two bugs in pair granular: 1. User-set cutoffs did not work 2. Restarts not working 2019-05-30 14:21:11 -06:00
af8a71b1ad while space and source formatting cleanup 2019-04-29 09:17:29 -04:00
6088f2a6a2 One more bug in pair_granular.cpp, where JKR cutoff was incorrectly computed. Thanks to Ishan Srivastava for finding this one 2019-04-23 22:58:42 -06:00
0673f6f2b9 Fixes a bug in pair granular that caused JKR cutoffs to be set incorrectly when multiple types with multiple cohesion values are used 2019-04-23 15:52:32 -06:00
4b2388339e Fixes bug in calculation of relative tangential velocity for granular wall particle interactions.
Thanks to Andrew Santos for providing a test case that reveals this.
2019-04-16 16:59:21 -06:00
0b24a3d830 Added a 'mass_velocity' damping option to the new granular pair styles and granular wall interaction.
This is to more closely match the old style pair gran/hooke/* damping behavior.
Updated doc page accordingly, as well as adding some examples on how to match old pair gran/* styles.
2019-04-15 16:14:02 -06:00
d33a30806a Minor code clean up in pair_granular.cpp 2019-04-13 23:37:46 -06:00
4af22a723d Fixes several bugs in fix wall/gran, wall/gran/region:
1. Radius of curvature for curved regions was incorrectly used to compute wall-particle overlaps
2. Uninitialized values of rolling and twisting history could produce crashes in
cases that don't initialize these to 0 by default. These are now initialized to 0.
3. Fixed a bug with the use of 'NULL' for specification of the tangential stiffness for
wall/gran and wall/gran/region
2019-04-09 16:40:49 -06:00
74489621c4 correct misleading indentation to follow syntax 2019-03-30 22:35:41 -04:00
ab12a7c95b use consistent constants from math_const.h and fast integer powers from math_special 2019-03-28 11:58:04 -04:00
b9bddd7ba6 use ev_init() and add some more cosmetic changes to pair granular 2019-03-28 11:47:41 -04:00
2fa6e913ef Merge branch 'master' into gran_mods 2019-03-28 11:46:44 -04:00
3cc740b9d3 handle granular specific pair style flags consistently and make sure they are never accessed uninitialized 2019-03-28 11:46:04 -04:00
03ee03c043 remove set but unused flag 2019-03-28 11:44:50 -04:00
5d7c52e114 clean up whitespace issues caused by commit 5210c4c3a4 2019-03-28 11:23:37 -04:00
5210c4c3a4 cosmetic reformatting of new GRANULAR files 2019-03-27 16:58:14 -06:00
4cd0ea61f2 change source code format style to be more like other LAMMPS sources 2019-03-15 15:33:15 -04:00
05a5ecd4d4 silence compiler warnings about unused parameters 2019-03-15 15:24:41 -04:00
27510f313c change formatting to closer resemble LAMMPS common source code format style 2019-03-15 15:24:16 -04:00
d278cfe230 remove pointless recursive self-include 2019-03-15 15:10:44 -04:00
28607f156e use C++ style include headers for accessing C library functions 2019-03-15 14:25:14 -04:00