[cig-commits] [commit] devel: Change for DSM (e17359b)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Aug 1 10:07:06 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/8a3f14d7d473f70feb7f073639045daa35c587bc...d759e09dd946c593868753fbb4253d77378fb276
>---------------------------------------------------------------
commit e17359bce06a4493ce07730f9e5e07dde3a18e5e
Author: Clément Durochat <c.durochat at gmail.com>
Date: Wed Jul 9 15:35:08 2014 +0200
Change for DSM
>---------------------------------------------------------------
e17359bce06a4493ce07730f9e5e07dde3a18e5e
.../DSM_FOR_SPECFEM3D/example_simple_small/parfile_for_benchmark | 6 +++---
.../Interf_SPECFEM3D_DSM/constants.h | 6 +++---
.../DSM_FOR_SPECFEM3D/UTILS/create_all_input_files_for_Hybrid.f90 | 2 +-
utils/DSM_FOR_SPECFEM3D/shells/scrpits_before_specfem.sh | 2 +-
utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh | 6 +++---
.../DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_general.sh | 8 ++++----
.../shells/shells_for_FWI/functions_optimisation.sh | 4 ++--
.../DSM_FOR_SPECFEM3D/shells/shells_for_FWI/functions_simu_mpi.sh | 6 +++---
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/parfile_for_benchmark b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/parfile_for_benchmark
index a12b76d..171a62a 100755
--- a/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/parfile_for_benchmark
+++ b/EXAMPLES/DSM_FOR_SPECFEM3D/example_simple_small/parfile_for_benchmark
@@ -1,7 +1,7 @@
# ABSOLUTE PATH FOR EXECUTABLES
-DSM_BINARY_PATH = /scratch/vmonteil/test_hybrid_for_distribute/DSM_SPECFEM/bin
-SPECFEM3D_BINARY_PATH = /scratch/vmonteil/test_hybrid_for_distribute/DSM_SPECFEM/SEMH/bin
-SHELL_SCRIPT_PATH = /scratch/vmonteil/test_hybrid_for_distribute/DSM_SPECFEM/shells
+DSM_BINARY_PATH = /home/durochat/Codes/SPECFEM3Ds/specfem3d/utils/DSM_FOR_SPECFEM3D/bin
+SPECFEM3D_BINARY_PATH = /home/durochat/Codes/SPECFEM3Ds/specfem3d/bin
+SHELL_SCRIPT_PATH = /home/durochat/Codes/SPECFEM3Ds/specfem3d/utils/DSM_FOR_SPECFEM3D/shells
# DIRECTORY CONTAINED INPUTS FILES (RELATIVE PATH FORM ./)
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 cee2b21..0e7559b 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
@@ -137,9 +137,9 @@
logical,parameter :: ABSORB_USE_PML = .false.
! paths for inputs and outputs files
- character(len=256), parameter :: IN_DATA_FILES_PATH = '../in_data_files/'
- character(len=256), parameter :: MF_IN_DATA_FILES_PATH = '../in_data_files/meshfem3D_files/'
- character(len=256), parameter :: OUTPUT_FILES_PATH = '../in_out_files/OUTPUT_FILES/'
+ character(len=256), parameter :: IN_DATA_FILES_PATH = '../DATA/'
+ character(len=256), parameter :: MF_IN_DATA_FILES_PATH = '../DATA/meshfem3D_files/'
+ character(len=256), parameter :: OUTPUT_FILES_PATH = '../OUTPUT_FILES/'
! ---------------------------------------------------------------------------------------
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 a4b6000..df5640b 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
@@ -393,7 +393,7 @@ program create_input_files
ZREF=0.d0
!-------- station file (lat long)----
open(10,file='station_for_simulation.txt')
- open(20,file='in_data_files/STATIONS_test')
+ open(20,file='DATA/STATIONS_test')
do
read(10,*,end=99) lat,long
call Geogr2Cart(X,Y,Z,long,lat,rotation_matrix,ZREF)
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/scrpits_before_specfem.sh b/utils/DSM_FOR_SPECFEM3D/shells/scrpits_before_specfem.sh
index eab517e..9be3efb 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/scrpits_before_specfem.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/scrpits_before_specfem.sh
@@ -3,7 +3,7 @@
#
function create_out_directory_specfem ()
{
-mkdir -p in_out_files/OUTPUT_FILES
+mkdir -p OUTPUT_FILES
mkdir -p in_out_files/DATABASES_MPI
mkdir bin
cp ParFileInterface bin/.
diff --git a/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh b/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh
index 8585ec7..23b0776 100755
--- a/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh
+++ b/utils/DSM_FOR_SPECFEM3D/shells/scrpits_specfem3D.sh
@@ -11,13 +11,13 @@ fi
function clean_and_make_dir ()
{
delete_directory_if_exist $MESH
-delete_directory_if_exist in_out_files/OUTPUT_FILES
+delete_directory_if_exist OUTPUT_FILES
delete_directory_if_exist in_out_files/DATABASES_MPI
delete_directory_if_exist in_out_files/Tractions
delete_directory_if_exist bin
mkdir -p $MESH
-mkdir -p in_out_files/OUTPUT_FILES
+mkdir -p OUTPUT_FILES
mkdir -p in_out_files/DATABASES_MPI
mkdir -p in_out_files/Tractions
mkdir bin
@@ -36,7 +36,7 @@ cp ParFileMeshChunk $MESH/.
cp $IN_DSM/$MODELE_1D $MESH/.
cd $MESH
$BIN/xmesh_chunk_vm
-cp $MESH/model_1D.in ../in_data_files/.
+cp $MESH/model_1D.in ../DATA/.
cd $current_dir
}
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 234f5c5..d25255e 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
@@ -6,14 +6,14 @@ function create_directories ()
# create directories
-mkdir -p $WORKING_DIRECTORY/in_data_files
+mkdir -p $WORKING_DIRECTORY/DATA
mkdir -p $WORKING_DIRECTORY/bin
mkdir -p $WORKING_DIRECTORY/in_out_files/DATABASES_MPI
mkdir -p $WORKING_DIRECTORY/in_out_files/SEM
-mkdir -p $WORKING_DIRECTORY/in_out_files/OUTPUT_FILES
+mkdir -p $WORKING_DIRECTORY/OUTPUT_FILES
mkdir -p $WORKING_DIRECTORY/in_out_files/DATABASES_MPI_CURRENT
-cp $PAR_FILE_DIRECTORY/* in_data_files/.
+cp $PAR_FILE_DIRECTORY/* DATA/.
# create earthquake directories
isrc=1
@@ -27,7 +27,7 @@ done
#===========================================================================
function clean_directories ()
{
-\rm -r bin in_data_files in_out_files
+\rm -r bin DATA in_out_files
# create earthquake directories
isrc=1
while [ "$isrc" -le "$nsrc" ]; do
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 1959d8c..c91643f 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
@@ -132,10 +132,10 @@ cd ..
function compute_adjoint_source_FWI ()
{
cd bin
-cp ../in_data_files/define_adjoint_sources_for_FWI.par define_adjoint_sources.par
+cp ../DATA/define_adjoint_sources_for_FWI.par define_adjoint_sources.par
isrc=1
while [ "$isrc" -le "$nsrc" ]; do
- cp ../in_data_files/data_source_${isrc}.txt .
+ cp ../DATA/data_source_${isrc}.txt .
$HYBRID_BINNARY/xdefineadj_no_aligne
isrc="$isrc+1"
done
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 63a924a..4ec64da 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
@@ -11,14 +11,14 @@ isrc=1
while [ "$isrc" -le "$nsrc" ]; do
# forward simu for earthquake isrc
- cp ./in_data_files/Par_file_${isrc} ./in_data_files/Par_file
+ cp ./DATA/Par_file_${isrc} ./DATA/Par_file
cd bin
$MPIRUN $OPTION_MPI $HYBRID_BINNARY/xspecfem3D > tmp.out
cd ..
# copy and save outputs
mkdir -p in_out_files_${isrc}/OUTPUT_FILES/$1
- mv in_out_files/OUTPUT_FILES/* in_out_files_${isrc}/OUTPUT_FILES/$1/.
+ mv OUTPUT_FILES/* in_out_files_${isrc}/OUTPUT_FILES/$1/.
cp in_out_files_${isrc}/OUTPUT_FILES/$1/*semd in_out_files_${isrc}/OUTPUT_FILES/.
# save direct field to prepare adjoint simu
@@ -39,7 +39,7 @@ while [ "$isrc" -le "$nsrc" ]; do
cp in_out_files_${isrc}/OUTPUT_FILES/WF/*.adj ./in_out_files/SEM/.
# forward simu for earthquake isrc
- cp ./in_data_files/Par_file_adj_${isrc} ./in_data_files/Par_file
+ cp ./DATA/Par_file_adj_${isrc} ./DATA/Par_file
cd bin
$MPIRUN $OPTION_MPI $SEM_BINNARY/xspecfem3D > tmp.out
cd ..
More information about the CIG-COMMITS
mailing list