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

[brad at geodynamics.org]

Author: brad
Date: 2008-04-22 13:58:44 -0700 (Tue, 22 Apr 2008)
New Revision: 11849

Modified:
   cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc
   cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc
Log:
Fixed degenerative cases for Vp/density and Vp/Vs relations. Updated unit tests.

Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc	2008-04-22 20:26:48 UTC (rev 11848)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.cc	2008-04-22 20:58:44 UTC (rev 11849)
@@ -183,7 +183,6 @@
   } // for
 } // queryVals
 
-#include <iostream>
 // ----------------------------------------------------------------------
 // Query the database.
 int
@@ -234,21 +233,21 @@
       case QUERY_VP :
 	outsideVoxet = _queryVp(&vals[iVal]);
 	if (outsideVoxet)
-	  queryFlag = outsideVoxet;
+	  queryFlag = outsideVoxet || queryFlag;
 	haveVp = true;
 	vp = vals[iVal];
 	break;
       case QUERY_VPTAG :
 	outsideVoxet = _queryTag(&vals[iVal]);
 	if (outsideVoxet)
-	  queryFlag = outsideVoxet;
+	  queryFlag = outsideVoxet || queryFlag;
 	break;
       case QUERY_DENSITY :
 	if (!haveVp) {
 	  outsideVoxet = _queryVp(&vp);
 	  haveVp = true;
 	  if (outsideVoxet)
-	    queryFlag = outsideVoxet;
+	    queryFlag = outsideVoxet || queryFlag;
 	} // if
 	vals[iVal] = _calcDensity(vp);
 	break;
@@ -257,7 +256,7 @@
 	  outsideVoxet = _queryVp(&vp);
 	  haveVp = true;
 	  if (outsideVoxet)
-	    queryFlag = outsideVoxet;
+	    queryFlag = outsideVoxet || queryFlag;
 	} // if
 	vals[iVal] = _calcVs(vp);
 	break;
@@ -266,7 +265,7 @@
 	  assert(0 != _topoElev);
 	  outsideVoxet = _topoElev->queryNearest(&vals[iVal], _xyzUTM);
 	  if (outsideVoxet)
-	    queryFlag = outsideVoxet;
+	    queryFlag = outsideVoxet || queryFlag;
 	} else
 	  vals[iVal] = topoElev;
 	break;
@@ -274,13 +273,13 @@
 	assert(0 != _baseDepth);
 	outsideVoxet = _baseDepth->queryNearest(&vals[iVal], _xyzUTM);
 	if (outsideVoxet)
-	  queryFlag = outsideVoxet;
+	  queryFlag = outsideVoxet || queryFlag;
 	break;
       case QUERY_MOHODEPTH :
 	assert(0 != _mohoDepth);
 	outsideVoxet = _mohoDepth->queryNearest(&vals[iVal], _xyzUTM);
 	if (outsideVoxet)
-	  queryFlag = outsideVoxet;
+	  queryFlag = outsideVoxet || queryFlag;
 	break;
       default:
 	assert(0);
@@ -340,12 +339,10 @@
 { // _calcDensity
   double density = vp / 3.0 + 1280.0;
   if (vp < 2160.0) {
-    if (vp > 1480.0)
+    if (vp != 1480.0) // if not water
       density = 2000.0;
-    else if (1480.0 == vp)
-      density = 1000.0;
     else
-      density = -99999.0;
+      density = 1000.0; // water
   } // if
 
   return density;
@@ -361,12 +358,10 @@
     785.8 - 1.2344*vp + 794.9 * pow(vp/1000.0,2) 
     - 123.8 * pow(vp/1000.0,3) + 6.4 * pow(vp/1000.0,4);
   if (vp < 1500.0)
-    if (vp > 1480.0) 
+    if (vp != 1480.0) // if not water
       vs = (1500.0-1360.0)/1.16;
-    else if (1480.0 == vp)
-      vs = 0.0;
-    else
-      vs = -99999.0;
+    else 
+      vs = 0.0; // water
 
   return vs;
 } // _calcVs

Modified: cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc	2008-04-22 20:26:48 UTC (rev 11848)
+++ cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/TestSCECCVMH.cc	2008-04-22 20:58:44 UTC (rev 11849)
@@ -462,7 +462,7 @@
     1860.0,
   };
   const double densityE[] = {
-    -99999.00,
+    2000.00,
     3126.848633,
     2741.375488,
     2660.851074,
@@ -501,7 +501,7 @@
     1860.0,
   };
   const double vsE[] = {
-    -99999.00,
+    (1500.0-1360.0)/1.16,
     3323.004705,
     2584.759846,
     2398.752778,