From bf7903653b6f50e57b37eb67f2628ef21ed1f77a Mon Sep 17 00:00:00 2001 From: sjplimp Date: Fri, 30 Nov 2007 15:26:11 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1187 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/compute_pressure.cpp | 12 ++++++------ src/compute_pressure.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/compute_pressure.cpp b/src/compute_pressure.cpp index b2f5179b89..2e9a741ede 100644 --- a/src/compute_pressure.cpp +++ b/src/compute_pressure.cpp @@ -134,12 +134,12 @@ double ComputePressure::compute_scalar() { if (dimension == 3) { inv_volume = 1.0 / (domain->xprd * domain->yprd * domain->zprd); - virial_compute(3); + virial_compute(3,3); scalar = (temperature->dof * boltz * temperature->scalar + virial[0] + virial[1] + virial[2]) / 3.0 * inv_volume * nktv2p; } else { inv_volume = 1.0 / (domain->xprd * domain->yprd); - virial_compute(2); + virial_compute(2,2); scalar = (temperature->dof * boltz * temperature->scalar + virial[0] + virial[1]) / 2.0 * inv_volume * nktv2p; } @@ -156,13 +156,13 @@ void ComputePressure::compute_vector() { if (dimension == 3) { inv_volume = 1.0 / (domain->xprd * domain->yprd * domain->zprd); - virial_compute(6); + virial_compute(6,3); double *ke_tensor = temperature->vector; for (int i = 0; i < 6; i++) vector[i] = (ke_tensor[i] + virial[i]) * inv_volume * nktv2p; } else { inv_volume = 1.0 / (domain->xprd * domain->yprd); - virial_compute(4); + virial_compute(4,2); double *ke_tensor = temperature->vector; vector[0] = (ke_tensor[0] + virial[0]) * inv_volume * nktv2p; vector[1] = (ke_tensor[1] + virial[1]) * inv_volume * nktv2p; @@ -172,7 +172,7 @@ void ComputePressure::compute_vector() /* ---------------------------------------------------------------------- */ -void ComputePressure::virial_compute(int n) +void ComputePressure::virial_compute(int n, int ndiag) { int i,j; double v[6],*vcomponent; @@ -199,5 +199,5 @@ void ComputePressure::virial_compute(int n) // LJ long-range tail correction if (force->pair && force->pair->tail_flag) - for (i = 0; i < n; i++) virial[i] += force->pair->ptail * inv_volume; + for (i = 0; i < ndiag; i++) virial[i] += force->pair->ptail * inv_volume; } diff --git a/src/compute_pressure.h b/src/compute_pressure.h index cb11e65a88..7b00c4b432 100644 --- a/src/compute_pressure.h +++ b/src/compute_pressure.h @@ -35,7 +35,7 @@ class ComputePressure : public Compute { Compute *temperature; double virial[6]; - void virial_compute(int); + void virial_compute(int, int); }; }