[cig-commits] r16225 - in cs/spatialdata-0.1/trunk: spatialdata/spatialdb/generator tests/pytests/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2010-02-03 13:16:39 -0800 (Wed, 03 Feb 2010)
New Revision: 16225

Modified:
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/generator/GenSimpleDBApp.py
   cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSimpleIOAscii.py
   cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/testgen1din2d.odb
Log:
Fixed some bugs related to code not being updated for changes to SimpleIOAscii (locs->points).

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/generator/GenSimpleDBApp.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/generator/GenSimpleDBApp.py	2010-02-03 17:02:21 UTC (rev 16224)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/generator/GenSimpleDBApp.py	2010-02-03 21:16:39 UTC (rev 16225)
@@ -75,9 +75,9 @@
     """
     self._info.log("Reading geometry.")
     self.geometry.read()
-    locs = self.geometry.vertices
+    points = self.geometry.vertices
     coordsys = self.geometry.coordsys
-    data = {'locs': locs,
+    data = {'points': points,
             'coordsys': coordsys,
             'data_dim': self.geometry.dataDim,
             'values': []}
@@ -85,7 +85,7 @@
       self._info.log("Creating value '%s'" % value.name)
       data['values'].append({'name': value.name,
                              'units': value.units,
-                             'data': value.calculate(locs, coordsys)})
+                             'data': value.calculate(points, coordsys)})
     self._info.log("Writing database.")
     self.iohandler.write(data)
     return

Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSimpleIOAscii.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSimpleIOAscii.py	2010-02-03 17:02:21 UTC (rev 16224)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSimpleIOAscii.py	2010-02-03 21:16:39 UTC (rev 16225)
@@ -26,7 +26,7 @@
     cs.initialize()
 
     filename = "data/test.spatialdb"
-    data = {'locs': numpy.array( [ [1.0, 2.0, 3.0],
+    data = {'points': numpy.array( [ [1.0, 2.0, 3.0],
                                    [0.5, 3.0, -3.0]], numpy.float64),
             'coordsys': cs,
             'data_dim': 1,

Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/testgen1din2d.odb
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/testgen1din2d.odb	2010-02-03 17:02:21 UTC (rev 16224)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/testgen1din2d.odb	2010-02-03 21:16:39 UTC (rev 16225)
@@ -41,20 +41,19 @@
     Constructor.
     """
     Component.__init__(self, name="geometrytestgen", facility="reader")
-    self.topology = self.Topology()
-    self.topology.vertices = numpy.array([ [-2.0,  3.0],
-                                           [ 0.0,  1.0],
-                                           [ 1.0,  0.0],
-                                           [ 2.0, -4.0] ],
-                                         dtype=numpy.float64)
+    self.vertices = numpy.array([ [-2.0,  3.0],
+                                  [ 0.0,  1.0],
+                                  [ 1.0,  0.0],
+                                  [ 2.0, -4.0] ],
+                                dtype=numpy.float64)
     return
 
 
-  def unpickle(self):
+  def read(self):
     """
     Read geometry.
     """
-    return self.topology
+    return self.vertices
 
 
 # ----------------------------------------------------------------------