[cig-commits] [commit] devel: Change for DSM (9d406f8)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Aug 1 10:07:08 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/8a3f14d7d473f70feb7f073639045daa35c587bc...d759e09dd946c593868753fbb4253d77378fb276
>---------------------------------------------------------------
commit 9d406f8d5b86bd3cb9d90228f340f3c9a7657d48
Author: Clément Durochat <c.durochat at gmail.com>
Date: Wed Jul 9 15:51:21 2014 +0200
Change for DSM
>---------------------------------------------------------------
9d406f8d5b86bd3cb9d90228f340f3c9a7657d48
.../DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk | 2 +-
.../Interf_SPECFEM3D_DSM/constants.h | 2 +-
.../UTILS/create_all_input_files_for_Hybrid.f90 | 2 +-
utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files.f90 | 2 +-
.../UTILS/create_inputs_files_for_benchmark.f90 | 2 +-
.../shells/bacchus_run_benchmark_all_process.sh | 4 ++--
.../shells/idris_ada_run_benchmark_all_process.sh | 4 ++--
utils/DSM_FOR_SPECFEM3D/shells/msub_compute_coef_process.sh | 4 ++--
.../shells/msub_run_benchmark_all_process.sh | 4 ++--
utils/DSM_FOR_SPECFEM3D/shells/msub_setup_process.sh | 4 ++--
utils/DSM_FOR_SPECFEM3D/shells/scrpits_before_specfem.sh | 4 ++--
utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh | 10 +++++-----
.../shells/shells_for_FWI/copy_vtk_files.sh | 4 ++--
.../shells/shells_for_FWI/functions_general.sh | 12 ++++++------
.../shells/shells_for_FWI/functions_optimisation.sh | 2 +-
.../shells/shells_for_FWI/functions_simu_mpi.sh | 10 +++++-----
16 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk
index 105ab4e..3e61038 100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/ParFileMeshChunk
@@ -1,5 +1,5 @@
../Tract/
../MESH/
- ../in_out_files/DATABASES_MPI/
+ ../OUTPUT_FILES/DATABASES_MPI/
../in_out_files/Tractions/
1
diff --git a/utils/DSM_FOR_SPECFEM3D/Part4_modify_DSM_results_for_SPECFEM/Interf_SPECFEM3D_DSM/constants.h b/utils/DSM_FOR_SPECFEM3D/Part4_modify_DSM_results_for_SPECFEM/Interf_SPECFEM3D_DSM/constants.h
index 0e7559b..1f0d8fd 100755
--- a/utils/DSM_FOR_SPECFEM3D/Part4_modify_DSM_results_for_SPECFEM/Interf_SPECFEM3D_DSM/constants.h
+++ b/utils/DSM_FOR_SPECFEM3D/Part4_modify_DSM_results_for_SPECFEM/Interf_SPECFEM3D_DSM/constants.h
@@ -159,7 +159,7 @@
! the scratch disk to save the state variables saved in the forward
! simulation, this can be a global scratch disk in case you run out of
! space on the local scratch disk, e.g. '/ibrixfs1/scratch/lqy/DATABASES_MPI_Q/'
- character(len=256), parameter :: LOCAL_PATH_Q = '../in_out_files/DATABASES_MPI'
+ character(len=256), parameter :: LOCAL_PATH_Q = '../OUTPUT_FILES/DATABASES_MPI'
!------------------------------------------------------
! nlegoff -- Variables that should be read/computed elsewhere.
diff --git a/utils/DSM_FOR_SPECFEM3D/UTILS/create_all_input_files_for_Hybrid.f90 b/utils/DSM_FOR_SPECFEM3D/UTILS/create_all_input_files_for_Hybrid.f90
index df5640b..966adf7 100755
--- a/utils/DSM_FOR_SPECFEM3D/UTILS/create_all_input_files_for_Hybrid.f90
+++ b/utils/DSM_FOR_SPECFEM3D/UTILS/create_all_input_files_for_Hybrid.f90
@@ -50,7 +50,7 @@ program create_input_files
open(10,file='ParFileInterface')
write(10,*) '../Tract/'
write(10,*) '../MESH/'
- write(10,*) '../in_out_files/DATABASES_MPI/'
+ write(10,*) '../OUTPUT_FILES/DATABASES_MPI/'
write(10,*) '../in_out_files/Tractions/'
write(10,*) '1'
close(10)
diff --git a/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files.f90 b/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files.f90
index cdb23a2..eb9c89f 100755
--- a/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files.f90
+++ b/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files.f90
@@ -32,7 +32,7 @@ program create_input_files
open(10,file='ParFileInterface')
write(10,*) '../Tract/'
write(10,*) '../MESH/'
- write(10,*) '../in_out_files/DATABASES_MPI/'
+ write(10,*) '../OUTPUT_FILES/DATABASES_MPI/'
write(10,*) '../in_out_files/Tractions/'
write(10,*) '1'
close(10)
diff --git a/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files_for_benchmark.f90 b/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files_for_benchmark.f90
index d5b61b2..b163619 100755
--- a/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files_for_benchmark.f90
+++ b/utils/DSM_FOR_SPECFEM3D/UTILS/create_inputs_files_for_benchmark.f90
@@ -29,7 +29,7 @@ program create_input_files_for_benchmark
open(10,file='ParFileInterface')
write(10,*) '../Tract/'
write(10,*) '../MESH/'
- write(10,*) '../in_out_files/DATABASES_MPI/'
+ write(10,*) '../OUTPUT_FILES/DATABASES_MPI/'
write(10,*) '../in_out_files/Tractions/'
close(10)
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/bacchus_run_benchmark_all_process.sh b/utils/DSM_FOR_SPECFEM3D/shells/bacchus_run_benchmark_all_process.sh
index 8ea87d0..cb426a1 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/bacchus_run_benchmark_all_process.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/bacchus_run_benchmark_all_process.sh
@@ -23,7 +23,7 @@
# 2/ input file : parfile_for_benchmark
#
#
-# 3/ SPECFEM3D input directory : ./in_data_file
+# 3/ SPECFEM3D input directory : ./DATA
# containts
# -- Par_file
# -- STATIONS
@@ -74,7 +74,7 @@ flog_file=$(pwd)/log.benchmark
PREFIX_MOVIE=velocity_Z_it
# directory where SPECFEM3D writes outputs
-IN_MOVIE=$(pwd)/in_out_files/DATABASES_MPI/
+IN_MOVIE=$(pwd)/OUTPUT_FILES/DATABASES_MPI/
# output movie directory
OUT_MOVIE=$(pwd)/movie
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/idris_ada_run_benchmark_all_process.sh b/utils/DSM_FOR_SPECFEM3D/shells/idris_ada_run_benchmark_all_process.sh
index ecd02fb..d7f1091 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/idris_ada_run_benchmark_all_process.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/idris_ada_run_benchmark_all_process.sh
@@ -69,7 +69,7 @@ tar -jxvf input_data.tar.bz2
# 2/ input file : parfile_for_benchmark
#
#
-# 3/ SPECFEM3D input directory : ./in_data_file
+# 3/ SPECFEM3D input directory : ./DATA
# containts
# -- Par_file
# -- STATIONS
@@ -119,7 +119,7 @@ flog_file=$(pwd)/log.benchmark
PREFIX_MOVIE=velocity_Z_it
# directory where SPECFEM3D writes outputs
-IN_MOVIE=$(pwd)/in_out_files/DATABASES_MPI/
+IN_MOVIE=$(pwd)/OUTPUT_FILES/DATABASES_MPI/
# output movie directory
OUT_MOVIE=$(pwd)/movie
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/msub_compute_coef_process.sh b/utils/DSM_FOR_SPECFEM3D/shells/msub_compute_coef_process.sh
index 8ec035f..69d2df5 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/msub_compute_coef_process.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/msub_compute_coef_process.sh
@@ -32,7 +32,7 @@ cd $BRIDGE_MSUB_PWD
# 2/ input file : parfile_for_benchmark
#
#
-# 3/ SPECFEM3D input directory : ./in_data_file
+# 3/ SPECFEM3D input directory : ./DATA
# containts
# -- Par_file
# -- STATIONS
@@ -82,7 +82,7 @@ flog_file=$(pwd)/log.compute_coef
PREFIX_MOVIE=velocity_Z_it
# directory where SPECFEM3D writes outputs
-IN_MOVIE=$(pwd)/in_out_files/DATABASES_MPI/
+IN_MOVIE=$(pwd)/OUTPUT_FILES/DATABASES_MPI/
# output movie directory
OUT_MOVIE=$(pwd)/movie
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/msub_run_benchmark_all_process.sh b/utils/DSM_FOR_SPECFEM3D/shells/msub_run_benchmark_all_process.sh
index 1a6583f..e84ef7c 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/msub_run_benchmark_all_process.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/msub_run_benchmark_all_process.sh
@@ -33,7 +33,7 @@ cd $BRIDGE_MSUB_PWD
# 2/ input file : parfile_for_benchmark
#
#
-# 3/ SPECFEM3D input directory : ./in_data_file
+# 3/ SPECFEM3D input directory : ./DATA
# containts
# -- Par_file
# -- STATIONS
@@ -83,7 +83,7 @@ flog_file=$(pwd)/log.benchmark
PREFIX_MOVIE=velocity_Z_it
# directory where SPECFEM3D writes outputs
-IN_MOVIE=$(pwd)/in_out_files/DATABASES_MPI/
+IN_MOVIE=$(pwd)/OUTPUT_FILES/DATABASES_MPI/
# output movie directory
OUT_MOVIE=$(pwd)/movie
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/msub_setup_process.sh b/utils/DSM_FOR_SPECFEM3D/shells/msub_setup_process.sh
index ffbaa5d..cca0ea0 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/msub_setup_process.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/msub_setup_process.sh
@@ -33,7 +33,7 @@ cd $BRIDGE_MSUB_PWD
# 2/ input file : parfile_for_benchmark
#
#
-# 3/ SPECFEM3D input directory : ./in_data_file
+# 3/ SPECFEM3D input directory : ./DATA
# containts
# -- Par_file
# -- STATIONS
@@ -84,7 +84,7 @@ flog_file=$(pwd)/log.benchmark
PREFIX_MOVIE=velocity_Z_it
# directory where SPECFEM3D writes outputs
-IN_MOVIE=$(pwd)/in_out_files/DATABASES_MPI/
+IN_MOVIE=$(pwd)/OUTPUT_FILES/DATABASES_MPI/
# output movie directory
OUT_MOVIE=$(pwd)/movie
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/scrpits_before_specfem.sh b/utils/DSM_FOR_SPECFEM3D/shells/scrpits_before_specfem.sh
index 9be3efb..ed3b1d1 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/scrpits_before_specfem.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/scrpits_before_specfem.sh
@@ -4,7 +4,7 @@
function create_out_directory_specfem ()
{
mkdir -p OUTPUT_FILES
-mkdir -p in_out_files/DATABASES_MPI
+mkdir -p OUTPUT_FILES/DATABASES_MPI
mkdir bin
cp ParFileInterface bin/.
}
@@ -26,7 +26,7 @@ cd ..
#
function decompose_scotch ()
{
-/bin/xdecompose_mesh_SCOTCH $NPROC $MESH in_out_files/DATABASES_MPI/
+/bin/xdecompose_mesh_SCOTCH $NPROC $MESH OUTPUT_FILES/DATABASES_MPI/
}
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh b/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh
index 23b0776..fa3ce4f 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh
@@ -12,13 +12,13 @@ function clean_and_make_dir ()
{
delete_directory_if_exist $MESH
delete_directory_if_exist OUTPUT_FILES
-delete_directory_if_exist in_out_files/DATABASES_MPI
+delete_directory_if_exist OUTPUT_FILES/DATABASES_MPI
delete_directory_if_exist in_out_files/Tractions
delete_directory_if_exist bin
mkdir -p $MESH
mkdir -p OUTPUT_FILES
-mkdir -p in_out_files/DATABASES_MPI
+mkdir -p OUTPUT_FILES/DATABASES_MPI
mkdir -p in_out_files/Tractions
mkdir bin
}
@@ -47,7 +47,7 @@ function run_create_specfem_databases ()
cp ParFileInterface bin/.
-$BINSEM/xdecompose_mesh_SCOTCH $NPROC $MESH in_out_files/DATABASES_MPI/
+$BINSEM/xdecompose_mesh_SCOTCH $NPROC $MESH OUTPUT_FILES/DATABASES_MPI/
mv Numglob2loc_elmn.txt $MESH/.
cd bin
@@ -75,14 +75,14 @@ function create_movie ()
cd bin
-# $2 = IN (/scratch/vmonteil/BENCHMARK_COUPLAGE/chunk_15s/in_out_files/DATABASES_MPI/)
+# $2 = IN (/scratch/vmonteil/BENCHMARK_COUPLAGE/chunk_15s/OUTPUT_FILES/DATABASES_MPI/)
# $3 = OUT (./movie)
# $4 istep
# $5 itmax
declare -i it itmax istep
PREFIX=$1 # (velocity_Z_it)
-IN=$2 #/scratch/vmonteil/BENCHMARK_COUPLAGE/chunk_15s/in_out_files/DATABASES_MPI/
+IN=$2 #/scratch/vmonteil/BENCHMARK_COUPLAGE/chunk_15s/OUTPUT_FILES/DATABASES_MPI/
OUT=$3 #./movie
istep=$4
itmax=$5
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/copy_vtk_files.sh b/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/copy_vtk_files.sh
index b3c29f5..cb2f4d6 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/copy_vtk_files.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/copy_vtk_files.sh
@@ -1,3 +1,3 @@
# copy vtk files created with generate_databses: it is important to initialise the process only
-VTK_OUT=/ccc/scratch/cont003/gen6351/vmont/INVERSIONS_SYNTHS/2_sources_60deg/in_out_files/DATABASES_MPI
-cp $VTK_OUT/*.vtk ./in_out_files/DATABASES_MPI/.
+VTK_OUT=/ccc/scratch/cont003/gen6351/vmont/INVERSIONS_SYNTHS/2_sources_60deg/OUTPUT_FILES/DATABASES_MPI
+cp $VTK_OUT/*.vtk ./OUTPUT_FILES/DATABASES_MPI/.
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_general.sh b/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_general.sh
index d25255e..180f631 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_general.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_general.sh
@@ -8,10 +8,10 @@ function create_directories ()
mkdir -p $WORKING_DIRECTORY/DATA
mkdir -p $WORKING_DIRECTORY/bin
-mkdir -p $WORKING_DIRECTORY/in_out_files/DATABASES_MPI
+mkdir -p $WORKING_DIRECTORY/OUTPUT_FILES/DATABASES_MPI
mkdir -p $WORKING_DIRECTORY/in_out_files/SEM
mkdir -p $WORKING_DIRECTORY/OUTPUT_FILES
-mkdir -p $WORKING_DIRECTORY/in_out_files/DATABASES_MPI_CURRENT
+mkdir -p $WORKING_DIRECTORY/OUTPUT_FILES/DATABASES_MPI_CURRENT
cp $PAR_FILE_DIRECTORY/* DATA/.
@@ -39,22 +39,22 @@ done
#============================================================================
function copy_initial_database ()
{
-cp $DATABASES_INIT_MODEL/* in_out_files/DATABASES_MPI/.
+cp $DATABASES_INIT_MODEL/* OUTPUT_FILES/DATABASES_MPI/.
}
#============================================================================
function copy_current_database ()
{
-cp ./in_out_files/DATABASES_MPI_CURRENT/* in_out_files/DATABASES_MPI/.
+cp ./OUTPUT_FILES/DATABASES_MPI_CURRENT/* OUTPUT_FILES/DATABASES_MPI/.
}
#=============================================================================
function save_mv_current_database ()
{
-mv ./in_out_files/DATABASES_MPI/* ./in_out_files/DATABASES_MPI_CURRENT/.
+mv ./OUTPUT_FILES/DATABASES_MPI/* ./OUTPUT_FILES/DATABASES_MPI_CURRENT/.
}
#=============================================================================
function save_cp_current_database ()
{
-cp ./in_out_files/DATABASES_MPI/* ./in_out_files/DATABASES_MPI_CURRENT/.
+cp ./OUTPUT_FILES/DATABASES_MPI/* ./OUTPUT_FILES/DATABASES_MPI_CURRENT/.
}
#============================================================================
function initialise_process ()
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_optimisation.sh b/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_optimisation.sh
index c91643f..caf3bee 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_optimisation.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_optimisation.sh
@@ -60,7 +60,7 @@ while [ "$ssiter" -le "$nssiter" ] ; do
rm bin/derivee_cout_pas.txt
# on copie la base de donnee sauvee
- cp ./in_out_files/DATABASES_MPI_CURRENT/* ./in_out_files/DATABASES_MPI/.
+ cp ./OUTPUT_FILES/DATABASES_MPI_CURRENT/* ./OUTPUT_FILES/DATABASES_MPI/.
update_model $pas
forward_simu ss_iter
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_simu_mpi.sh b/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_simu_mpi.sh
index 4ec64da..1ca855b 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_simu_mpi.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_simu_mpi.sh
@@ -22,8 +22,8 @@ while [ "$isrc" -le "$nsrc" ]; do
cp in_out_files_${isrc}/OUTPUT_FILES/$1/*semd in_out_files_${isrc}/OUTPUT_FILES/.
# save direct field to prepare adjoint simu
- mv in_out_files/DATABASES_MPI/*save_forward_arrays.bin $TRACTION/$EARTHQUAKE${isrc}/.
- mv in_out_files/DATABASES_MPI/*_absorb_field.bin $TRACTION/$EARTHQUAKE${isrc}/.
+ mv OUTPUT_FILES/DATABASES_MPI/*save_forward_arrays.bin $TRACTION/$EARTHQUAKE${isrc}/.
+ mv OUTPUT_FILES/DATABASES_MPI/*_absorb_field.bin $TRACTION/$EARTHQUAKE${isrc}/.
isrc="$isrc+1"
@@ -45,9 +45,9 @@ while [ "$isrc" -le "$nsrc" ]; do
cd ..
# save kernel
- mv ./in_out_files/DATABASES_MPI/*kernel.bin in_out_files_${isrc}/OUTPUT_FILES/WF/.
- mv ./in_out_files/DATABASES_MPI/*vp.bin in_out_files_${isrc}/OUTPUT_FILES/WF/.
- mv ./in_out_files/DATABASES_MPI/*vs.bin in_out_files_${isrc}/OUTPUT_FILES/WF/.
+ mv ./OUTPUT_FILES/DATABASES_MPI/*kernel.bin in_out_files_${isrc}/OUTPUT_FILES/WF/.
+ mv ./OUTPUT_FILES/DATABASES_MPI/*vp.bin in_out_files_${isrc}/OUTPUT_FILES/WF/.
+ mv ./OUTPUT_FILES/DATABASES_MPI/*vs.bin in_out_files_${isrc}/OUTPUT_FILES/WF/.
isrc="$isrc+1"
More information about the CIG-COMMITS
mailing list