[cig-commits] r13631 - cs/cigma/trunk

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:16:31 -0800 (Tue, 09 Dec 2008)
New Revision: 13631

Modified:
   cs/cigma/trunk/quick.sh
Log:
Updated testing script: localize definitions of A,B directories

Modified: cs/cigma/trunk/quick.sh
===================================================================
--- cs/cigma/trunk/quick.sh	2008-12-10 02:16:30 UTC (rev 13630)
+++ cs/cigma/trunk/quick.sh	2008-12-10 02:16:31 UTC (rev 13631)
@@ -6,10 +6,15 @@
 
 ###############################################################################
 
+
 C=$HOME/cigma
 T=$C/tests
 D=$T/data
 
+
+###############################################################################
+
+
 A=$D/brick1
 B=$D/brick2
 
@@ -17,13 +22,12 @@
 b=$B/brick2.h5
 m=$A/brick1.h5
 
-t=0
 
-
 ###############################################################################
 
+
+t=0
 while getopts 'ht:' OPTION; do
-
     case $OPTION in
         h) printf "Usage: %s [-t <TEST-ID>] -- <TEST-OPTS>\n" $(basename $0) >&2
            exit 255
@@ -36,19 +40,19 @@
 shift $(($OPTIND - 1))
 
 if true; then
-    echo A=$A
-    echo B=$B
     echo "t=$t"
+    echo "D=$D"
 fi
 
 
 ###############################################################################
 
+
 #t=1000
 if [ $t = 1000 ]; then
     set -x
     cigma extract \
-        --mesh          $A/brick1.h5 \
+        --mesh          $D/brick1/brick1.h5 \
         --mesh-cell     hex8 \
         --output        qpts.h5 \
         $*
@@ -59,24 +63,37 @@
 if [ $t = 1001 ]; then
     set -x
     cigma extract \
-        --mesh          $A/brick1.h5 \
+        --mesh          $D/brick1/brick1.h5 \
         --mesh-cell     hex8 \
-        --rule          $D/qr/hex8_qr3.dat \
-        --output        qpts2.h5 \
+        --rule          $D/qr/hex8_ord3.dat \
+        --output        qpts.h5 \
         $*
     exit $?
 fi
 
+#t=1002
+if [ $t = 1002 ]; then
+    set -x
+    cigma extract \
+        --mesh          $D/brick2/brick2.h5 \
+        --mesh-cell     tet4 \
+        --rule          $D/qr/tet4_ord4.dat \
+        --output        qpts.h5 \
+        $*
+    exit $?
+fi
 
+
 ###############################################################################
 
+
 #t=2000
 if [ $t = 2000 ]; then
     set -x
     cigma eval \
         --function  'test.cube' \
-        --points    brick1.h5:/coordinates  \
-        --output    values.h5:/values \
+        --points    $D/brick1/brick1.h5:/coordinates  \
+        --output    cubefn.h5:/values \
         $*
     exit $?
 fi
@@ -95,9 +112,12 @@
 
 ###############################################################################
 
+
 #t=3000
 if [ $t = 3000 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first                 $A/CubeFn.dat \
         --first-mesh-coords     $A/coords.dat \
@@ -118,6 +138,8 @@
 #t=3001
 if [ $t = 3001 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first                 $A/CubeFn.dat \
         --first-mesh-coords     $A/coords.dat \
@@ -132,11 +154,15 @@
     exit $?
 fi
 
+
 ###############################################################################
 
+
 #t=3100
 if [ $t = 3100 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first                 $A/Data.h5:/CubeFn \
         --first-mesh-coords     $A/brick1.h5:/coordinates \
@@ -154,6 +180,8 @@
 #t=3101
 if [ $t = 3101 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first             $A/Data.h5:/CubeFn \
         --first-mesh        $A/brick1.h5 \
@@ -169,6 +197,8 @@
 #t=3102
 if [ $t = 3102 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first             $A/Data.h5:/Var/step0 \
         --first-mesh        $A/brick1.h5 \
@@ -182,6 +212,8 @@
 #t=3103
 if [ $t = 3103 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first             $A/Data.h5:/Var/step0 \
         --second            $B/Data.h5:/Var/step0 \
@@ -193,6 +225,8 @@
 #t=3104
 if [ $t = 3104 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first             $A/Data.h5:/Var/step0 \
         --second            $B/Data.h5:/Var/step0 \
@@ -201,12 +235,15 @@
     exit $?
 fi
 
+
 ###############################################################################
 
 
 #t=3200
 if [ $t = 3200 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first     $A/Data.vtk:/Var0 \
         --second    $B/Data.vtk:/Var0 \
@@ -218,6 +255,9 @@
 #t=3201
 if [ $t = 3201 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
+    m=$A/brick1.h5
     cigma compare \
         --first     $A/Data.vtk:/Var0 \
         --second    $B/Data.vtk:/Var0 \
@@ -230,6 +270,8 @@
 #t=3202
 if [ $t = 3202 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first     $A/Data.vtu:/Var0 \
         --second    $B/Data.vtu:/Var0 \
@@ -241,6 +283,8 @@
 #t=3203
 if [ $t = 3203 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first     $A/Data.vtr:/Var0 \
         --second    $B/Data.vtr:/Var0 \
@@ -252,6 +296,8 @@
 #t=3204
 if [ $t = 3204 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first     $A/Data.vts:/Var0 \
         --second    $B/Data.vts:/Var0 \
@@ -263,6 +309,8 @@
 #t=3205
 if [ $t = 3205 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first     $A/Data.pvtu:/Var0 \
         --second    $B/Data.pvtu:/Var0 \
@@ -274,6 +322,8 @@
 #t=3206
 if [ $t = 3206 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first     $A/Data.pvtr:/Var0 \
         --second    $B/Data.pvtr:/Var0 \
@@ -285,6 +335,8 @@
 #t=3207
 if [ $t = 3207 ]; then
     set -x
+    A=$D/brick1
+    B=$D/brick2
     cigma compare \
         --first     $A/Data.pvts:/Var0 \
         --second    $B/Data.pvts:/Var0 \