Index: trunk/Ohana/src/dvomerge/test/dvomerge.parallel-input.sh
===================================================================
--- trunk/Ohana/src/dvomerge/test/dvomerge.parallel-input.sh	(revision 35765)
+++ trunk/Ohana/src/dvomerge/test/dvomerge.parallel-input.sh	(revision 35765)
@@ -0,0 +1,10 @@
+#!/bin/csh -f
+
+ rm -rf catdir.merge catdir.grizy.output
+ rsync --exclude=.svn -auv catdir.2mass/ catdir.merge/
+ rsync --exclude=.svn -auv catdir.grizy/ catdir.grizy.output/
+ cp HostTable.dat catdir.merge/
+ dvodist -out catdir.merge
+ rm -rf catdir.merge/n0000 catdir.merge/n0730
+ dvomerge -parallel-input catdir.merge into catdir.grizy.output/
+ dvomerge -verify -parallel-input catdir.merge into catdir.grizy.output/
Index: trunk/Ohana/src/dvomerge/test/dvomerge.parallel-parallel.sh
===================================================================
--- trunk/Ohana/src/dvomerge/test/dvomerge.parallel-parallel.sh	(revision 35765)
+++ trunk/Ohana/src/dvomerge/test/dvomerge.parallel-parallel.sh	(revision 35765)
@@ -0,0 +1,24 @@
+#!/bin/csh -f
+
+ rm -rf catdir.merge catdir.grizy.output
+ rsync --exclude=.svn -auv catdir.2mass/ catdir.2mass.input/
+ rsync --exclude=.svn -auv catdir.grizy/ catdir.grizy.output/
+
+ set rootdir = `pwd`
+ sed "s|catdir.merge|$rootdir/catdir.2mass.input|"  < HostTable.dat > catdir.2mass.input/HostTable.dat
+ sed s/catdir.merge/catdir.grizy.output/ < HostTable.dat > catdir.grizy.output/HostTable.dat
+
+ dvodist -out catdir.2mass.input
+ dvodist -out catdir.grizy.output
+
+ rm -rf catdir.2mass.input/n???? 
+ rm -rf catdir.grizy.output/n????
+
+ dvomerge -parallel-input -parallel catdir.2mass.input into catdir.grizy.output -region 0.01 4.99 0.01 2.49 -v
+ # dvomerge -parallel-input -parallel catdir.2mass.input into catdir.grizy.output -verify
+
+ ## XXX note : this test fails because there are multiple input
+ ## catdirs for a given output catdir AND the sizes and timestamps of
+ ## the cpt files match (size matches because of the 2880 block size;
+ ## time matches because they are all touched in ~1 sec).
+
Index: trunk/Ohana/src/dvomerge/test/dvomerge.parallel.sh
===================================================================
--- trunk/Ohana/src/dvomerge/test/dvomerge.parallel.sh	(revision 35416)
+++ trunk/Ohana/src/dvomerge/test/dvomerge.parallel.sh	(revision 35765)
@@ -1,7 +1,10 @@
 #!/bin/csh -f
 
- rm -rf catdir.merge
- rsync -auv catdir.2mass/ catdir.merge/
+ rm -rf catdir.merge catdir.merge.p?
+ rsync --exclude=.svn -auv catdir.2mass/ catdir.merge/
  cp HostTable.dat catdir.merge/
  dvodist -out catdir.merge
+ rm -rf catdir.merge/n????
+
  dvomerge -parallel catdir.grizy into catdir.merge
+ dvomerge -parallel catdir.grizy into catdir.merge -verify