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

[brad at geodynamics.org]

Author: brad
Date: 2007-11-08 16:48:49 -0800 (Thu, 08 Nov 2007)
New Revision: 8255

Added:
   cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestGravityField.py
Modified:
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/GravityField.py
   cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/testspatial.py
Log:
Finished Python unit tests for GravityField.

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/GravityField.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/GravityField.py	2007-11-09 00:40:50 UTC (rev 8254)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/GravityField.py	2007-11-09 00:48:49 UTC (rev 8255)
@@ -73,7 +73,7 @@
     """
     SpatialDB.initialize(self)
     self.cppHandle.upDir(self.upDir)
-    self.cppHandle.acceleration(self.acceleration.value)
+    self.cppHandle.gravAcceleration(self.acceleration.value)
     return
   
 

Added: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestGravityField.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestGravityField.py	2007-11-09 00:40:50 UTC (rev 8254)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestGravityField.py	2007-11-09 00:48:49 UTC (rev 8255)
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+#
+# ======================================================================
+#
+#                           Brad T. Aagaard
+#                        U.S. Geological Survey
+#
+# {LicenseText}
+#
+# ======================================================================
+#
+
+import unittest
+
+import numpy
+
+
+class TestGravityField(unittest.TestCase):
+
+  def setUp(self):
+    from spatialdata.spatialdb.GravityField import GravityField
+    db = GravityField()
+    db._configure()
+    db.initialize()
+    self._db = db
+    return
+
+  def test_database(self):
+    locs = numpy.array( [[1.0, 2.0, 3.0],
+                         [5.6, 4.2, 8.6]],
+                        numpy.float64)
+    from spatialdata.geocoords.CSCart import CSCart
+    cs = CSCart()
+    gacc = 9.80665
+    dataE = numpy.array([[0.0, 0.0, -gacc],
+                         [0.0, 0.0, -gacc]], numpy.float64)
+    errE = numpy.array( [0]*2, numpy.int32)
+    
+    self._db.open()
+    (data, err) = self._db.query(locs, cs, numvals=3)
+    data = numpy.array(data)
+    err = numpy.array(err)
+
+    self.assertEqual(len(errE.shape), len(err.shape))
+    for dE, d in zip(errE.shape, err.shape):
+      self.assertEqual(dE, d)
+    for vE, v in zip(numpy.reshape(errE, -1), numpy.reshape(err, -1)):
+      self.assertEqual(vE, v)
+
+    self.assertEqual(len(dataE.shape), len(data.shape))
+    for dE, d in zip(dataE.shape, data.shape):
+      self.assertEqual(dE, d)
+    for vE, v in zip(numpy.reshape(dataE, -1), numpy.reshape(data, -1)):
+      self.assertAlmostEqual(vE, v, 6)
+
+    self._db.close()    
+    return
+
+
+# End of file 

Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/testspatial.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/testspatial.py	2007-11-09 00:40:50 UTC (rev 8254)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/testspatial.py	2007-11-09 00:48:49 UTC (rev 8255)
@@ -25,6 +25,9 @@
   from TestUniformDB import TestUniformDB
   suite.addTest(unittest.makeSuite(TestUniformDB))
 
+  from TestGravityField import TestGravityField
+  suite.addTest(unittest.makeSuite(TestGravityField))
+
   from TestGenSimpleDBApp import TestGenSimpleDBApp
   suite.addTest(unittest.makeSuite(TestGenSimpleDBApp))