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

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

Browse Source
This commit is contained in:
sjplimp
2015-03-30 23:17:06 +00:00
parent 8d078d0602
commit bd37304ade
27 changed files with 135 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compute_temp_ramp.cpp
View File

@ -119,7 +119,6 @@ void ComputeTempRamp::setup()
{
dynamic = 0;
if (dynamic_user || group->dynamic[igroup]) dynamic = 1;
fix_dof = -1;
dof_compute();
}
@ -127,7 +126,7 @@ void ComputeTempRamp::setup()
void ComputeTempRamp::dof_compute()
{
if (fix_dof) adjust_dof_fix();
fix_dof = modify->adjust_dof_fix(igroup);
double natoms = group->count(igroup);
int nper = domain->dimension;
dof = nper * natoms;
@ -173,6 +172,8 @@ 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)
error->all(FLERR,"Temperature compute degrees of freedom < 0");
scalar *= tfactor;
return scalar;
}