[cig-commits] commit: Make examples use 'relax' instead of the path to the build directory

Mercurial hg at geodynamics.org
Sat May 12 16:06:23 PDT 2012


changeset:   109:3acfba3abb99
user:        Walter Landry <wlandry at caltech.edu>
date:        Sat May 12 16:05:38 2012 -0700
files:       examples/alaska/coseismic.sh examples/mojave/coulomb.sh examples/mojave/hectorm.sh examples/mojave/landers.sh examples/newzealand/christchurch.sh examples/newzealand/darfield.sh examples/taiwan/afterslip.sh examples/taiwan/coseismic.sh examples/taiwan/visco1d.sh examples/tibet/kokoxili/kokoxili_co.sh examples/tibet/kokoxili/kokoxili_vs.sh examples/tibet/kokoxili/kokoxili_vs3d.sh examples/tibet/yushu/yushu_as.sh examples/tibet/yushu/yushu_co.sh examples/tibet/yushu/yushu_vlc.sh examples/tibet/yushu/yushu_vmc.sh examples/tibet/yutian/yutian_co.sh
description:
Make examples use 'relax' instead of the path to the build directory


diff -r 390fffab66e9 -r 3acfba3abb99 examples/alaska/coseismic.sh
--- a/examples/alaska/coseismic.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/alaska/coseismic.sh	Sat May 12 16:05:38 2012 -0700
@@ -12,7 +12,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-time ../../build/relax --no-proj-output $* <<EOF | tee $WDIR/in.param
+time relax --no-proj-output $* <<EOF | tee $WDIR/in.param
 # grid dimension (sx1,sx2,sx3)
 512 512 512
 # sampling (dx1,dx2,dx3), smoothing (beta, nyquist)
diff -r 390fffab66e9 -r 3acfba3abb99 examples/mojave/coulomb.sh
--- a/examples/mojave/coulomb.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/mojave/coulomb.sh	Sat May 12 16:05:38 2012 -0700
@@ -43,7 +43,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-time ../../build/relax <<EOF --no-vtk-output --no-proj-output \
+time relax <<EOF --no-vtk-output --no-proj-output \
 	--no-stress-output $* | tee $WDIR/in.param
 # grid size (sx1,sx2,sx3)
 512 512 512
diff -r 390fffab66e9 -r 3acfba3abb99 examples/mojave/hectorm.sh
--- a/examples/mojave/hectorm.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/mojave/hectorm.sh	Sat May 12 16:05:38 2012 -0700
@@ -14,7 +14,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-time ../../relax <<EOF $* --no-vtk-output --no-proj-output \
+time relax <<EOF $* --no-vtk-output --no-proj-output \
 	--no-stress-output | tee $WDIR/in.param
 # grid size (sx1,sx2,sx3)
 512 512 512
diff -r 390fffab66e9 -r 3acfba3abb99 examples/mojave/landers.sh
--- a/examples/mojave/landers.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/mojave/landers.sh	Sat May 12 16:05:38 2012 -0700
@@ -14,7 +14,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-time ../../relax <<EOF --no-vtk-output --no-proj-output \
+time relax <<EOF --no-vtk-output --no-proj-output \
 	--no-stress-output $* | tee $WDIR/in.param
 # grid size (sx1,sx2,sx3)
 512 512 512
diff -r 390fffab66e9 -r 3acfba3abb99 examples/newzealand/christchurch.sh
--- a/examples/newzealand/christchurch.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/newzealand/christchurch.sh	Sat May 12 16:05:38 2012 -0700
@@ -19,7 +19,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-OMP_NUM_THREADS=4 ../../relax --no-proj-output $* <<EOF | tee $WDIR/in.param
+OMP_NUM_THREADS=4 relax --no-proj-output $* <<EOF | tee $WDIR/in.param
 # use '#' character to include comments in your input file
 # grid size (sx1,sx2,sx3)
 512 512 512
diff -r 390fffab66e9 -r 3acfba3abb99 examples/newzealand/darfield.sh
--- a/examples/newzealand/darfield.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/newzealand/darfield.sh	Sat May 12 16:05:38 2012 -0700
@@ -19,7 +19,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-OMP_NUM_THREADS=4 ../../relax --no-proj-output $* <<EOF | tee $WDIR/in.param
+OMP_NUM_THREADS=4 relax --no-proj-output $* <<EOF | tee $WDIR/in.param
 # use '#' character to include comments in your input file
 # grid size (sx1,sx2,sx3)
 512 512 512
diff -r 390fffab66e9 -r 3acfba3abb99 examples/taiwan/afterslip.sh
--- a/examples/taiwan/afterslip.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/taiwan/afterslip.sh	Sat May 12 16:05:38 2012 -0700
@@ -12,7 +12,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-time ../../relax --no-proj-output --no-stress-output $* <<EOF | tee $WDIR/in.param
+time relax --no-proj-output --no-stress-output $* <<EOF | tee $WDIR/in.param
 # grid dimension (sx1,sx2,sx3)
 512 512 512
 # sampling (dx1,dx2,dx3), smoothing (beta, nyquist)
diff -r 390fffab66e9 -r 3acfba3abb99 examples/taiwan/coseismic.sh
--- a/examples/taiwan/coseismic.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/taiwan/coseismic.sh	Sat May 12 16:05:38 2012 -0700
@@ -11,7 +11,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-time ../../build/relax $* <<EOF | tee $WDIR/in.param
+time relax $* <<EOF | tee $WDIR/in.param
 # grid dimension (sx1,sx2,sx3)
 512 512 512
 # sampling (dx1,dx2,dx3), smoothing (beta, nyquist)
diff -r 390fffab66e9 -r 3acfba3abb99 examples/taiwan/visco1d.sh
--- a/examples/taiwan/visco1d.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/taiwan/visco1d.sh	Sat May 12 16:05:38 2012 -0700
@@ -11,7 +11,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-time ../../build/relax --no-proj-output --no-stress-output $* <<EOF | tee $WDIR/in.param
+time relax --no-proj-output --no-stress-output $* <<EOF | tee $WDIR/in.param
 # grid dimension (sx1,sx2,sx3)
 512 512 512
 # sampling (dx1,dx2,dx3), smoothing (beta, nyquist)
diff -r 390fffab66e9 -r 3acfba3abb99 examples/tibet/kokoxili/kokoxili_co.sh
--- a/examples/tibet/kokoxili/kokoxili_co.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/tibet/kokoxili/kokoxili_co.sh	Sat May 12 16:05:38 2012 -0700
@@ -34,7 +34,7 @@ DX=2
 
 R=`echo $SX $DX | awk '{print $1*$2/2}'`
 
-OMP_NUM_THREADS=4 ../../../build/relax --no-proj-output $* <<EOF | tee $WDIR/in.param
+OMP_NUM_THREADS=4 relax --no-proj-output $* <<EOF | tee $WDIR/in.param
 # use '#' character to include comments in your input file
 # grid size (sx1,sx2,sx3)
 $SX $SX $SX
diff -r 390fffab66e9 -r 3acfba3abb99 examples/tibet/kokoxili/kokoxili_vs.sh
--- a/examples/tibet/kokoxili/kokoxili_vs.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/tibet/kokoxili/kokoxili_vs.sh	Sat May 12 16:05:38 2012 -0700
@@ -38,7 +38,7 @@ DX=2
 
 R=`echo $SX $DX | awk '{print $1*$2/2}'`
 
-OMP_NUM_THREADS=4 ../../../build/relax --no-proj-output --no-stress-output $* <<EOF | tee $WDIR/in.param
+OMP_NUM_THREADS=4 relax --no-proj-output --no-stress-output $* <<EOF | tee $WDIR/in.param
 # use '#' character to include comments in your input file
 # grid size (sx1,sx2,sx3)
 512 512 512
diff -r 390fffab66e9 -r 3acfba3abb99 examples/tibet/kokoxili/kokoxili_vs3d.sh
--- a/examples/tibet/kokoxili/kokoxili_vs3d.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/tibet/kokoxili/kokoxili_vs3d.sh	Sat May 12 16:05:38 2012 -0700
@@ -38,7 +38,7 @@ DX=2
 
 R=`echo $SX $DX | awk '{print $1*$2/2}'`
 
-OMP_NUM_THREADS=4 ../../../build/relax --no-proj-output --no-stress-output $* <<EOF | tee $WDIR/in.param
+OMP_NUM_THREADS=4 relax --no-proj-output --no-stress-output $* <<EOF | tee $WDIR/in.param
 # use '#' character to include comments in your input file
 # grid size (sx1,sx2,sx3)
 $SX $SX $SX
diff -r 390fffab66e9 -r 3acfba3abb99 examples/tibet/yushu/yushu_as.sh
--- a/examples/tibet/yushu/yushu_as.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/tibet/yushu/yushu_as.sh	Sat May 12 16:05:38 2012 -0700
@@ -20,7 +20,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-OMP_NUM_THREADS=4 ../../../build/relax --no-proj-output $* <<EOF | tee $WDIR/in.param
+OMP_NUM_THREADS=4 relax --no-proj-output $* <<EOF | tee $WDIR/in.param
 # use '#' character to include comments in your input file
 # grid size (sx1,sx2,sx3)
 256 256 256
diff -r 390fffab66e9 -r 3acfba3abb99 examples/tibet/yushu/yushu_co.sh
--- a/examples/tibet/yushu/yushu_co.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/tibet/yushu/yushu_co.sh	Sat May 12 16:05:38 2012 -0700
@@ -20,7 +20,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-OMP_NUM_THREADS=4 ../../relax --no-proj-output $* <<EOF | tee $WDIR/in.param
+OMP_NUM_THREADS=4 relax --no-proj-output $* <<EOF | tee $WDIR/in.param
 # use '#' character to include comments in your input file
 # grid size (sx1,sx2,sx3)
 512 512 512
diff -r 390fffab66e9 -r 3acfba3abb99 examples/tibet/yushu/yushu_vlc.sh
--- a/examples/tibet/yushu/yushu_vlc.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/tibet/yushu/yushu_vlc.sh	Sat May 12 16:05:38 2012 -0700
@@ -28,7 +28,7 @@ DX=0.3
 DX=0.3
 L=`echo $SX $DX | awk '{print $1*$2/2}'`
 
-OMP_NUM_THREADS=4 ../../../build/relax --no-proj-output $* <<EOF | tee $WDIR/in.param
+OMP_NUM_THREADS=4 relax --no-proj-output $* <<EOF | tee $WDIR/in.param
 # use '#' character to include comments in your input file
 # grid size (sx1,sx2,sx3)
 $SX $SX $SX
diff -r 390fffab66e9 -r 3acfba3abb99 examples/tibet/yushu/yushu_vmc.sh
--- a/examples/tibet/yushu/yushu_vmc.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/tibet/yushu/yushu_vmc.sh	Sat May 12 16:05:38 2012 -0700
@@ -28,7 +28,7 @@ DX=0.3
 DX=0.3
 L=`echo $SX $DX | awk '{print $1*$2/2}'`
 
-OMP_NUM_THREADS=4 ../../../build/relax --no-proj-output $* <<EOF | tee $WDIR/in.param
+OMP_NUM_THREADS=4 relax --no-proj-output $* <<EOF | tee $WDIR/in.param
 # use '#' character to include comments in your input file
 # grid size (sx1,sx2,sx3)
 $SX $SX $SX
diff -r 390fffab66e9 -r 3acfba3abb99 examples/tibet/yutian/yutian_co.sh
--- a/examples/tibet/yutian/yutian_co.sh	Sat May 12 09:04:27 2012 -0700
+++ b/examples/tibet/yutian/yutian_co.sh	Sat May 12 16:05:38 2012 -0700
@@ -19,7 +19,7 @@ if [ ! -e $WDIR ]; then
 	mkdir $WDIR
 fi
 
-OMP_NUM_THREADS=4 ../../../build/relax --no-proj-output $* <<EOF | tee $WDIR/in.param
+OMP_NUM_THREADS=4 relax --no-proj-output $* <<EOF | tee $WDIR/in.param
 # use '#' character to include comments in your input file
 # grid size (sx1,sx2,sx3)
 512 512 512



More information about the CIG-COMMITS mailing list