From 34d0dbea1b36de791a899ff6d6f4ffa3ce2d8770 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Wed, 24 Nov 2010 15:07:55 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5309 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/fix_rigid.h | 2 +- src/fix_rigid_nvt.cpp | 14 ++++++++++++++ src/fix_rigid_nvt.h | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/fix_rigid.h b/src/fix_rigid.h index 2f2e2d0f53..efe77587b4 100644 --- a/src/fix_rigid.h +++ b/src/fix_rigid.h @@ -28,7 +28,7 @@ class FixRigid : public Fix { public: FixRigid(class LAMMPS *, int, char **); virtual ~FixRigid(); - int setmask(); + virtual int setmask(); virtual void init(); virtual void setup(int); virtual void initial_integrate(int); diff --git a/src/fix_rigid_nvt.cpp b/src/fix_rigid_nvt.cpp index d3e8948b8b..0f16ca1980 100644 --- a/src/fix_rigid_nvt.cpp +++ b/src/fix_rigid_nvt.cpp @@ -88,6 +88,20 @@ FixRigidNVT::~FixRigidNVT() /* ---------------------------------------------------------------------- */ +int FixRigidNVT::setmask() +{ + int mask = 0; + mask |= INITIAL_INTEGRATE; + mask |= FINAL_INTEGRATE; + mask |= PRE_NEIGHBOR; + mask |= THERMO_ENERGY; + mask |= INITIAL_INTEGRATE_RESPA; + mask |= FINAL_INTEGRATE_RESPA; + return mask; +} + +/* ---------------------------------------------------------------------- */ + void FixRigidNVT::init() { FixRigid::init(); diff --git a/src/fix_rigid_nvt.h b/src/fix_rigid_nvt.h index 0f69084145..da4c8184fb 100644 --- a/src/fix_rigid_nvt.h +++ b/src/fix_rigid_nvt.h @@ -28,6 +28,7 @@ class FixRigidNVT : public FixRigid { public: FixRigidNVT(class LAMMPS *, int, char **); ~FixRigidNVT(); + int setmask(); void init(); void setup(int); void initial_integrate(int);