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