[cig-commits] r21788 - cs/spatialdata/trunk/libsrc/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2013-04-09 16:01:09 -0700 (Tue, 09 Apr 2013)
New Revision: 21788

Modified:
   cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridAscii.cc
   cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridDB.cc
Log:
Fixed error protected related error in SimpleGridDB.

Modified: cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridAscii.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridAscii.cc	2013-04-09 22:42:25 UTC (rev 21787)
+++ cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridAscii.cc	2013-04-09 23:01:09 UTC (rev 21788)
@@ -393,9 +393,6 @@
   // Check compatibility of dimension of data, spatial dimension and
   // number of points
   db->_checkCompatibility();
-
-  // Convert to SI units
-  SpatialDB::_convertToSI(db->_data, db->_units, numLocs, db->_numValues);  
 } // _readData
 
 // ----------------------------------------------------------------------

Modified: cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridDB.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridDB.cc	2013-04-09 22:42:25 UTC (rev 21787)
+++ cs/spatialdata/trunk/libsrc/spatialdb/SimpleGridDB.cc	2013-04-09 23:01:09 UTC (rev 21788)
@@ -92,6 +92,10 @@
 spatialdata::spatialdb::SimpleGridDB::open(void)
 { // open
   SimpleGridAscii::read(this);
+
+  // Convert to SI units
+  const int numLocs = _numX * _numY * _numZ;
+  SpatialDB::_convertToSI(_data, _units, numLocs, _numValues);  
 } // open
 
 // ----------------------------------------------------------------------