Homec4science

Merge branch 'openmp-master' into neighbor-omp

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 25 2011, 19:54.

Description

Merge branch 'openmp-master' into neighbor-omp

Resolved Conflicts:
src/neigh_full.cpp
src/neigh_gran_omp.cpp
src/neigh_list.cpp
src/neigh_request.cpp
src/neighbor.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSaf8972a1864e: Merge branch 'openmp-master' into neighbor-omp (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 25 2011, 19:54

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
95725754c904Axel Kohlmeyer
expand the check for the "last omp style" to cover hybrid styles 
Oct 25 2011
8427e1ce0fadAxel Kohlmeyer
change add_pages() to include PGDELTA according to steve's wishes 
Oct 25 2011
5a3a2985a556Axel Kohlmeyer
improve detection of style which needs to do force reduction 
Oct 25 2011
2318a7e791bdAxel Kohlmeyer
fix dual definition resulting from merge 
Oct 25 2011
770a97aaac4cAxel Kohlmeyer
remove lubricate/omp class since lubricate is gone, too 
Oct 25 2011
3295bdbec039Axel Kohlmeyer
Merge branch 'openmp-next-merge' into openmp-master 
Oct 25 2011
9c5ad7cf3355Axel Kohlmeyer
Merge branch 'master' into openmp-next-merge 
Oct 25 2011
d3727b581bfbAxel Kohlmeyer
remove unused variable 
Oct 25 2011
3e478bc98048Axel Kohlmeyer
more files to ignore 
Oct 25 2011
15b662013395Axel Kohlmeyer
rename ThrData::init_clear() to ThrData::init_force() add reduction of per atom… 
Oct 25 2011
49b687bafe63Axel Kohlmeyer
support reduction of per atom energy and stress 
Oct 25 2011
392868437e15Axel Kohlmeyer
add documentation for compilation with posix_memalign() 
Oct 25 2011
d09892f63288Axel Kohlmeyer
add .gitignore files to distribution 
Oct 25 2011
a7206ee37a0bAxel Kohlmeyer
support memalign in make files 
Oct 25 2011
d03211a9fa45Axel Kohlmeyer
integrate posix_memalign() support. 
Oct 25 2011
852657f2841fAxel Kohlmeyer
correct install/update scripts for USER-OMP 
Oct 24 2011
c6bbdcfbf2afsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7184 f3b2605a-c512-4ea7… 
Oct 24 2011
56c38528ed63Axel Kohlmeyer
Merge branch 'airebo-fixup' into openmp-step7 
Oct 24 2011
99f3957cf202Axel Kohlmeyer
updated and optimized version of airebo potentials 
Oct 24 2011
11806a92a1dfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7182 f3b2605a-c512-4ea7… 
Oct 24 2011
860bca7d5e5dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7181 f3b2605a-c512-4ea7… 
Oct 24 2011
f3018d53bb32sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7180 f3b2605a-c512-4ea7… 
Oct 24 2011
5a03365db1f1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7179 f3b2605a-c512-4ea7… 
Oct 24 2011
326c40feaa41sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7178 f3b2605a-c512-4ea7… 
Oct 24 2011
cb5b707c7408sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7177 f3b2605a-c512-4ea7… 
Oct 24 2011
b0639081bafcAxel Kohlmeyer
Merge branch 'load-balance' into openmp-step7 
Oct 24 2011
245d6ac30c61Axel Kohlmeyer
support dimensions with just one processor remove useless arguments from class… 
Oct 23 2011
f55d42f2a17cAxel Kohlmeyer
Merge branch 'load-balance' into openmp-step7 
Oct 23 2011
101e045b1515Axel Kohlmeyer
update load balancing code to new error handling API 
Oct 23 2011
914f1873cdd6Axel Kohlmeyer
merge in loadbalancing code from christoph kloss 
Oct 23 2011
aa5daaff3501Axel Kohlmeyer
single out assorted bugfixes and changes that should be sent to steve before… 
Oct 22 2011
dd191f4e5cbdAxel Kohlmeyer
fix a couple more bugs 
Oct 22 2011
4652fcf279b9Axel Kohlmeyer
added better checks for compatible pair and kspace styles 
Oct 22 2011
54df86aa9f34Axel Kohlmeyer
added pppm/tip4p/proxy class 
Oct 22 2011
cee7f4acafdbAxel Kohlmeyer
add docs for additional pppm/proxy compatible pair styles 
Oct 22 2011
033d43c1ed72Axel Kohlmeyer
docs for OpenMP versions of line/lj and tri/lj 
Oct 22 2011
6e981d13fe6aAxel Kohlmeyer
more pppm/proxy compatible long range coulomb classes 
Oct 22 2011
1a5e3a8160dcAxel Kohlmeyer
added docs for multi-threaded kspace and pppm/proxy styles 
Oct 22 2011
8b175d0a61b1Axel Kohlmeyer
add multi-threaded versions of tri/line pair styles 
Oct 22 2011
fb79b748d74aAxel Kohlmeyer
bugfix to avoid reallocating local list in every step 
Oct 22 2011
8292a82ce85cAxel Kohlmeyer
extend support for math constants using PI 
Oct 21 2011
31dc359e82f6Axel Kohlmeyer
Merge branch 'master' into openmp-step6 
Oct 21 2011
b1492a195bb8Axel Kohlmeyer
fix race conditions and omissions in ewald/omp 
Oct 21 2011
b930d3759aebAxel Kohlmeyer
first stab as multi-threading ewald sum. still some races left. 
Oct 21 2011
dbb0eae861aeAxel Kohlmeyer
fix wall/* bugfix for applying unit lattice scaling 
Oct 20 2011
27173bf04225Axel Kohlmeyer
fix wall documentation bugfix 
Oct 20 2011
0da20cfa01d3Axel Kohlmeyer
avoid the default(shared) clause and make stuff const 
Oct 19 2011
6f19c5d4580aAxel Kohlmeyer
small optimization 
Oct 19 2011
630de286b99bAxel Kohlmeyer
implement fix wall/gran/omp 
Oct 19 2011
7d5c1e9bec87Axel Kohlmeyer
don't require fix gpu to be the first fix anymore. the package command will… 
Oct 19 2011