ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'lammps-ro/master' into lammps-icms

Browse Source 
Resolved Conflicts:
	doc/Manual.txt
	src/USER-OMP/pppm_cg_omp.cpp
	src/USER-OMP/pppm_cg_omp.h
	src/USER-OMP/pppm_omp.cpp
	src/USER-OMP/pppm_omp.h
	src/USER-OMP/pppm_tip4p_omp.cpp
	src/kspace.h
This commit is contained in:
Axel Kohlmeyer
2013-02-13 13:56:03 +01:00
parent 321483a15a 55cb9649a3
commit 3cd3e2febd
46 changed files with 3174 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compute_temp_partial.cpp
View File

@ -61,7 +61,7 @@ ComputeTempPartial::~ComputeTempPartial()
/* ---------------------------------------------------------------------- */
void ComputeTempPartial::init()
void ComputeTempPartial::setup()
{
fix_dof = 0;
for (int i = 0; i < modify->nfix; i++)