[cig-commits] [commit] devel: Remove hard-coded output paths. (553bc35)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Sat Apr 26 06:28:49 PDT 2014
Repository : ssh://geoshell/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/a668bacb1ee6d977dbb736f361fd6a1c87643cf0...aa19d657e7ebf41f81216672453c6411d6ab3fdf
>---------------------------------------------------------------
commit 553bc35cd671150464ba8afe70df1940909e30f9
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sat Apr 26 02:05:51 2014 -0400
Remove hard-coded output paths.
These should use the constant that's already defined. They also need to
be updated for the re-arranged layout.
>---------------------------------------------------------------
553bc35cd671150464ba8afe70df1940909e30f9
src/auxiliaries/model_update.f90 | 10 +++-------
src/specfem3D/fault_solver_common.f90 | 3 ++-
src/specfem3D/fault_solver_dynamic.f90 | 10 ++++++----
src/specfem3D/fault_solver_kinematic.f90 | 5 +++--
src/specfem3D/gravity_perturbation.f90 | 8 ++++----
src/specfem3D/noise_tomography.f90 | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/auxiliaries/model_update.f90 b/src/auxiliaries/model_update.f90
index 7e7dc02..f92ca60 100644
--- a/src/auxiliaries/model_update.f90
+++ b/src/auxiliaries/model_update.f90
@@ -36,21 +36,17 @@ program model_update
! ======================================================
! USER PARAMETERS
- ! root file directory
- character (len=256), parameter :: &
- ROOT_PATH = '/lscratch/users/magnoni/SPECFEM3D/trunk_update/OUTPUT_FILES'
-
! directory where the mesh files for the NEW model will be written
character (len=256), parameter :: &
- LOCAL_PATH_NEW = trim(ROOT_PATH)//'/'//'DATABASES_MPI/mesh_files_m01'
+ LOCAL_PATH_NEW = trim(LOCAL_PATH_Q)//'/mesh_files_m01'
! directory where the output files of model_update will be written
character (len=256), parameter :: &
- OUTPUT_MODEL_UPD = trim(ROOT_PATH)//'/'//'OUTPUT_FILES_MODEL_UPD'
+ OUTPUT_MODEL_UPD = trim(OUTPUT_FILES_PATH)//'/OUTPUT_FILES_MODEL_UPD'
! directory where the summed and smoothed input kernels are linked
character (len=256), parameter :: &
- INPUT_KERNELS = trim(ROOT_PATH)//'/'//'DATABASES_MPI/sum_smooth_kern'
+ INPUT_KERNELS = trim(LOCAL_PATH_Q)//'/sum_smooth_kern'
! by default, this algorithm uses (bulk,bulk_beta,rho) kernels to update vp,vs,rho
! if you prefer using (alpha,beta,rho) kernels, set this flag to true
diff --git a/src/specfem3D/fault_solver_common.f90 b/src/specfem3D/fault_solver_common.f90
index 45d0d9d..e5cc6a1 100644
--- a/src/specfem3D/fault_solver_common.f90
+++ b/src/specfem3D/fault_solver_common.f90
@@ -495,6 +495,7 @@ end subroutine store_dataT
!------------------------------------------------------------------------
subroutine SCEC_write_dataT(dataT)
+ use specfem_par, only: OUTPUT_FILES_PATH
!! DK DK use type() instead of class() for compatibility with some current compilers
type(dataT_type), intent(in) :: dataT
@@ -510,7 +511,7 @@ subroutine SCEC_write_dataT(dataT)
write(my_fmt,'(a,i1,a)') '(',dataT%ndat+1,'(E15.7))'
do i=1,dataT%npoin
- open(IOUT,file='../OUTPUT_FILES/'//trim(dataT%name(i))//'.dat',status='replace')
+ open(IOUT,file=trim(OUTPUT_FILES_PATH)//trim(dataT%name(i))//'.dat',status='replace')
write(IOUT,*) "# problem=TPV104" ! WARNING: this should be a user input
write(IOUT,*) "# author=Surendra Nadh Somala" ! WARNING: this should be a user input
write(IOUT,1000) time_values(2), time_values(3), time_values(1), time_values(5), time_values(6), time_values(7)
diff --git a/src/specfem3D/fault_solver_dynamic.f90 b/src/specfem3D/fault_solver_dynamic.f90
index 8a6e5eb..52d0738 100644
--- a/src/specfem3D/fault_solver_dynamic.f90
+++ b/src/specfem3D/fault_solver_dynamic.f90
@@ -940,17 +940,18 @@ end subroutine rsf_update_state
subroutine SCEC_Write_RuptureTime(dataXZ,iflt)
+ use :: specfem_par, only: OUTPUT_FILES_PATH
type(dataXZ_type), intent(in) :: dataXZ
integer, intent(in) :: iflt
integer :: i,IOUT
- character(len=70) :: filename
+ character(len=256) :: filename
integer, dimension(8) :: time_values
call date_and_time(VALUES=time_values)
- write(filename,"('../OUTPUT_FILES/RuptureTime_Fault',I0)") iflt
+ write(filename,'(a,I0)') trim(OUTPUT_FILES_PATH)//'/RuptureTime_Fault', iflt
IOUT = 121 !WARNING: not very robust. Could instead look for an available ID
@@ -1112,12 +1113,13 @@ end subroutine store_dataXZ
!---------------------------------------------------------------
subroutine write_dataXZ(dataXZ,itime,iflt)
+ use :: specfem_par, only: OUTPUT_FILES_PATH
type(dataXZ_type), intent(in) :: dataXZ
integer, intent(in) :: itime,iflt
- character(len=70) :: filename
+ character(len=256) :: filename
- write(filename,"('../OUTPUT_FILES/Snapshot',I0,'_F',I0,'.bin')") itime,iflt
+ write(filename,"(a,I0,'_F',I0,'.bin')") trim(OUTPUT_FILES_PATH)//'/Snapshot',itime,iflt
open(unit=IOUT, file= trim(filename), status='replace', form='unformatted',action='write')
diff --git a/src/specfem3D/fault_solver_kinematic.f90 b/src/specfem3D/fault_solver_kinematic.f90
index 7629f48..f8cfc51 100644
--- a/src/specfem3D/fault_solver_kinematic.f90
+++ b/src/specfem3D/fault_solver_kinematic.f90
@@ -340,15 +340,16 @@ end subroutine init_dataXZ
subroutine load_vslip_snapshots(dataXZ,itime,iflt)
+ use :: specfem_par, only: OUTPUT_FILES_PATH
integer, intent(in) :: itime,iflt
type(dataXZ_type), intent(inout) :: dataXZ
- character(len=70) :: filename
+ character(len=256) :: filename
integer :: IIN_BIN,ier,IOUT
IIN_BIN=101
IOUT = 102
- write(filename,"('../OUTPUT_FILES/Snapshot',I0,'_F',I0,'.bin')") itime,iflt
+ write(filename,"(a,I0,'_F',I0,'.bin')") trim(OUTPUT_FILES_PATH)//'/Snapshot',itime,iflt
print*, trim(filename)
open(unit=IIN_BIN, file= trim(filename), status='old', form='formatted',&
diff --git a/src/specfem3D/gravity_perturbation.f90 b/src/specfem3D/gravity_perturbation.f90
index 8ac3a8b..d2d9aed 100644
--- a/src/specfem3D/gravity_perturbation.f90
+++ b/src/specfem3D/gravity_perturbation.f90
@@ -328,18 +328,18 @@ end subroutine gravity_timeseries
subroutine gravity_output()
- use specfem_par, only : myrank,NPROC,NSTEP,DT
+ use specfem_par, only : myrank,NPROC,NSTEP,DT,OUTPUT_FILES_PATH
implicit none
integer :: isample,istat,nstep_grav
- character(len=150) sisname
+ character(len=256) sisname
nstep_grav = floor(dble(NSTEP/ntimgap))
nstat_local = nint(dble(nstat/NPROC))
do istat=1,nstat
if(istat < myrank*nstat_local+1 .or. istat > (myrank+1)*nstat_local) cycle
- write(sisname,"('../OUTPUT_FILES/stat',I0,'.grav')") istat
+ write(sisname,"(a,I0,a)") trim(OUTPUT_FILES_PATH)//'/stat', istat, '.grav'
open(unit=IOUT,file=sisname,status='replace')
do isample = 1,nstep_grav
write(IOUT,*) isample*DT*ntimgap, accE(isample,istat),accN(isample,istat),accZ(isample,istat)
@@ -349,7 +349,7 @@ subroutine gravity_output()
if(myrank==0) then !left-over stations
do istat=NPROC*nstat_local,nstat
- write(sisname,"('../OUTPUT_FILES/stat',I0,'.grav')") istat
+ write(sisname,"(a,I0,a)") trim(OUTPUT_FILES_PATH)//'/stat', istat, '.grav'
open(unit=IOUT,file=sisname,status='replace')
do isample = 1,nstep_grav
write(IOUT,*) isample*DT*ntimgap, accE(isample,istat),accN(isample,istat),accZ(isample,istat)
diff --git a/src/specfem3D/noise_tomography.f90 b/src/specfem3D/noise_tomography.f90
index 5f08a39..8523675 100644
--- a/src/specfem3D/noise_tomography.f90
+++ b/src/specfem3D/noise_tomography.f90
@@ -383,7 +383,7 @@ end module user_noise_distribution
!! ! create_movie_AVS_DX.f90 needs to be modified in order to do that,
!! ! i.e., instead of showing the normal component, change it to either x, y or z component, or the norm.
!! if(myrank == 0) then
-!! open(unit=IOUT_NOISE,file='OUTPUT_FILES/mask_noise',status='unknown',form='unformatted',action='write')
+!! open(unit=IOUT_NOISE,file=trim(OUTPUT_FILES_PATH)//'/mask_noise',status='unknown',form='unformatted',action='write')
!! write(IOUT_NOISE) store_val_x_all
!! write(IOUT_NOISE) store_val_y_all
!! write(IOUT_NOISE) store_val_z_all
More information about the CIG-COMMITS
mailing list