From 17c8c64217ef5433f42d13308e63dba5d47abd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=A4hler?= Date: Wed, 9 Jul 2014 12:49:42 +0200 Subject: [PATCH] Pulled changes in submit.csh, post_processing.csh and copytemplates.sh from master branch --- SOLVER/UTILS/post_processing.csh | 2 +- SOLVER/submit.csh | 8 +++----- copytemplates.sh | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/SOLVER/UTILS/post_processing.csh b/SOLVER/UTILS/post_processing.csh index 87fe464b..cc8df4dc 100755 --- a/SOLVER/UTILS/post_processing.csh +++ b/SOLVER/UTILS/post_processing.csh @@ -97,7 +97,7 @@ if ( $gnu_query == 1 ) then echo echo "%%%%%%%%% PLOTTING seismograms (gnuplot) %%%%%%%%%%" cd $outdir - set seistype = `grep "SEISTYPE" param_post_processing |awk '{print $2}' |sed 's/"/ /g' ` + set seistype = "disp" echo "seismogram type:" $seistype set reclist = `cat $homedir/$simdir1/Data/receiver_names.dat |awk '{print $1}'` echo "1st receiver:" $reclist[1] diff --git a/SOLVER/submit.csh b/SOLVER/submit.csh index b428b424..96838ae4 100755 --- a/SOLVER/submit.csh +++ b/SOLVER/submit.csh @@ -73,13 +73,11 @@ endif set bgmodel = `grep ^BACKGROUND_MODEL $meshdir/inparam_mesh | awk '{print $2}'` -# if the mesh has different mesh_params.h, copy here +# Since the compiling does not depend on mesh_params.h anymore, we just copy it here anyway. # actually mesh_params.h is not needed anymore by the solver, just keeping it for # informational purposes -if ( ! -f mesh_params.h || `diff mesh_params.h $meshdir/mesh_params.h | wc -l` != "0" ) then - echo 'copying mesh_params.h from ' $meshdir - cp $meshdir/mesh_params.h . -endif +echo 'copying mesh_params.h from ' $meshdir +cp $meshdir/mesh_params.h . # if the mesh has different background_models.F90, copy over if ( `diff background_models.F90 $meshdir/background_models.F90 | wc -l` != "0" ) then diff --git a/copytemplates.sh b/copytemplates.sh index e14ff784..e44d8dd8 100755 --- a/copytemplates.sh +++ b/copytemplates.sh @@ -9,4 +9,5 @@ cp SOLVER/inparam_basic.TEMPLATE SOLVER/inparam_basic cp SOLVER/inparam_advanced.TEMPLATE SOLVER/inparam_advanced cp SOLVER/STATIONS.TEMPLATE SOLVER/STATIONS cp SOLVER/inparam_source.TEMPLATE SOLVER/inparam_source +cp SOLVER/inparam_hetero.TEMPLATE SOLVER/inparam_hetero cp SOLVER/CMTSOLUTION.TEMPLATE SOLVER/CMTSOLUTION