[cig-commits] [commit] devel: suppressed the "configure" and "make" steps from all the run_this_example.sh (fc2839b)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Dec 8 14:19:30 PST 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/d427560d5a414580d25be3d490a954ba0317c120...fc2839b18b6c49bf4b4ceab92a309ede2f7314eb
>---------------------------------------------------------------
commit fc2839b18b6c49bf4b4ceab92a309ede2f7314eb
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Mon Dec 8 23:10:47 2014 +0100
suppressed the "configure" and "make" steps from all the run_this_example.sh
>---------------------------------------------------------------
fc2839b18b6c49bf4b4ceab92a309ede2f7314eb
.../run_this_example.sh | 7 -------
.../run_this_example.sh | 7 -------
.../run_this_example.sh | 7 -------
.../run_this_example.sh | 7 -------
.../run_this_example.sh | 7 -------
.../run_this_example.sh | 7 -------
EXAMPLES/Mount_StHelens/run_this_example.sh | 4 ----
.../run_this_example.sh | 10 ----------
.../run_this_example.sh | 7 -------
EXAMPLES/layered_halfspace/run_this_example.sh | 4 ----
.../meshfem3D_examples/many_interfaces/run_this_example.sh | 4 ----
EXAMPLES/meshfem3D_examples/sep_bathymetry/run_this_example.sh | 4 ----
EXAMPLES/meshfem3D_examples/simple_model/run_this_example.sh | 4 ----
EXAMPLES/meshfem3D_examples/socal1D/run_this_example.sh | 7 +------
EXAMPLES/tomographic_model/run_this_example.sh | 4 ----
EXAMPLES/waterlayered_halfspace/run_this_example.sh | 4 ----
run_this_example.sh | 6 ------
17 files changed, 1 insertion(+), 99 deletions(-)
diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_5sides/run_this_example.sh b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_5sides/run_this_example.sh
index 4553d44..65713d1 100755
--- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_5sides/run_this_example.sh
+++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_5sides/run_this_example.sh
@@ -40,13 +40,6 @@ rm -fr DATA/*
cd $currentdir
cp -fr DATA/* ../../../DATA/.
-cd ../../../
-
-make clean
-./configure
-make all > $currentdir/tmp.log
-cd $currentdir
-
# links executables
cd bin/
rm -f *
diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_6sides/run_this_example.sh b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_6sides/run_this_example.sh
index 60dde90..2997b04 100755
--- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_6sides/run_this_example.sh
+++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_6sides/run_this_example.sh
@@ -40,13 +40,6 @@ rm -fr DATA/*
cd $currentdir
cp -fr DATA/* ../../../DATA/.
-cd ../../../
-
-make clean
-./configure
-make all > $currentdir/tmp.log
-cd $currentdir
-
# links executables
cd bin/
rm -f *
diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_5sides/run_this_example.sh b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_5sides/run_this_example.sh
index b58e48c..a2608de 100755
--- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_5sides/run_this_example.sh
+++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_5sides/run_this_example.sh
@@ -40,13 +40,6 @@ rm -fr DATA/*
cd $currentdir
cp -fr DATA/* ../../../DATA/.
-cd ../../../
-
-make clean
-./configure
-make all > $currentdir/tmp.log
-cd $currentdir
-
# links executables
cd bin/
rm -f *
diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_6sides/run_this_example.sh b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_6sides/run_this_example.sh
index 4553d44..65713d1 100755
--- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_6sides/run_this_example.sh
+++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_6sides/run_this_example.sh
@@ -40,13 +40,6 @@ rm -fr DATA/*
cd $currentdir
cp -fr DATA/* ../../../DATA/.
-cd ../../../
-
-make clean
-./configure
-make all > $currentdir/tmp.log
-cd $currentdir
-
# links executables
cd bin/
rm -f *
diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_5sides/run_this_example.sh b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_5sides/run_this_example.sh
index 4553d44..65713d1 100755
--- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_5sides/run_this_example.sh
+++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_5sides/run_this_example.sh
@@ -40,13 +40,6 @@ rm -fr DATA/*
cd $currentdir
cp -fr DATA/* ../../../DATA/.
-cd ../../../
-
-make clean
-./configure
-make all > $currentdir/tmp.log
-cd $currentdir
-
# links executables
cd bin/
rm -f *
diff --git a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_6sides/run_this_example.sh b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_6sides/run_this_example.sh
index 4553d44..65713d1 100755
--- a/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_6sides/run_this_example.sh
+++ b/EXAMPLES/CPML_examples/homogeneous_halfspace_HEX8_elastic_absorbing_CPML_6sides/run_this_example.sh
@@ -40,13 +40,6 @@ rm -fr DATA/*
cd $currentdir
cp -fr DATA/* ../../../DATA/.
-cd ../../../
-
-make clean
-./configure
-make all > $currentdir/tmp.log
-cd $currentdir
-
# links executables
cd bin/
rm -f *
diff --git a/EXAMPLES/Mount_StHelens/run_this_example.sh b/EXAMPLES/Mount_StHelens/run_this_example.sh
index a11ac3c..d1bf5b3 100755
--- a/EXAMPLES/Mount_StHelens/run_this_example.sh
+++ b/EXAMPLES/Mount_StHelens/run_this_example.sh
@@ -32,10 +32,6 @@ mkdir -p OUTPUT_FILES/DATABASES_MPI
rm -f OUTPUT_FILES/*
rm -rf OUTPUT_FILES/DATABASES_MPI/*
-# compiles executables in root directory
-cd ../../
-make clean
-make > $currentdir/tmp.log
cd $currentdir
# links executables
diff --git a/EXAMPLES/homogeneous_halfspace_HEX8_elastic_absorbing_Stacey_5sides/run_this_example.sh b/EXAMPLES/homogeneous_halfspace_HEX8_elastic_absorbing_Stacey_5sides/run_this_example.sh
index 2d70e95..83ddc4d 100755
--- a/EXAMPLES/homogeneous_halfspace_HEX8_elastic_absorbing_Stacey_5sides/run_this_example.sh
+++ b/EXAMPLES/homogeneous_halfspace_HEX8_elastic_absorbing_Stacey_5sides/run_this_example.sh
@@ -18,22 +18,12 @@ mkdir -p bin
mkdir -p OUTPUT_FILES
mkdir -p OUTPUT_FILES/DATABASES_MPI
-# compiles executables in root directory
cd ../../
rm -fr DATA/*
cd $currentdir
cp -fr DATA/* ../../DATA/.
-cd ../../
-
-# note: ./configure will default to gfortran configuration, unless you uncomment the line below
-# ./configure FC=ifort CC=icc MPIFC=mpif90
-./configure
-make clean
-make all > $currentdir/tmp.log
-cd $currentdir
-
# links executables
cd bin/
rm -f *
diff --git a/EXAMPLES/homogeneous_halfspace_HEX8_elastic_no_absorbing/run_this_example.sh b/EXAMPLES/homogeneous_halfspace_HEX8_elastic_no_absorbing/run_this_example.sh
index f89c65b..8fa1dc8 100755
--- a/EXAMPLES/homogeneous_halfspace_HEX8_elastic_no_absorbing/run_this_example.sh
+++ b/EXAMPLES/homogeneous_halfspace_HEX8_elastic_no_absorbing/run_this_example.sh
@@ -40,13 +40,6 @@ rm -fr DATA/*
cd $currentdir
cp -fr DATA/* ../../DATA/.
-cd ../../
-
-./configure
-make clean
-make all > $currentdir/tmp.log
-cd $currentdir
-
# links executables
cd bin/
rm -f *
diff --git a/EXAMPLES/layered_halfspace/run_this_example.sh b/EXAMPLES/layered_halfspace/run_this_example.sh
index d2c42c2..0a67aee 100755
--- a/EXAMPLES/layered_halfspace/run_this_example.sh
+++ b/EXAMPLES/layered_halfspace/run_this_example.sh
@@ -33,10 +33,6 @@ mkdir -p OUTPUT_FILES/DATABASES_MPI
rm -f OUTPUT_FILES/*
rm -rf OUTPUT_FILES/DATABASES_MPI/*
-# compiles executables in root directory
-cd ../../
-make clean
-make > $currentdir/compile.log
cd $currentdir
# links executables
diff --git a/EXAMPLES/meshfem3D_examples/many_interfaces/run_this_example.sh b/EXAMPLES/meshfem3D_examples/many_interfaces/run_this_example.sh
index cdec9a5..8e035ef 100755
--- a/EXAMPLES/meshfem3D_examples/many_interfaces/run_this_example.sh
+++ b/EXAMPLES/meshfem3D_examples/many_interfaces/run_this_example.sh
@@ -29,10 +29,6 @@ mkdir -p OUTPUT_FILES/DATABASES_MPI
rm -f OUTPUT_FILES/*
rm -rf OUTPUT_FILES/DATABASES_MPI/*
-# compiles executables in root directory
-cd ../../../
-make clean
-make > $currentdir/tmp.log
cd $currentdir
# links executables
diff --git a/EXAMPLES/meshfem3D_examples/sep_bathymetry/run_this_example.sh b/EXAMPLES/meshfem3D_examples/sep_bathymetry/run_this_example.sh
index eb21d44..c6dbfc6 100755
--- a/EXAMPLES/meshfem3D_examples/sep_bathymetry/run_this_example.sh
+++ b/EXAMPLES/meshfem3D_examples/sep_bathymetry/run_this_example.sh
@@ -29,10 +29,6 @@ mkdir -p OUTPUT_FILES/DATABASES_MPI
rm -f OUTPUT_FILES/*
rm -rf OUTPUT_FILES/DATABASES_MPI/*
-# compiles executables in root directory
-cd ../../../
-make clean
-make -j 4 #> $currentdir/tmp.log
cd $currentdir
# links executables
diff --git a/EXAMPLES/meshfem3D_examples/simple_model/run_this_example.sh b/EXAMPLES/meshfem3D_examples/simple_model/run_this_example.sh
index b336bce..21a35f3 100755
--- a/EXAMPLES/meshfem3D_examples/simple_model/run_this_example.sh
+++ b/EXAMPLES/meshfem3D_examples/simple_model/run_this_example.sh
@@ -29,10 +29,6 @@ mkdir -p OUTPUT_FILES/DATABASES_MPI
rm -f OUTPUT_FILES/*
rm -rf OUTPUT_FILES/DATABASES_MPI/*
-# compiles executables in root directory
-cd ../../../
-make clean
-make > $currentdir/tmp.log
cd $currentdir
# links executables
diff --git a/EXAMPLES/meshfem3D_examples/socal1D/run_this_example.sh b/EXAMPLES/meshfem3D_examples/socal1D/run_this_example.sh
index 777dd7b..d4cf7b2 100755
--- a/EXAMPLES/meshfem3D_examples/socal1D/run_this_example.sh
+++ b/EXAMPLES/meshfem3D_examples/socal1D/run_this_example.sh
@@ -29,11 +29,6 @@ mkdir -p OUTPUT_FILES/DATABASES_MPI
rm -f OUTPUT_FILES/*
rm -rf OUTPUT_FILES/DATABASES_MPI/*
-# compiles executables in root directory
-cd ../../../
-make clean
-make > $currentdir/tmp.log
-#make combine_vol_data
cd $currentdir
# links executables
@@ -76,7 +71,7 @@ echo
echo "done"
echo `date`
-# To make a full mesh using combine_vol_data:
+# To create a full mesh using combine_vol_data:
# cd bin
# xcombine_vol_data 0 0 vs ../OUTPUT_FILES/DATABASES_MPI/ ../OUTPUT_FILES/DATABASES_MPI/ 1
# cd ../OUTPUT_FILES/DATABASES_MPI/
diff --git a/EXAMPLES/tomographic_model/run_this_example.sh b/EXAMPLES/tomographic_model/run_this_example.sh
index 1150af8..7c6903b 100755
--- a/EXAMPLES/tomographic_model/run_this_example.sh
+++ b/EXAMPLES/tomographic_model/run_this_example.sh
@@ -37,10 +37,6 @@ rm -rf OUTPUT_FILES/DATABASES_MPI/*
mv tomography_model.xyz DATA/
echo
-# compiles executables in root directory
-cd ../../
-make clean
-make > $currentdir/tmp.log
cd $currentdir
# links executables
diff --git a/EXAMPLES/waterlayered_halfspace/run_this_example.sh b/EXAMPLES/waterlayered_halfspace/run_this_example.sh
index bd267ad..caf82d1 100755
--- a/EXAMPLES/waterlayered_halfspace/run_this_example.sh
+++ b/EXAMPLES/waterlayered_halfspace/run_this_example.sh
@@ -32,10 +32,6 @@ mkdir -p OUTPUT_FILES/DATABASES_MPI
rm -f OUTPUT_FILES/*
rm -rf OUTPUT_FILES/DATABASES_MPI/*
-# compiles executables in root directory
-cd ../../
-make clean
-make > $currentdir/tmp.log
cd $currentdir
# links executables
diff --git a/run_this_example.sh b/run_this_example.sh
index 9efb2d3..7dd818e 100755
--- a/run_this_example.sh
+++ b/run_this_example.sh
@@ -18,12 +18,6 @@ mkdir -p bin
mkdir -p OUTPUT_FILES
mkdir -p OUTPUT_FILES/DATABASES_MPI
-# note: ./configure will default to gfortran configuration, unless you uncomment the line below
-# ./configure FC=ifort CC=icc MPIFC=mpif90
-./configure
-make clean
-make all
-
# stores setup
cp DATA/Par_file OUTPUT_FILES/
cp DATA/CMTSOLUTION OUTPUT_FILES/
More information about the CIG-COMMITS
mailing list