From 70378d5ef4e1d625532e309e2c415ae98d4e6b9b Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Thu, 13 Aug 2009 17:33:39 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3067
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/force.cpp  |  4 ++--
 src/thermo.cpp | 16 ----------------
 src/thermo.h   |  1 -
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/force.cpp b/src/force.cpp
index 27a6ff07e5..8fa6098862 100644
--- a/src/force.cpp
+++ b/src/force.cpp
@@ -486,7 +486,7 @@ double Force::numeric(char *str)
   int n = strlen(str);
   for (int i = 0; i < n; i++) {
     if (isdigit(str[i])) continue;
-    if (str[i] == '-' || str[i] == '.') continue;
+    if (str[i] == '-' || str[i] == '+' || str[i] == '.') continue;
     if (str[i] == 'e' || str[i] == 'E') continue;
     error->all("Expecting floating point argument in input script");
   }
@@ -504,7 +504,7 @@ int Force::inumeric(char *str)
 {
   int n = strlen(str);
   for (int i = 0; i < n; i++) {
-    if (isdigit(str[i]) || str[i] == '-') continue;
+    if (isdigit(str[i]) || str[i] == '-' || str[i] == '+') continue;
     error->all("Expecting integer argument in input script");
   }
 
diff --git a/src/thermo.cpp b/src/thermo.cpp
index dcbc5a3aca..71d7a6fe8a 100644
--- a/src/thermo.cpp
+++ b/src/thermo.cpp
@@ -805,22 +805,6 @@ int Thermo::add_variable(const char *id)
   return nvariable-1;
 }
 
-/* ----------------------------------------------------------------------
-   create a Compute object for group all
-------------------------------------------------------------------------- */
-
-void Thermo::create_compute(char *id, char *cstyle, char *extra)
-{
-  char **newarg = new char*[4];
-  newarg[0] = id;
-  newarg[1] = (char *) "all";
-  newarg[2] = cstyle;
-  if (extra) newarg[3] = extra;
-  if (extra) modify->add_compute(4,newarg);
-  else modify->add_compute(3,newarg);
-  delete [] newarg;
-}
-
 /* ----------------------------------------------------------------------
    compute a single thermodyanmic value, word is any keyword in custom list
    called when a variable is evaluated by Variable class
diff --git a/src/thermo.h b/src/thermo.h
index 547273a428..8daf5984a1 100644
--- a/src/thermo.h
+++ b/src/thermo.h
@@ -94,7 +94,6 @@ class Thermo : protected Pointers {
   int add_compute(const char *, int);
   int add_fix(const char *);
   int add_variable(const char *);
-  void create_compute(char *, char *, char *);
 
   typedef void (Thermo::*FnPtr)();
   void addfield(const char *, FnPtr, int);