From 744e2093fdf8d8a1bde480a22092fc625f42a3ab Mon Sep 17 00:00:00 2001 From: sjplimp Date: Fri, 8 Feb 2013 17:38:26 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9411 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/bond.h | 2 +- src/bond_hybrid.cpp | 6 ++++-- src/bond_hybrid.h | 2 +- src/compute_bond_local.cpp | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/bond.h b/src/bond.h index 3ef25aaca0..534aa7f7ca 100644 --- a/src/bond.h +++ b/src/bond.h @@ -41,7 +41,7 @@ class Bond : protected Pointers { virtual double equilibrium_distance(int) = 0; virtual void write_restart(FILE *) = 0; virtual void read_restart(FILE *) = 0; - virtual double single(int, double, int, int) = 0; + virtual double single(int, double, int, int, double &) = 0; virtual double memory_usage(); virtual unsigned int data_mask() {return datamask;} diff --git a/src/bond_hybrid.cpp b/src/bond_hybrid.cpp index f754cead75..8a73a0e9d3 100644 --- a/src/bond_hybrid.cpp +++ b/src/bond_hybrid.cpp @@ -335,10 +335,12 @@ void BondHybrid::read_restart(FILE *fp) /* ---------------------------------------------------------------------- */ -double BondHybrid::single(int type, double rsq, int i, int j) +double BondHybrid::single(int type, double rsq, int i, int j, + double &fforce) + { if (map[type] < 0) error->one(FLERR,"Invoked bond single on bond style none"); - return styles[map[type]]->single(type,rsq,i,j); + return styles[map[type]]->single(type,rsq,i,j,fforce); } /* ---------------------------------------------------------------------- diff --git a/src/bond_hybrid.h b/src/bond_hybrid.h index 57c82b0e63..3dd060dfd4 100644 --- a/src/bond_hybrid.h +++ b/src/bond_hybrid.h @@ -42,7 +42,7 @@ class BondHybrid : public Bond { double equilibrium_distance(int); void write_restart(FILE *); void read_restart(FILE *); - double single(int, double, int, int); + double single(int, double, int, int, double &); double memory_usage(); private: diff --git a/src/compute_bond_local.cpp b/src/compute_bond_local.cpp index ad3ca626bc..4546052a23 100644 --- a/src/compute_bond_local.cpp +++ b/src/compute_bond_local.cpp @@ -135,6 +135,7 @@ int ComputeBondLocal::compute_bonds(int flag) Bond *bond = force->bond; m = n = 0; + double fforce; // unused for (atom1 = 0; atom1 < nlocal; atom1++) { if (!(mask[atom1] & groupbit)) continue; for (i = 0; i < num_bond[atom1]; i++) { @@ -152,7 +153,7 @@ int ComputeBondLocal::compute_bonds(int flag) if (dflag >= 0) dbuf[n] = sqrt(rsq); if (eflag >= 0) { if (bond_type[atom1][i] > 0) - ebuf[n] = bond->single(bond_type[atom1][i],rsq,atom1,atom2); + ebuf[n] = bond->single(bond_type[atom1][i],rsq,atom1,atom2,fforce); else ebuf[n] = 0.0; } n += nvalues;