Changeset 5515 for trunk/psLib/src/types

Timestamp:

Nov 14, 2005, 6:03:36 PM (20 years ago)

Author:

drobbin

Message:

edited VectorsReadFromFile per bug 577 and added Precession Model to EOC testing but fails to init correct tables

File:

• trunk/psLib/src/types/psLookupTable.c (modified) (7 diffs)

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-30 01:14:13 $
+*  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-15 04:03:36 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -152 +152 @@
 
     value = (psS32)strtol(inString, &end, 0);
-    if(*end != '\0') {
+    if(*end != '\0' && !isspace(*end)) {
         *status = PS_PARSE_ERROR_VALUE;
     } else if(inString==end) {
@@ -169 +169 @@
 
     value = (psS64)strtoll(inString, &end, 0);
-    if(*end != '\0') {
+    if(*end != '\0' && !isspace(*end)) {
         *status = PS_PARSE_ERROR_VALUE;
     } else if(inString==end) {
@@ -186 +186 @@
 
     value = (psF32)strtof(inString, &end);
-    if(*end != '\0') {
+    if(*end != '\0' && !isspace(*end)) {
         *status = PS_PARSE_ERROR_VALUE;
     } else if(inString==end) {
@@ -203 +203 @@
 
     value = (psF64)strtod(inString, &end);
-    if(*end != '\0') {
+    if(*end != '\0' && !isspace(*end)) {
         *status = PS_PARSE_ERROR_VALUE;
     } else if(inString==end) {
@@ -444 +444 @@
     // Parse the format string to determine how many vectors
     // and whether the format string is valid
-    while((strValue=getToken((char**)&tempFormat," ",&parseStatus))) {
+    while((strValue=getToken((char**)&tempFormat,"    ",&parseStatus))) {
 
         // Check for %d format sub string
@@ -511 +511 @@
 
                     // Loop through format and line strings to get values in text table file
-                    while((strValue=getToken((char**)&tempFormat," ",&parseStatus)) &&
-                            (strNum=getToken((char**)&linePtr," ",&parseStatus)) ) {
+                    while((strValue=getToken((char**)&tempFormat,"    ",&parseStatus)) &&
+                            (strNum=getToken((char**)&linePtr,"    ",&parseStatus)) ) {
 
                         // Set column vector