From 5f7dc817df6239867b6f56bf152f40e9285e5a91 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 17 Aug 2010 00:10:49 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4491
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/output.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/output.cpp b/src/output.cpp
index b7a0c43bbf..720c020603 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -296,12 +296,12 @@ void Output::write(int ntimestep)
     thermo->compute(1);
     last_thermo = ntimestep;
     if (thermo_every) next_thermo += thermo_every;
-    else {
+    else if (var_thermo) {
       next_thermo = static_cast<int> 
 	(input->variable->compute_equal(ivar_thermo));
       if (next_thermo <= ntimestep)
 	error->all("Thermo every variable returned a bad timestep");
-    }
+    } else next_thermo = update->laststep;
     next_thermo = MYMIN(next_thermo,update->laststep);
     modify->addstep_compute(next_thermo);
   }