[cig-commits] r8368 - cs/spatialdata-0.1/trunk/tests/libtests/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2007-12-03 13:20:37 -0800 (Mon, 03 Dec 2007)
New Revision: 8368

Modified:
   cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc
Log:
Fixed bug in SCECCVMH where we didn't check to see if query point was deeper than extent of domain (want to use background model in such a case).

Modified: cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc	2007-12-03 21:20:26 UTC (rev 8367)
+++ cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc	2007-12-03 21:20:37 UTC (rev 8368)
@@ -125,7 +125,7 @@
   cs.datumVert("mean sea level");
   cs.initialize();
 
-  const int numLocs = 14;
+  const int numLocs = 15;
   const int spaceDim = 3;
   const double lonlatelev[] = {
     -118.560000,  32.550000,  -2450.00,
@@ -144,6 +144,7 @@
     -125.000000,  35.000000,  0.0,
 
     -117.989344,  34.034148,  5000.00, // above domain
+    -117.989344,  34.034148,  -500000.0, // below domain
   };
   const double tolerance = 1.0e-06;
 
@@ -177,11 +178,12 @@
       -99999.0, -99999.0, -99999.0, -99999.0, 5000.0, 2946.666667, 3011.300000,
 
       -28512.111328,    93.515053,  -99999.0, -2860.919189, -99999.0, -99999.0, -99999.0,
+      -28512.111328,    93.515053,  -99999.0, -2860.919189, 7800.0, 3880.0, 4459.294240,
     };
     const int flags[] = {
       0, 0, 0, 0, 0, 0, 0,
       1, 1, 1, 1, 1, 1,
-      1,
+      1, 1
     };
 
     db.queryVals(queryNames, querySize);
@@ -223,11 +225,12 @@
       3254.814814, -99999.00,    
       2946.666667, -99999.00,    
       -99999.0, -99999.00,    
+      3880.000000, -99999.00,    
     };
     const int flags[] = {
       0, 0, 0, 0, 0, 0, 0,
       1, 1, 1, 1, 1, 1,
-      1,
+      1, 1
     };
 
     db.queryVals(queryNames, querySize);
@@ -268,11 +271,12 @@
       3514.068087, 
       3011.300000, 
       -99999.0, 
+      4459.29424, 
     };
     const int flags[] = {
       0, 0, 0, 0, 0, 0, 0,
       0, 0, 0, 0, 0, 0,
-      1,
+      1, 0
     };
 
     db.queryVals(queryNames, querySize);