Homec4science

Merge branch 'openmp-master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 1 2012, 01:59.

Description

Merge branch 'openmp-master' into lammps-icms

Resolved Conflicts:
.gitignore
doc/fix_spring_self.txt
lib/atc/Array.h
lib/gpu/.gitignore
src/.gitignore
src/MAKE/Makefile.openmpi
src/MAKE/Makefile.openmpi-omp
src/STUBS/Makefile
src/STUBS/mpi.c
src/STUBS/mpi.h
src/USER-CG-CMM/cg_cmm_parms.h
src/dump.h
src/fix_spring_self.cpp
tools/restart2data.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS221499203559: Merge branch 'openmp-master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 1 2012, 01:59

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
5d8ef7f42406Axel Kohlmeyer
add test for existence of package gpu command 
Dec 27 2011
d0686fbd3fbcAxel Kohlmeyer
terminate all inline function declaration with ';' 
Dec 27 2011
3ad7e97ae867Axel Kohlmeyer
some more optimizations for pppm/omp 
Dec 24 2011
961c524dd65bAxel Kohlmeyer
include jpeg image support 
Dec 24 2011
f128041ea75eAxel Kohlmeyer
undo small PPPM::setup() optimization 
Dec 24 2011
6d290ddf0afdAxel Kohlmeyer
add multi-thread support to PPPMOMP::setup() 
Dec 24 2011
0f4a27ad8babAxel Kohlmeyer
add c++ emacs cookies into all SCM managed headers 
Dec 24 2011
d3355b03dc0eAxel Kohlmeyer
label our modified versions as LAMMPS-ICMS now 
Dec 22 2011
a12d3f98e2b4Axel Kohlmeyer
small optimization for PPPM::setup() 
Dec 22 2011
c428171b86c4Axel Kohlmeyer
Merge branch 'master' into openmp-master 
Dec 22 2011
9b7fbb59bd14Axel Kohlmeyer
fix bug reported by mario orsi 
Dec 20 2011
bd3fc1d6a99aAxel Kohlmeyer
update for new files in user-omp 
Dec 20 2011
d0c092466472Axel Kohlmeyer
add pppm/proxy styles for class2 force field. 
Dec 20 2011
fef0e5069812Axel Kohlmeyer
re-add one more missing file 
Dec 20 2011
00c655547601Axel Kohlmeyer
bugfix for pppm/proxy when using variable cell 
Dec 20 2011
a2b2ab658941Axel Kohlmeyer
bugfixes for change to Pair::extract() 
Dec 18 2011
10627e1a4e5dAxel Kohlmeyer
update GPU install/update scripts 
Dec 18 2011
fe17fe1eb6adAxel Kohlmeyer
re-add lost files 
Dec 18 2011
5acd732f061cAxel Kohlmeyer
Merge branch 'master' into openmp-master 
Dec 18 2011
c26f383996b9Axel Kohlmeyer
Merge branch 'master' into openmp-master 
Dec 15 2011
faeacab3a2f6Axel Kohlmeyer
more files to ignore 
Dec 15 2011
b7d8d13c6236Axel Kohlmeyer
some bugfixes and cleanups for the last commit 
Dec 14 2011
e84e73266326Axel Kohlmeyer
OpenMP support for coul/wolf and born/coul/wolf 
Dec 14 2011
3e5c175a5bb4Axel Kohlmeyer
atc bugfix 
Dec 14 2011
93686ca6ab75Axel Kohlmeyer
Merge branch 'master' into openmp-master 
Dec 14 2011
d2bd36e1ef76Axel Kohlmeyer
bugfix for bugfix 
Dec 14 2011
82536bd3462aAxel Kohlmeyer
fix typo 
Dec 13 2011
8a282d8b8a16Axel Kohlmeyer
updates to restart2data 
Dec 13 2011
6282d92c3b67Axel Kohlmeyer
add tersoff/table support 
Dec 13 2011
ba2a67892addAxel Kohlmeyer
more updates for coul/*, gauss and gauss/cut 
Dec 13 2011
2b57a5a2b6adAxel Kohlmeyer
more tests 
Dec 13 2011
6028bfec7f63Axel Kohlmeyer
need to ignore input file fragments, too. 
Dec 13 2011
06b8c7ad359aAxel Kohlmeyer
add test for lj/sdk and handle input file conversion 
Dec 13 2011
7aa9063e0f7aAxel Kohlmeyer
more scripts for restart test and first references 
Dec 13 2011
0af3a50ca2fbAxel Kohlmeyer
first stab at restart test library 
Dec 13 2011
0b97aa46bd9bAxel Kohlmeyer
more files to ignore 
Dec 12 2011
c252853d30cbAxel Kohlmeyer
import tersoff/zbl bugfix from LAMMPS-ICMS 
Dec 12 2011
3b72d88e350aAxel Kohlmeyer
add fix spring/self enhancement from LAMMPS-ICMS 
Dec 12 2011
d7aab37be45eAxel Kohlmeyer
Merge branch 'master' into openmp-master 
Dec 11 2011
7cb225f64a8bAxel Kohlmeyer
add documentation for FLD /omp styles. 
Dec 10 2011
a1c0b66824c0Axel Kohlmeyer
more files to ignore 
Dec 10 2011
65bcbb90734bAxel Kohlmeyer
correct permissions 
Dec 10 2011
4d9b004a4015Axel Kohlmeyer
update load balancing styles 
Dec 10 2011
092b1c73b243Axel Kohlmeyer
added OpenMP versions of some FLD pair styles 
Dec 10 2011
d08826bb5807Axel Kohlmeyer
convert MPI stubs library to use C bindings 
Dec 9 2011
c97d2cac54ffAxel Kohlmeyer
avoid memory leak when turning load balancing off 
Dec 9 2011
77d1c7cd36beAxel Kohlmeyer
add documentation for load balancing 
Dec 9 2011
7b3a54ed86aeAxel Kohlmeyer
cleanup and simplification of load balancing support 
Dec 9 2011
18fca0812b1eAxel Kohlmeyer
make verlet/split compatible with new timer class 
Dec 9 2011
333d86f4dda6Axel Kohlmeyer
and another conflict issue fixed 
Dec 9 2011