From 6346e486015ac306710a23e320d222128fcaa12f Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Thu, 2 Jul 2009 20:53:24 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2967
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/ASPHERE/compute_temp_asphere.cpp | 10 ++--------
 src/compute_pressure.cpp             |  9 +++------
 src/compute_temp_sphere.cpp          | 10 ++--------
 src/style_meam.h                     | 20 --------------------
 src/style_poems.h                    | 20 --------------------
 5 files changed, 7 insertions(+), 62 deletions(-)

diff --git a/src/ASPHERE/compute_temp_asphere.cpp b/src/ASPHERE/compute_temp_asphere.cpp
index c171cae23e..5920002dc1 100755
--- a/src/ASPHERE/compute_temp_asphere.cpp
+++ b/src/ASPHERE/compute_temp_asphere.cpp
@@ -161,10 +161,7 @@ double ComputeTempAsphere::compute_scalar()
   invoked_scalar = update->ntimestep;
 
   if (tempbias) {
-    if (!(tbias->invoked_flag & INVOKED_SCALAR)) {
-      tbias->compute_scalar();
-      tbias->invoked_flag |= INVOKED_SCALAR;
-    }
+    if (tbias->invoked_scalar != update->ntimestep) tbias->compute_scalar();
     tbias->remove_bias_all();
   }
 
@@ -221,10 +218,7 @@ void ComputeTempAsphere::compute_vector()
   invoked_vector = update->ntimestep;
 
   if (tempbias) {
-    if (!(tbias->invoked_flag & INVOKED_VECTOR)) {
-      tbias->compute_vector();
-      tbias->invoked_flag |= INVOKED_VECTOR;
-    }
+    if (tbias->invoked_vector != update->ntimestep) tbias->compute_vector();
     tbias->remove_bias_all();
   }
 
diff --git a/src/compute_pressure.cpp b/src/compute_pressure.cpp
index 1a587bb781..6c81c3f27f 100644
--- a/src/compute_pressure.cpp
+++ b/src/compute_pressure.cpp
@@ -174,10 +174,9 @@ double ComputePressure::compute_scalar()
 
   double t;
   if (keflag) {
-    if (!(temperature->invoked_flag & INVOKED_SCALAR)) {
+    if (temperature->invoked_scalar == update->ntimestep)
       t = temperature->compute_scalar();
-      temperature->invoked_flag |= INVOKED_SCALAR;
-    } else t = temperature->scalar;
+    else t = temperature->scalar;
   }
 
   if (dimension == 3) {
@@ -216,10 +215,8 @@ void ComputePressure::compute_vector()
 
   double *ke_tensor;
   if (keflag) {
-    if (!(temperature->invoked_flag & INVOKED_VECTOR)) {
+    if (temperature->invoked_vector != update->ntimestep)
       temperature->compute_vector();
-      temperature->invoked_flag |= INVOKED_VECTOR;
-    }
     ke_tensor = temperature->vector;
   }
 
diff --git a/src/compute_temp_sphere.cpp b/src/compute_temp_sphere.cpp
index ba059984e4..43409fe79d 100644
--- a/src/compute_temp_sphere.cpp
+++ b/src/compute_temp_sphere.cpp
@@ -242,10 +242,7 @@ double ComputeTempSphere::compute_scalar()
   invoked_scalar = update->ntimestep;
 
   if (tempbias) {
-    if (!(tbias->invoked_flag & INVOKED_SCALAR)) {
-      tbias->compute_scalar();
-      tbias->invoked_flag |= INVOKED_SCALAR;
-    }
+    if (tbias->invoked_scalar != update->ntimestep) tbias->compute_scalar();
     tbias->remove_bias_all();
   }
 
@@ -329,10 +326,7 @@ void ComputeTempSphere::compute_vector()
   invoked_vector = update->ntimestep;
 
   if (tempbias) {
-    if (!(tbias->invoked_flag & INVOKED_VECTOR)) {
-      tbias->compute_vector();
-      tbias->invoked_flag |= INVOKED_VECTOR;
-    }
+    if (tbias->invoked_vector != update->ntimestep) tbias->compute_vector();
     tbias->remove_bias_all();
   }
 
diff --git a/src/style_meam.h b/src/style_meam.h
index 221a363f11..e69de29bb2 100644
--- a/src/style_meam.h
+++ b/src/style_meam.h
@@ -1,20 +0,0 @@
-/* ----------------------------------------------------------------------
-   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
-   http://lammps.sandia.gov, Sandia National Laboratories
-   Steve Plimpton, sjplimp@sandia.gov
-
-   Copyright (2003) Sandia Corporation.  Under the terms of Contract
-   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
-   certain rights in this software.  This software is distributed under 
-   the GNU General Public License.
-
-   See the README file in the top-level LAMMPS directory.
-------------------------------------------------------------------------- */
-
-#ifdef PairInclude
-#include "pair_meam.h"
-#endif
-
-#ifdef PairClass
-PairStyle(meam,PairMEAM)
-#endif
diff --git a/src/style_poems.h b/src/style_poems.h
index 0434d02bf8..e69de29bb2 100644
--- a/src/style_poems.h
+++ b/src/style_poems.h
@@ -1,20 +0,0 @@
-/* ----------------------------------------------------------------------
-   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
-   http://lammps.sandia.gov, Sandia National Laboratories
-   Steve Plimpton, sjplimp@sandia.gov
-
-   Copyright (2003) Sandia Corporation.  Under the terms of Contract
-   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
-   certain rights in this software.  This software is distributed under 
-   the GNU General Public License.
-
-   See the README file in the top-level LAMMPS directory.
-------------------------------------------------------------------------- */
-
-#ifdef FixInclude
-#include "fix_poems.h"
-#endif
-
-#ifdef FixClass
-FixStyle(poems,FixPOEMS)
-#endif