Commit Graph

16177 Commits

Author SHA1 Message Date
3abfce01ca remove diverged fix wall/gran/omp 2019-03-15 14:06:03 -04:00
2cc35ee777 A few additional enhancements to pair granular and fix wall granular option:
- NULL option for tangential stiffness, to set it based on shear modulus
- calculation of effective shear moduli from elastic moduli and Poisson's ratio
- updates to doc page example syntax
2019-03-13 00:42:08 -06:00
e0c935b52d Additional changes to pair_granular:
-added mindlin and mindlin/rescale tangential model options
-torque from tangential force is now applied at the same point on both contacting particles
-updated doc page to reflect changes above
2019-03-11 14:28:44 -06:00
4ee98d18da Fixed missing reference in pair_granular doc page 2019-03-06 14:15:19 -07:00
9a6dc2ff11 Removed several files that should not have been included 2019-03-06 13:54:32 -07:00
87a243203b Removed pair_granular.cpp/h from src directory 2019-02-28 16:46:21 -07:00
4e26ca29f7 Changes to new generalized granular pair styles and fix wall/gran
-Clean-up of unused variables in code
-Bug fix for single method of pair granular
-Changes to fix wall/gran to fix issues with JKR
-Doc page updates for fix wall/gran and fix wall/gran/region
2019-02-19 16:47:13 -07:00
ff795e761a Added generalized granular option to fix wall/gran and fix wall/gran/region; some minor bug fixes for pair granular 2019-02-19 14:31:27 -07:00
d8e8a0d2d2 More changes to pair granular:
- tangential damping now set by scaling the normal damping
- some fixes to the twisting coefficients for the Marshall twist model
- progress (completion?) of doc page
2019-02-18 09:58:34 -07:00
6ff1557af8 More progress on doc page 2019-02-12 07:42:26 -07:00
b7413226e0 Several changes to new consolidated granular code:
- Normal contact models take Young's modulus and Poisson's ratio (instead of Young's and shear modulus)
- Mixing of Young's moduli corrected
- Changes to cutoffs corrected for JKR pulloff distance
- Renamed 'mindlin' to 'linear_history'
- Progress on doc page
2019-02-11 21:37:06 -07:00
e195d6faee Fixed issue with not setting i-j, j-i coefficients correctly 2019-01-30 08:37:04 -07:00
26eb17aa50 Fixed tangential damping in pair granular; fixed order of template arguments, so that pair gran and gran/multi now produce identical results for same settings (as they should) 2019-01-15 16:42:06 -07:00
6e4e244e65 More doc page additions 2019-01-15 13:31:16 -07:00
ef803be08e Moved all model option syntax for pair granular to pair coeff command;
added global cutoff option for pair style granular command; initial
write-up of documentation.
2019-01-15 10:18:46 -07:00
29dcdec875 Separated templated pair granular from pair granular/multi 2019-01-10 16:53:50 -07:00
18f8f68e67 Fixed several input parsing issues in pair granular; fixed issue with JKR hysteresis and damping with JKR 2019-01-08 16:33:24 -07:00
faa716e348 Added PairGranular::single method 2019-01-07 16:27:04 -07:00
dced4c1fca More changes, fixed indentation issues 2019-01-04 17:03:31 -07:00
7b4d0092b0 Added type- and form-dependent conditionals in PairGranular::compute,
still some issues with overall structure of the code.
2018-12-22 14:33:09 -07:00
71ed60ced3 More work on compute method for generalized pair granular 2018-12-21 15:41:46 -07:00
009d8c8ebf Added parsing to pair_coeff, added for for init_one 2018-12-21 09:29:47 -07:00
7861de03a2 Progress on general granular pair style 2018-12-20 16:59:21 -07:00
67782d71a8 Granular pair style files added 2018-12-18 21:23:04 -07:00
7cdb4675ee Merge branch 'master' of github.com:lammps/lammps into gran_mods 2018-12-18 13:41:38 -07:00
ad1b1897d8 Merge pull request #1253 from akohlmey/final-cosmetic-changes
Final cosmetic changes for stable release, update version.
patch_12Dec2018 stable_12Dec2018
2018-12-11 12:39:04 -05:00
8422bf64fa prevent configuring -D PKG_USER-ATC=yes with -D LAMMPS_SIZES=bigbig in CMake 2018-12-10 17:42:38 -05:00
052828284d fix typo 2018-12-10 14:53:31 -05:00
52a1f257c5 fix typo 2018-12-10 14:19:03 -05:00
fb08d3ea46 ignore MSCG build folder more generally 2018-12-10 11:25:24 -05:00
7d3caaa1a4 step version date for stable release on wednesday 2018-12-10 11:24:35 -05:00
b6b813459b update example logfiles for USER-DRUDE package 2018-12-10 11:04:52 -05:00
8f95cdcb27 small update to the fix rigid/meso command docs 2018-12-09 16:24:06 -05:00
802bf4bc1f update .gitignore for recently added files 2018-12-08 15:00:33 -05:00
4078c7897e fix permissions 2018-12-08 15:00:14 -05:00
e6321e1020 Merge pull request #1246 from akohlmey/next-patch-release
Patch release 7 December 2018
patch_7Dec2018
2018-12-07 14:15:12 -05:00
0165f18d59 Merge pull request #1241 from akohlmey/collected-small-fixes
Collected small changes and updates for stable release
2018-12-07 11:28:26 -05:00
c36f8390d2 Merge pull request #1240 from akohlmey/fix-tune-kspace-limits
Detect fix tune/kspace incompatible configurations
2018-12-07 11:28:02 -05:00
57204a0f66 reformat recently changed paragraphs in the manual 2018-12-07 10:38:01 -05:00
4f00984bbc Merge branch 'master' into collected-small-fixes 2018-12-07 10:32:33 -05:00
f02eab3990 Merge pull request #1248 from junghans/cmake-plumed
cmake: USER-PLUMED does not depend on LAPACK anymore
2018-12-07 10:31:18 -05:00
4792ff1dc2 Merge pull request #1247 from gtribello/master
Changes to manual related to the USER-PLUMED package
2018-12-07 10:30:35 -05:00
998a512143 update log files for USER-UEF 2018-12-07 10:19:34 -05:00
29dcf8348b No longer require LAPACK and BLAS to compile PLUMED+LAMMPS so removed this statement from docs 2018-12-07 15:16:40 +00:00
1bd81db9b3 Fixed spelling mistakes 2018-12-07 15:15:35 +00:00
a30e1b2670 cmake: USER-PLUMED does not LAPACK anymore 2018-12-07 06:10:29 -07:00
4a4dbc7da5 Added further instructions on building of PLUMED+LAMMPS 2018-12-07 12:49:00 +00:00
0244841b27 auto-request a review from @sjplimp when the LAMMPS version is updated 2018-12-07 06:15:03 -05:00
ee98dc0b96 step version number to 7 December 2018 2018-12-07 06:11:30 -05:00
e61b553bb3 update USER-MOFF log files 2018-12-07 05:54:02 -05:00