[MOAB-dev] r4335 - in MOAB/trunk/src: . io

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-12-07 12:34:53 -0600 (Tue, 07 Dec 2010)
New Revision: 4335

Modified:
   MOAB/trunk/src/FileOptions.cpp
   MOAB/trunk/src/FileOptions.hpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
Log:
- read NC vertices correctly
- implemented FileOptions::get_reals properly




Modified: MOAB/trunk/src/FileOptions.cpp
===================================================================
--- MOAB/trunk/src/FileOptions.cpp	2010-12-07 18:28:05 UTC (rev 4334)
+++ MOAB/trunk/src/FileOptions.cpp	2010-12-07 18:34:53 UTC (rev 4335)
@@ -230,24 +230,7 @@
 #define EATSPACE(a) while ((!strcmp(a, " ") || \
           !strcmp(a, ",")) && !strempty(a)) a++;
     EATSPACE(endptr);
-    double eval = sval;
-    if (!strcmp(endptr, "-")) {
-      endptr++;
-      s = endptr;
-      eval = strtol(s, &endptr, 0);
-      EATSPACE(endptr);
-    }
-  
-      // check for overflow (parsing long int, returning int)
-    int value = sval;
-    if (sval != (long int)value)
-      return MB_TYPE_OUT_OF_RANGE;
-    value = eval;
-    if (eval != (long int)value)
-      return MB_TYPE_OUT_OF_RANGE;
-  
-    for (int i = sval; i <= eval; i++)
-      values.push_back(i);
+    values.push_back(sval);
 
     s = endptr;
   }

Modified: MOAB/trunk/src/FileOptions.hpp
===================================================================
--- MOAB/trunk/src/FileOptions.hpp	2010-12-07 18:28:05 UTC (rev 4334)
+++ MOAB/trunk/src/FileOptions.hpp	2010-12-07 18:34:53 UTC (rev 4335)
@@ -164,9 +164,7 @@
   /**\brief Check for option for which the value is a list of doubles
    *
    * Check for an option which is a double list.  The value is expected to
-   * be a comma-separated list of int ranges, where an int range can be 
-   * either a single integer value or a range of integer values separated
-   * by a dash ('-').
+   * be a comma-separated list of double values
    *
    *\param name The option name
    *\param values Output. The list of double values.

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2010-12-07 18:28:05 UTC (rev 4334)
+++ MOAB/trunk/src/io/ReadNC.cpp	2010-12-07 18:34:53 UTC (rev 4335)