Merge branch 'master' into lammps-icms

Resolved Conflicts:
	src/MAKE/Makefile.openmpi
	src/min_linesearch.cpp
This commit is contained in:
Axel Kohlmeyer
2013-01-09 07:09:35 -05:00
118 changed files with 10063 additions and 2347 deletions

View File

@ -356,6 +356,7 @@ void Respa::setup()
comm->borders();
if (triclinic) domain->lamda2x(atom->nlocal+atom->nghost);
domain->box_too_small_check();
modify->setup_pre_neighbor();
neighbor->build();
neighbor->ncalls = 0;
@ -421,6 +422,7 @@ void Respa::setup_minimal(int flag)
comm->borders();
if (triclinic) domain->lamda2x(atom->nlocal+atom->nghost);
domain->box_too_small_check();
modify->setup_pre_neighbor();
neighbor->build();
neighbor->ncalls = 0;
}