[cig-commits] [commit] devel, master: cleanup in 'meshfem3D_examples' directories (abeb258)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Jun 18 16:50:18 PDT 2014 

Repository : https://github.com/geodynamics/specfem3d

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d/compare/6026e367984905ab133865f62fa6293b343759b9...47f703851338234f96397e7da9fbff63d8178b8a

>---------------------------------------------------------------

commit abeb2586cefabb0534c80c6bf69c042c823f525a
Author: Joseph Charles <jcharles at lma.cnrs-mrs.fr>
Date:   Thu Oct 25 00:50:59 2012 +0000

    cleanup in 'meshfem3D_examples' directories


>---------------------------------------------------------------

abeb2586cefabb0534c80c6bf69c042c823f525a
 .../many_interfaces/{ => DATA}/CMTSOLUTION         |  0
 .../many_interfaces/{ => DATA}/FORCESOLUTION       |  0
 .../many_interfaces/{ => DATA}/Par_file            |  0
 .../many_interfaces/{ => DATA}/STATIONS            |  0
 .../{ => DATA/meshfem3D_files}/Mesh_Par_file       |  0
 .../meshfem3D_files}/example_interface1.dat        |  0
 .../meshfem3D_files}/example_interface2.dat        |  0
 .../meshfem3D_files}/example_interface3.dat        |  0
 .../meshfem3D_files}/example_interface4.dat        |  0
 .../meshfem3D_files}/example_interface5.dat        |  0
 .../meshfem3D_files}/example_interface6.dat        |  0
 .../meshfem3D_files}/example_interfaces.dat        |  0
 .../{ => DATA/meshfem3D_files}/example_topo.dat    |  0
 meshfem3D_examples/many_interfaces/README          |  6 +----
 .../many_interfaces/go_process_pbs.bash            | 15 ++---------
 meshfem3D_examples/many_interfaces/process.sh      | 30 ++++++++--------------
 meshfem3D_examples/simple_model/process.sh         |  8 +++---
 meshfem3D_examples/socal1D/process.sh              | 11 +++-----
 18 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/meshfem3D_examples/many_interfaces/CMTSOLUTION b/meshfem3D_examples/many_interfaces/DATA/CMTSOLUTION
similarity index 100%
rename from meshfem3D_examples/many_interfaces/CMTSOLUTION
rename to meshfem3D_examples/many_interfaces/DATA/CMTSOLUTION
diff --git a/meshfem3D_examples/many_interfaces/FORCESOLUTION b/meshfem3D_examples/many_interfaces/DATA/FORCESOLUTION
similarity index 100%
rename from meshfem3D_examples/many_interfaces/FORCESOLUTION
rename to meshfem3D_examples/many_interfaces/DATA/FORCESOLUTION
diff --git a/meshfem3D_examples/many_interfaces/Par_file b/meshfem3D_examples/many_interfaces/DATA/Par_file
similarity index 100%
rename from meshfem3D_examples/many_interfaces/Par_file
rename to meshfem3D_examples/many_interfaces/DATA/Par_file
diff --git a/meshfem3D_examples/many_interfaces/STATIONS b/meshfem3D_examples/many_interfaces/DATA/STATIONS
similarity index 100%
rename from meshfem3D_examples/many_interfaces/STATIONS
rename to meshfem3D_examples/many_interfaces/DATA/STATIONS
diff --git a/meshfem3D_examples/many_interfaces/Mesh_Par_file b/meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/Mesh_Par_file
similarity index 100%
rename from meshfem3D_examples/many_interfaces/Mesh_Par_file
rename to meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/Mesh_Par_file
diff --git a/meshfem3D_examples/many_interfaces/example_interface1.dat b/meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface1.dat
similarity index 100%
rename from meshfem3D_examples/many_interfaces/example_interface1.dat
rename to meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface1.dat
diff --git a/meshfem3D_examples/many_interfaces/example_interface2.dat b/meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface2.dat
similarity index 100%
rename from meshfem3D_examples/many_interfaces/example_interface2.dat
rename to meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface2.dat
diff --git a/meshfem3D_examples/many_interfaces/example_interface3.dat b/meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface3.dat
similarity index 100%
rename from meshfem3D_examples/many_interfaces/example_interface3.dat
rename to meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface3.dat
diff --git a/meshfem3D_examples/many_interfaces/example_interface4.dat b/meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface4.dat
similarity index 100%
rename from meshfem3D_examples/many_interfaces/example_interface4.dat
rename to meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface4.dat
diff --git a/meshfem3D_examples/many_interfaces/example_interface5.dat b/meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface5.dat
similarity index 100%
rename from meshfem3D_examples/many_interfaces/example_interface5.dat
rename to meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface5.dat
diff --git a/meshfem3D_examples/many_interfaces/example_interface6.dat b/meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface6.dat
similarity index 100%
rename from meshfem3D_examples/many_interfaces/example_interface6.dat
rename to meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interface6.dat
diff --git a/meshfem3D_examples/many_interfaces/example_interfaces.dat b/meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interfaces.dat
similarity index 100%
rename from meshfem3D_examples/many_interfaces/example_interfaces.dat
rename to meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_interfaces.dat
diff --git a/meshfem3D_examples/many_interfaces/example_topo.dat b/meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_topo.dat
similarity index 100%
rename from meshfem3D_examples/many_interfaces/example_topo.dat
rename to meshfem3D_examples/many_interfaces/DATA/meshfem3D_files/example_topo.dat
diff --git a/meshfem3D_examples/many_interfaces/README b/meshfem3D_examples/many_interfaces/README
index f709fb5..72dfc63 100644
--- a/meshfem3D_examples/many_interfaces/README
+++ b/meshfem3D_examples/many_interfaces/README
@@ -19,11 +19,7 @@ WARNING: We do not recommend running this as a test example, due to its requirem
 1. Set up input files.
 
    > cd SPECFEM3D
-   > rsync -av examples/meshfem3D_examples/many_interfaces/ DATA/meshfem3D_files/
-
-   > cd DATA/meshfem3D_files/
-   > cp Par_file CMTSOLUTION STATIONS ..
-   > cd SPECFEM3D
+   > rsync -av examples/meshfem3D_examples/many_interfaces/DATA DATA
 
    - adapt the submission scripts for the appropriate queues and number of cores:
      go_mesher_pbs.bash, go_generate_databases_pbs.bash, go_solver_pbs.bash
diff --git a/meshfem3D_examples/many_interfaces/go_process_pbs.bash b/meshfem3D_examples/many_interfaces/go_process_pbs.bash
index 52f3119..0a0c23c 100755
--- a/meshfem3D_examples/many_interfaces/go_process_pbs.bash
+++ b/meshfem3D_examples/many_interfaces/go_process_pbs.bash
@@ -34,24 +34,12 @@ echo
 echo "   setting up example..."
 echo
 
-# setup
 mkdir -p bin
-mkdir -p OUTPUT_FILES
 mkdir -p OUTPUT_FILES/DATABASES_MPI
 
-rm -rf OUTPUT_FILES/*
+rm -f OUTPUT_FILES/*
 rm -rf OUTPUT_FILES/DATABASES_MPI/*
 
-mkdir -p DATA
-mkdir -p DATA/meshfem3D_files/
-
-cp Mesh_Par_file DATA/meshfem3D_files/
-cp example_*.dat DATA/meshfem3D_files/
-
-cp Par_file DATA/
-cp CMTSOLUTION DATA/
-cp STATIONS DATA/
-
 # compilation of executables must have been done prior on front node
 # links executables
 cd bin/
@@ -80,6 +68,7 @@ mv OUTPUT_FILES/output_mesher.txt OUTPUT_FILES/output_meshfem3D.txt
 # stores setup
 cp DATA/Par_file OUTPUT_FILES/
 cp DATA/CMTSOLUTION OUTPUT_FILES/
+cp DATA/FORCESOLUTION OUTPUT_FILES/
 cp DATA/STATIONS OUTPUT_FILES/
 
 # runs database generation
diff --git a/meshfem3D_examples/many_interfaces/process.sh b/meshfem3D_examples/many_interfaces/process.sh
index 6dbf587..58c7b4f 100755
--- a/meshfem3D_examples/many_interfaces/process.sh
+++ b/meshfem3D_examples/many_interfaces/process.sh
@@ -24,26 +24,15 @@ echo "   setting up example..."
 echo
 
 mkdir -p bin
-mkdir -p OUTPUT_FILES
 mkdir -p OUTPUT_FILES/DATABASES_MPI
 
-rm -rf OUTPUT_FILES/*
+rm -f OUTPUT_FILES/*
 rm -rf OUTPUT_FILES/DATABASES_MPI/*
 
-mkdir -p DATA
-mkdir -p DATA/meshfem3D_files/
-
-cp Mesh_Par_file DATA/meshfem3D_files/
-cp example_*.dat DATA/meshfem3D_files/
-
-cp Par_file DATA/
-cp CMTSOLUTION DATA/
-cp STATIONS DATA/
-
-
 # compiles executables in root directory
 cd ../../../
-make > tmp.log
+make clean
+make > $currentdir/tmp.log
 cd $currentdir
 
 # links executables
@@ -53,20 +42,21 @@ ln -s ../../../../bin/xgenerate_databases
 ln -s ../../../../bin/xspecfem3D
 cd ../
 
+# stores setup
+cp DATA/meshfem3D_files/Mesh_Par_file OUTPUT_FILES/
+cp DATA/Par_file OUTPUT_FILES/
+cp DATA/CMTSOLUTION OUTPUT_FILES/
+cp DATA/STATIONS OUTPUT_FILES/
+
 # decomposes mesh
 echo
-echo "  meshing..."
+echo "running mesher..."
 echo
 cd bin/
 mpirun -np $NPROC ./xmeshfem3D
 cd ../
 mv OUTPUT_FILES/output_mesher.txt OUTPUT_FILES/output_meshfem3D.txt
 
-# stores setup
-cp DATA/Par_file OUTPUT_FILES/
-cp DATA/CMTSOLUTION OUTPUT_FILES/
-cp DATA/STATIONS OUTPUT_FILES/
-
 # runs database generation
 echo
 echo "  running database generation..."
diff --git a/meshfem3D_examples/simple_model/process.sh b/meshfem3D_examples/simple_model/process.sh
index 9f09831..d08aac1 100755
--- a/meshfem3D_examples/simple_model/process.sh
+++ b/meshfem3D_examples/simple_model/process.sh
@@ -24,12 +24,10 @@ echo "   setting up example..."
 echo
 
 mkdir -p bin
-mkdir -p OUTPUT_FILES/
-mkdir -p DATABASES_MPI
+mkdir -p OUTPUT_FILES/DATABASES_MPI
 
 rm -f OUTPUT_FILES/*
-rm -rf DATABASES_MPI/*
-
+rm -rf OUTPUT_FILES/DATABASES_MPI/*
 
 # compiles executables in root directory
 cd ../../../
@@ -43,9 +41,9 @@ cp ../../../bin/* bin/
 if [ ! -e bin/xspecfem3D ]; then echo "compilation failed, please check..."; exit 1; fi
 
 # stores setup
+cp DATA/meshfem3D_files/Mesh_Par_file OUTPUT_FILES/
 cp DATA/Par_file OUTPUT_FILES/
 cp DATA/CMTSOLUTION OUTPUT_FILES/
-cp DATA/FORCESOLUTION OUTPUT_FILES/
 cp DATA/STATIONS OUTPUT_FILES/
 
 # creates and decomposes mesh
diff --git a/meshfem3D_examples/socal1D/process.sh b/meshfem3D_examples/socal1D/process.sh
index bfea41f..51abe0d 100755
--- a/meshfem3D_examples/socal1D/process.sh
+++ b/meshfem3D_examples/socal1D/process.sh
@@ -24,19 +24,16 @@ echo "   setting up example..."
 echo
 
 mkdir -p bin
-mkdir -p OUTPUT_FILES
 mkdir -p OUTPUT_FILES/DATABASES_MPI
 
-rm -rf OUTPUT_FILES/*
+rm -f OUTPUT_FILES/*
 rm -rf OUTPUT_FILES/DATABASES_MPI/*
 
-mkdir -p DATA
-mkdir -p DATA/meshfem3D_files/
-
 # compiles executables in root directory
 cd ../../../
+make clean
 make
-make combine_vol_data
+#make combine_vol_data
 cd $currentdir
 
 # links executables
@@ -52,7 +49,7 @@ cp DATA/STATIONS OUTPUT_FILES/
 
 # decomposes mesh
 echo
-echo "meshing..."
+echo "running mesher..."
 echo
 cd bin/
 mpirun -np $NPROC ./xmeshfem3D

More information about the CIG-COMMITS mailing list