[cig-commits] [commit] devel, master: renamed decompose_mesh_SCOTCH to decompose_mesh because METIS is now supported as well, in addition to SCOTCH (and ZOLTAN may also be added in the future). (85bead6)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Jun 18 16:50:29 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branches: devel,master
Link : https://github.com/geodynamics/specfem3d/compare/6026e367984905ab133865f62fa6293b343759b9...47f703851338234f96397e7da9fbff63d8178b8a
>---------------------------------------------------------------
commit 85bead6421b1abe035b40055d2d5b11567ed4d97
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Sat Oct 27 14:19:31 2012 +0000
renamed decompose_mesh_SCOTCH to decompose_mesh because METIS is now supported as well, in addition to SCOTCH (and ZOLTAN may also be added in the future).
>---------------------------------------------------------------
85bead6421b1abe035b40055d2d5b11567ed4d97
Mount_StHelens/process.sh | 4 ++--
homogeneous_halfspace_HEX27/README | 2 +-
.../DATABASES-default/xdecompose_mesh_SCOTCH.log | 2 +-
homogeneous_halfspace_HEX8/HOWTO_run_this_example.txt | 2 +-
homogeneous_halfspace_HEX8/README | 6 +++---
homogeneous_halfspace_HEX8/process.sh | 4 ++--
homogeneous_poroelastic/README | 2 +-
layered_halfspace/process.sh | 4 ++--
noise_tomography/README | 2 +-
tomographic_model/process.sh | 4 ++--
waterlayered_halfspace/process.sh | 4 ++--
11 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Mount_StHelens/process.sh b/Mount_StHelens/process.sh
index c4e6dc1..99bf242 100755
--- a/Mount_StHelens/process.sh
+++ b/Mount_StHelens/process.sh
@@ -41,7 +41,7 @@ cd $currentdir
# links executables
cd bin/
rm -f ./x*
-cp ../../../bin/xdecompose_mesh_SCOTCH ./
+cp ../../../bin/xdecompose_mesh ./
cp ../../../bin/xgenerate_databases ./
cp ../../../bin/xspecfem3D ./
cd ../
@@ -50,7 +50,7 @@ cd ../
echo
echo " decomposing mesh..."
echo
-./bin/xdecompose_mesh_SCOTCH $NPROC MESH/ OUTPUT_FILES/DATABASES_MPI/
+./bin/xdecompose_mesh $NPROC MESH/ OUTPUT_FILES/DATABASES_MPI/
# stores setup
cp DATA/Par_file OUTPUT_FILES/
diff --git a/homogeneous_halfspace_HEX27/README b/homogeneous_halfspace_HEX27/README
index 6ce1290..6a777e3 100644
--- a/homogeneous_halfspace_HEX27/README
+++ b/homogeneous_halfspace_HEX27/README
@@ -3,7 +3,7 @@ To run this example on two processor cores for instance, type this (replace "2"
cd bin/
-./xdecompose_mesh_SCOTCH 2 ../DATA/MESH ../OUTPUT_FILES/DATABASES_MPI
+./xdecompose_mesh 2 ../DATA/MESH ../OUTPUT_FILES/DATABASES_MPI
mpirun -np 2 ./xgenerate_databases
diff --git a/homogeneous_halfspace_HEX8/DATABASES-default/xdecompose_mesh_SCOTCH.log b/homogeneous_halfspace_HEX8/DATABASES-default/xdecompose_mesh_SCOTCH.log
index 4bd1d41..3e7f9c0 100644
--- a/homogeneous_halfspace_HEX8/DATABASES-default/xdecompose_mesh_SCOTCH.log
+++ b/homogeneous_halfspace_HEX8/DATABASES-default/xdecompose_mesh_SCOTCH.log
@@ -1,4 +1,4 @@
-[homogeneous_halfspace]$ ./bin/xdecompose_mesh_SCOTCH 4 MESH-default/ DATABASES-default/
+[homogeneous_halfspace]$ ./bin/xdecompose_mesh 4 MESH-default/ DATABASES-default/
total number of nodes:
nnodes = 23273
diff --git a/homogeneous_halfspace_HEX8/HOWTO_run_this_example.txt b/homogeneous_halfspace_HEX8/HOWTO_run_this_example.txt
index 35b9b2a..4b378c8 100644
--- a/homogeneous_halfspace_HEX8/HOWTO_run_this_example.txt
+++ b/homogeneous_halfspace_HEX8/HOWTO_run_this_example.txt
@@ -2,7 +2,7 @@
To run this example on two processor cores for instance, type this (replace "2" with another value in the three lines below if you want to use more processor cores):
-./bin/xdecompose_mesh_SCOTCH 2 DATA/MESH OUTPUT_FILES/DATABASES_MPI
+./bin/xdecompose_mesh 2 DATA/MESH OUTPUT_FILES/DATABASES_MPI
mpirun -np 2 ./bin/xgenerate_databases
diff --git a/homogeneous_halfspace_HEX8/README b/homogeneous_halfspace_HEX8/README
index 5009c07..17d14d5 100644
--- a/homogeneous_halfspace_HEX8/README
+++ b/homogeneous_halfspace_HEX8/README
@@ -74,7 +74,7 @@ step-by-step tutorial:
4. decompose mesh files:
- compile decomposer in directory SPECFEM3D/:
- > make xdecompose_mesh_SCOTCH
+ > make xdecompose_mesh
- run decomposer:
> qsub go_decomposer_pbs.bash
@@ -85,11 +85,11 @@ step-by-step tutorial:
this creates mesh partitions "proc000***_Database" in directory OUTPUT_FILES/DATABASES_MPI/.
the output file OUTPUT_FILES/*.o contains information on the partitioning
- note 1: the program xdecompose_mesh_SCOTCH is a serial program (runs on 1 core)
+ note 1: the program xdecompose_mesh is a serial program (runs on 1 core)
note 2: for small jobs (like this one), you can simply launch the job on
the local node from directory SPECFEM3D:
- > ./bin/xdecompose_mesh_SCOTCH 4 examples/homogeneous_halfspace/MESH/ OUTPUT_FILES/DATABASES_MPI/
+ > ./bin/xdecompose_mesh 4 examples/homogeneous_halfspace/MESH/ OUTPUT_FILES/DATABASES_MPI/
5. generate databases:
diff --git a/homogeneous_halfspace_HEX8/process.sh b/homogeneous_halfspace_HEX8/process.sh
index 3fdffeb..58e1c21 100755
--- a/homogeneous_halfspace_HEX8/process.sh
+++ b/homogeneous_halfspace_HEX8/process.sh
@@ -41,7 +41,7 @@ cd $currentdir
# links executables
cd bin/
rm -f ./x*
-cp ../../../bin/xdecompose_mesh_SCOTCH ./
+cp ../../../bin/xdecompose_mesh ./
cp ../../../bin/xgenerate_databases ./
cp ../../../bin/xspecfem3D ./
cd ../
@@ -50,7 +50,7 @@ cd ../
echo
echo " decomposing mesh..."
echo
-./bin/xdecompose_mesh_SCOTCH $NPROC MESH/ OUTPUT_FILES/DATABASES_MPI/
+./bin/xdecompose_mesh $NPROC MESH/ OUTPUT_FILES/DATABASES_MPI/
# stores setup
cp DATA/Par_file OUTPUT_FILES/
diff --git a/homogeneous_poroelastic/README b/homogeneous_poroelastic/README
index 3f0dd26..46914e2 100644
--- a/homogeneous_poroelastic/README
+++ b/homogeneous_poroelastic/README
@@ -59,7 +59,7 @@ step-by-step tutorial:
- run decomposer in directory
(example assumes 16 partitions with mesh files in ../examples/homogeneous_poro/MESH/)
- > ./bin/xdecompose_mesh_SCOTCH 16 ../examples/homogeneous_poro/MESH/ ../OUTPUT_FILES/DATABASES_MPI/
+ > ./bin/xdecompose_mesh 16 ../examples/homogeneous_poro/MESH/ ../OUTPUT_FILES/DATABASES_MPI/
this creates mesh partitions "proc000***_Database" in directory OUTPUT_FILES/DATABASES_MPI/.
(you can then specify "../OUTPUT_FILES/DATABASES_MPI" in "Par_file" for your "LOCAL_PATH")
diff --git a/layered_halfspace/process.sh b/layered_halfspace/process.sh
index 8e9f566..18577bb 100755
--- a/layered_halfspace/process.sh
+++ b/layered_halfspace/process.sh
@@ -42,7 +42,7 @@ cd $currentdir
# links executables
cd bin/
rm -f ./x*
-cp ../../../bin/xdecompose_mesh_SCOTCH ./
+cp ../../../bin/xdecompose_mesh ./
cp ../../../bin/xgenerate_databases ./
cp ../../../bin/xspecfem3D ./
cd ../
@@ -56,7 +56,7 @@ cp DATA/STATIONS OUTPUT_FILES/
echo
echo " decomposing mesh..."
echo
-./bin/xdecompose_mesh_SCOTCH $NPROC MESH/ OUTPUT_FILES/DATABASES_MPI/
+./bin/xdecompose_mesh $NPROC MESH/ OUTPUT_FILES/DATABASES_MPI/
# runs database generation
echo
diff --git a/noise_tomography/README b/noise_tomography/README
index daccd2a..9b5e204 100644
--- a/noise_tomography/README
+++ b/noise_tomography/README
@@ -51,7 +51,7 @@ Noise Cross-Correlation Sensitivity Kernels (Tromp et al., 2010, GJI)
"./DATABASES_MPI" contains the four partitions for the model which you can also create by
copying the MESH files from example '../examples/homogeneous_halfspace' and
- run 'xdecompose_mesh_SCOTCH' as explained in the file README in '../examples/homogeneous_halfspace'
+ run 'xdecompose_mesh' as explained in the file README in '../examples/homogeneous_halfspace'
Refer to '../examples/homogeneous_halfspace', if you don't know how to get them from CUBIT and SCOTCH.
diff --git a/tomographic_model/process.sh b/tomographic_model/process.sh
index 231b563..9eafcea 100755
--- a/tomographic_model/process.sh
+++ b/tomographic_model/process.sh
@@ -46,7 +46,7 @@ cd $currentdir
# links executables
cd bin/
rm -f ./x*
-cp ../../../bin/xdecompose_mesh_SCOTCH ./
+cp ../../../bin/xdecompose_mesh ./
cp ../../../bin/xgenerate_databases ./
cp ../../../bin/xspecfem3D ./
cd ../
@@ -60,7 +60,7 @@ cp DATA/STATIONS OUTPUT_FILES/
echo
echo " decomposing mesh..."
echo
-./bin/xdecompose_mesh_SCOTCH $NPROC MESH/ OUTPUT_FILES/DATABASES_MPI/
+./bin/xdecompose_mesh $NPROC MESH/ OUTPUT_FILES/DATABASES_MPI/
# runs database generation
echo
diff --git a/waterlayered_halfspace/process.sh b/waterlayered_halfspace/process.sh
index a590a2a..518c566 100755
--- a/waterlayered_halfspace/process.sh
+++ b/waterlayered_halfspace/process.sh
@@ -41,7 +41,7 @@ cd $currentdir
# links executables
cd bin/
rm -f ./x*
-cp ../../../bin/xdecompose_mesh_SCOTCH ./
+cp ../../../bin/xdecompose_mesh ./
cp ../../../bin/xgenerate_databases ./
cp ../../../bin/xspecfem3D ./
cd ../
@@ -55,7 +55,7 @@ cp DATA/STATIONS OUTPUT_FILES/
echo
echo " decomposing mesh..."
echo
-./bin/xdecompose_mesh_SCOTCH $NPROC MESH/ OUTPUT_FILES/DATABASES_MPI/
+./bin/xdecompose_mesh $NPROC MESH/ OUTPUT_FILES/DATABASES_MPI/
# runs database generation
echo
More information about the CIG-COMMITS
mailing list