From b1ad1cf8a6733b70445e8546cf74bb04aef2cf70 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Thu, 8 Jan 2009 17:20:56 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2349 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/GRANULAR/fix_pour.cpp | 3 ++- src/GRANULAR/fix_pour.h | 6 +++--- src/GRANULAR/pair_gran_hertz_history.cpp | 3 ++- src/GRANULAR/pair_gran_hooke.cpp | 2 +- src/fix_ave_force.cpp | 3 +-- src/fix_shear_history.h | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/GRANULAR/fix_pour.cpp b/src/GRANULAR/fix_pour.cpp index de23f8d291..685d222539 100644 --- a/src/GRANULAR/fix_pour.cpp +++ b/src/GRANULAR/fix_pour.cpp @@ -274,7 +274,8 @@ void FixPour::init() // check if a shear history fix exists fix_history = NULL; - if (force->pair_match("gran/history") || force->pair_match("gran/hertzian")) + if (force->pair_match("gran/hooke/history") || + force->pair_match("gran/hertz/history")) for (int i = 0; i < modify->nfix; i++) if (strcmp(modify->fix[i]->style,"SHEAR_HISTORY") == 0) fix_history = (FixShearHistory *) modify->fix[i]; diff --git a/src/GRANULAR/fix_pour.h b/src/GRANULAR/fix_pour.h index 394880ab92..3286459d8f 100644 --- a/src/GRANULAR/fix_pour.h +++ b/src/GRANULAR/fix_pour.h @@ -19,9 +19,9 @@ namespace LAMMPS_NS { class FixPour : public Fix { - friend class PairGranHistory; - friend class PairGranHertzian; - friend class PairGranNoHistory; + friend class PairGranHertzHistory; + friend class PairGranHooke; + friend class PairGranHookeHistory; public: FixPour(class LAMMPS *, int, char **); diff --git a/src/GRANULAR/pair_gran_hertz_history.cpp b/src/GRANULAR/pair_gran_hertz_history.cpp index d806c61723..9592e8d5b1 100644 --- a/src/GRANULAR/pair_gran_hertz_history.cpp +++ b/src/GRANULAR/pair_gran_hertz_history.cpp @@ -30,7 +30,8 @@ using namespace LAMMPS_NS; /* ---------------------------------------------------------------------- */ -PairGranHertzHistory::PairGranHertzHistory(LAMMPS *lmp) : PairGranHistory(lmp) +PairGranHertzHistory::PairGranHertzHistory(LAMMPS *lmp) : + PairGranHookeHistory(lmp) { no_virial_compute = 1; history = 1; diff --git a/src/GRANULAR/pair_gran_hooke.cpp b/src/GRANULAR/pair_gran_hooke.cpp index 243b7f712a..4ff0c1d8be 100644 --- a/src/GRANULAR/pair_gran_hooke.cpp +++ b/src/GRANULAR/pair_gran_hooke.cpp @@ -30,7 +30,7 @@ using namespace LAMMPS_NS; /* ---------------------------------------------------------------------- */ -PairGranHooke::PairGranHooke(LAMMPS *lmp) : PairGranHistory(lmp) +PairGranHooke::PairGranHooke(LAMMPS *lmp) : PairGranHookeHistory(lmp) { history = 0; } diff --git a/src/fix_ave_force.cpp b/src/fix_ave_force.cpp index d1176c657e..942b0a7f32 100644 --- a/src/fix_ave_force.cpp +++ b/src/fix_ave_force.cpp @@ -42,8 +42,7 @@ FixAveForce::FixAveForce(LAMMPS *lmp, int narg, char **arg) : if (strcmp(arg[5],"NULL") == 0) zflag = 0; else zvalue = atof(arg[5]); - foriginal_all[0] = foriginal_all[1] = - foriginal_all[2] = foriginal_all[3] = 0.0; + foriginal_all[0] = foriginal_all[1] = foriginal_all[2] = 0.0; } /* ---------------------------------------------------------------------- */ diff --git a/src/fix_shear_history.h b/src/fix_shear_history.h index 4d96aa6043..407981ebc5 100644 --- a/src/fix_shear_history.h +++ b/src/fix_shear_history.h @@ -20,7 +20,7 @@ namespace LAMMPS_NS { class FixShearHistory : public Fix { friend class Neighbor; - friend class PairGranHistory; + friend class PairGranHookeHistory; friend class FixPour; public: