[cig-commits] commit: Create specfem3dglobe.tar.gz and fix an accounting bug when using less than 6 chunks

[Mercurial]

changeset:   11:bcd202c08b1c
user:        Walter Landry <wlandry at caltech.edu>
date:        Sun Jun 19 11:43:19 2011 -0700
files:       backend/specfem_launcher.sh
description:
Create specfem3dglobe.tar.gz and fix an accounting bug when using less than 6 chunks


diff -r 5fdccbd541ed -r bcd202c08b1c backend/specfem_launcher.sh
--- a/backend/specfem_launcher.sh	Sun Jun 19 11:41:51 2011 -0700
+++ b/backend/specfem_launcher.sh	Sun Jun 19 11:43:19 2011 -0700
@@ -3,20 +3,23 @@ run_id=$1
 
 # If just checking status, exit early
 
-if [ $# -ge 2 -a $2 == "monitor" ]; then
-    qstat -r | grep Specfem3D_Portal_$1 > /dev/null
-    if [ $? -eq 0 ]; then
-        exit 1
-    else
-        if [ -d $WORK/seismo/run${run_id}/SPECFEM3D_GLOBE_preconfigured -a \
+if [ $# -ge 2 ]; then
+    if [ $2 == "monitor" ]; then
+        qstat -r | grep Specfem3D_Portal_$1 > /dev/null
+        if [ $? -eq 0 ]; then
+            exit 1
+        else
+            if [ -d $WORK/seismo/run${run_id}/SPECFEM3D_GLOBE_preconfigured -a \
                 ! -f $WORK/seismo/run${run_id}/specfem3dglobe.tar.gz ]; then
-            cd $WORK/seismo/run${run_id}/SPECFEM3D_GLOBE_preconfigured
-            cp OUTPUT_FILES/output_mesher.txt OUTPUT_FILES/output_solver.txt ..
-            tar -zcf ../specfem3dglobe.tar.gz OUTPUT_FILES/
+                cd $WORK/seismo/run${run_id}/SPECFEM3D_GLOBE_preconfigured
+                cp OUTPUT_FILES/output_mesher.txt OUTPUT_FILES/output_solver.txt ..
+                tar -zcf ../specfem3dglobe.tar.gz OUTPUT_FILES/
+            fi
+            exit 0
         fi
-        exit 0
     fi
 fi
+
 
 # Submit the job
 
@@ -31,10 +34,9 @@ make meshfem3D > ../output_build.txt
 make meshfem3D > ../output_build.txt
 make specfem3D >> ../output_build.txt
 
-n_chunks=`grep NCHUNKS DATA/Par_file | cut -d = -f 2`
 nproc_xi=`grep NPROC_XI DATA/Par_file | cut -d = -f 2`
 nproc_eta=`grep NPROC_ETA DATA/Par_file | cut -d = -f 2`
-n_procs=`echo $n_chunks*$nproc_xi*$nproc_eta | bc`
+n_procs=`echo $nproc_xi*$nproc_eta | bc`
 
 n_xi=`grep NEX_XI DATA/Par_file | cut -d = -f 2`
 n_eta=`grep NEX_ETA DATA/Par_file | cut -d = -f 2`
@@ -42,7 +44,7 @@ record_length=`grep RECORD_LENGTH_IN_MIN
 record_length=`grep RECORD_LENGTH_IN_MINUTES DATA/Par_file | cut -d = -f 2`
 
 setup_time=30
-factor=`echo '(192*192*192*10/(6*4*4))/400' | bc`
+factor=`echo '(192*192*192*10/(4*4))/400' | bc`
 
 run_time=`echo "$setup_time + $n_xi*$n_xi*$n_xi*$record_length/($n_procs*$factor)" | bc`