git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13344 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp
2015-03-31 18:47:58 +00:00
parent cfc5c8b277
commit 269bff4b14
11 changed files with 33 additions and 62 deletions

View File

@ -19,7 +19,6 @@
#include "update.h"
#include "force.h"
#include "group.h"
#include "modify.h"
#include "fix.h"
#include "domain.h"
#include "lattice.h"
@ -126,7 +125,7 @@ void ComputeTempRamp::setup()
void ComputeTempRamp::dof_compute()
{
fix_dof = modify->adjust_dof_fix(igroup);
adjust_dof_fix();
double natoms = group->count(igroup);
int nper = domain->dimension;
dof = nper * natoms;
@ -172,7 +171,7 @@ double ComputeTempRamp::compute_scalar()
MPI_Allreduce(&t,&scalar,1,MPI_DOUBLE,MPI_SUM,world);
if (dynamic) dof_compute();
if (tfactor == 0.0 && scalar != 0.0)
if (tfactor == 0.0 && atom->natoms != 0)
error->all(FLERR,"Temperature compute degrees of freedom < 0");
scalar *= tfactor;
return scalar;