[cig-commits] r8366 - in cs/spatialdata-0.1/trunk: libsrc/spatialdb tests/libtests/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2007-12-03 12:40:28 -0800 (Mon, 03 Dec 2007)
New Revision: 8366

Modified:
   cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc
   cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc
Log:
Fixed bug in SCEC CVM-H where error flag was not reset after getting value from background model.

Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc	2007-12-03 19:57:28 UTC (rev 8365)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc	2007-12-03 20:40:28 UTC (rev 8366)
@@ -299,9 +299,10 @@
     outsideVoxet = _crustMantleVp->query(vp, _xyzUTM);
     if (outsideVoxet) {
       const double vpBg = _backgroundVp();
-      if (vpBg > 0.0)
+      if (vpBg > 0.0) {
+	outsideVoxet = 0;
 	*vp = vpBg;
-      else
+      } else
 	outsideVoxet = 1;
     } // if
   } // else

Modified: cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc	2007-12-03 19:57:28 UTC (rev 8365)
+++ cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc	2007-12-03 20:40:28 UTC (rev 8366)
@@ -178,14 +178,20 @@
 
       -28512.111328,    93.515053,  -99999.0, -2860.919189, -99999.0, -99999.0, -99999.0,
     };
+    const int flags[] = {
+      0, 0, 0, 0, 0, 0, 0,
+      1, 1, 1, 1, 1, 1,
+      1,
+    };
 
     db.queryVals(queryNames, querySize);
 
     double data[querySize];
 
     for (int iLoc=0; iLoc < numLocs; ++iLoc) {
-      db.query(data, querySize, &lonlatelev[iLoc*spaceDim], spaceDim, &cs);
-      
+      int err = db.query(data, querySize, &lonlatelev[iLoc*spaceDim], spaceDim, &cs);
+      CPPUNIT_ASSERT_EQUAL(flags[iLoc], err);
+
       for (int iVal=0; iVal < querySize; ++iVal) {
 	const double dataE = values[iLoc*querySize+iVal];
 	if (fabs(dataE) > tolerance)
@@ -218,13 +224,19 @@
       2946.666667, -99999.00,    
       -99999.0, -99999.00,    
     };
+    const int flags[] = {
+      0, 0, 0, 0, 0, 0, 0,
+      1, 1, 1, 1, 1, 1,
+      1,
+    };
 
     db.queryVals(queryNames, querySize);
 
     double data[querySize];
 
     for (int iLoc=0; iLoc < numLocs; ++iLoc) {
-      db.query(data, querySize, &lonlatelev[iLoc*spaceDim], spaceDim, &cs);
+      int err = db.query(data, querySize, &lonlatelev[iLoc*spaceDim], spaceDim, &cs);
+      CPPUNIT_ASSERT_EQUAL(flags[iLoc], err);
       
       for (int iVal=0; iVal < querySize; ++iVal) {
 	const double dataE = values[iLoc*querySize+iVal];
@@ -257,13 +269,19 @@
       3011.300000, 
       -99999.0, 
     };
+    const int flags[] = {
+      0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0,
+      1,
+    };
 
     db.queryVals(queryNames, querySize);
 
     double data[querySize];
 
     for (int iLoc=0; iLoc < numLocs; ++iLoc) {
-      db.query(data, querySize, &lonlatelev[iLoc*spaceDim], spaceDim, &cs);
+      int err = db.query(data, querySize, &lonlatelev[iLoc*spaceDim], spaceDim, &cs);
+      CPPUNIT_ASSERT_EQUAL(flags[iLoc], err);
       
       for (int iVal=0; iVal < querySize; ++iVal) {
 	const double dataE = values[iLoc*querySize+iVal];