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@5718 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2011-02-22 22:41:12 +00:00
parent a21e59fa7e
commit 2bd4074d8c
8 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/USER-EFF/compute_temp_region_eff.cpp
View File

@ -16,6 +16,7 @@
------------------------------------------------------------------------- */
#include "mpi.h"
#include "math.h"
#include "string.h"
#include "compute_temp_region_eff.h"
#include "atom.h"
@ -114,7 +115,7 @@ double ComputeTempRegionEff::compute_scalar()
count++;
t += (v[i][0]*v[i][0] + v[i][1]*v[i][1] + v[i][2]*v[i][2]) *
mass[type[i]];
if (abs(spin[i])==1) t += 0.75*mass[type[i]]*ervel[i]*ervel[i];
if (fabs(spin[i])==1) t += 0.75*mass[type[i]]*ervel[i]*ervel[i];
}
}
@ -127,7 +128,7 @@ double ComputeTempRegionEff::compute_scalar()
int one = 0;
for (int i = 0; i < nlocal; i++)
if (mask[i] & groupbit && region->match(x[i][0],x[i][1],x[i][2])) {
if (abs(spin[i])==1) one++;
if (fabs(spin[i])==1) one++;
}
int nelectrons_region;
MPI_Allreduce(&one,&nelectrons_region,1,MPI_INT,MPI_SUM,world);
@ -173,7 +174,7 @@ void ComputeTempRegionEff::compute_vector()
t[4] += massone * v[i][0]*v[i][2];
t[5] += massone * v[i][1]*v[i][2];
if (abs(spin[i])==1) {
if (fabs(spin[i])==1) {
t[0] += 0.75 * massone * ervel[i]*ervel[i];
t[1] += 0.75 * massone * ervel[i]*ervel[i];
t[2] += 0.75 * massone * ervel[i]*ervel[i];