[cig-commits] [commit] devel: Remove get_value_* subroutines. (5584041)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu May 1 00:50:45 PDT 2014
Repository : ssh://geoshell/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/cb32c88d6155d7974561a6f72fc17aea596e2c4d...50aa953c1db3f565d76415f5305410a529996b75
>---------------------------------------------------------------
commit 558404176dbaf030db200b37e4ff4c34acc7f407
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sat Apr 26 04:51:06 2014 -0400
Remove get_value_* subroutines.
All they do is copy the default value to the result. This also removes
several copies of OUTPUT_FILES_PATH named as OUTPUT_FILES, so we save a
small bit of memory. There were even two copies of these routines.
>---------------------------------------------------------------
558404176dbaf030db200b37e4ff4c34acc7f407
.../create_movie_shakemap_AVS_DX_GMT.f90 | 31 +++----
src/auxiliaries/rules.mk | 6 --
src/decompose_mesh/rules.mk | 1 -
src/generate_databases/generate_databases.f90 | 5 +-
src/generate_databases/generate_databases_par.f90 | 2 +-
src/generate_databases/model_salton_trough.f90 | 6 +-
src/generate_databases/rules.mk | 1 -
src/meshfem3D/get_value_parameters.f90 | 84 ------------------
src/meshfem3D/meshfem3D.f90 | 7 +-
src/meshfem3D/rules.mk | 1 -
src/shared/exit_mpi.f90 | 4 +-
src/shared/get_cmt.f90 | 3 +-
src/shared/get_force.f90 | 3 +-
src/shared/get_value_parameters.f90 | 99 ----------------------
src/shared/read_parameter_file.f90 | 6 +-
src/shared/rules.mk | 1 -
src/shared/save_header_file.f90 | 6 +-
src/specfem3D/check_stability.f90 | 2 +-
src/specfem3D/initialize_simulation.f90 | 13 +--
src/specfem3D/iterate_time.F90 | 6 +-
src/specfem3D/locate_receivers.f90 | 18 ++--
src/specfem3D/locate_source.f90 | 7 +-
src/specfem3D/prepare_timerun.F90 | 2 +-
src/specfem3D/rules.mk | 1 -
src/specfem3D/setup_sources_receivers.f90 | 20 ++---
src/specfem3D/specfem3D_par.f90 | 2 +-
src/specfem3D/write_movie_output.f90 | 8 +-
src/specfem3D/write_output_SU.f90 | 4 +-
28 files changed, 58 insertions(+), 291 deletions(-)
diff --git a/src/auxiliaries/create_movie_shakemap_AVS_DX_GMT.f90 b/src/auxiliaries/create_movie_shakemap_AVS_DX_GMT.f90
index e51291c..b0983af 100644
--- a/src/auxiliaries/create_movie_shakemap_AVS_DX_GMT.f90
+++ b/src/auxiliaries/create_movie_shakemap_AVS_DX_GMT.f90
@@ -104,7 +104,7 @@
logical :: STACEY_ABSORBING_CONDITIONS,SAVE_FORWARD,STACEY_INSTEAD_OF_FREE_SURFACE
logical :: ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
logical :: PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE,FULL_ATTENUATION_SOLID
- character(len=256) :: OUTPUT_FILES,LOCAL_PATH,TOMOGRAPHY_PATH,TRAC_PATH
+ character(len=256) :: LOCAL_PATH,TOMOGRAPHY_PATH,TRAC_PATH
integer :: NPROC
integer :: ier
integer :: MOVIE_TYPE,IMODEL
@@ -138,14 +138,11 @@
USE_RICKER_TIME_FUNCTION,OLSEN_ATTENUATION_RATIO,PML_CONDITIONS, &
PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL,FULL_ATTENUATION_SOLID,TRAC_PATH)
- ! get the base pathname for output files
- call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH)))
-
! only one global array for movie data, but stored for all surfaces defined
! in file 'surface_from_mesher.h'
- open(unit=IIN,file=trim(OUTPUT_FILES)//'surface_from_mesher.h',status='old',action='read',iostat=ier)
+ open(unit=IIN,file=trim(OUTPUT_FILES_PATH)//'surface_from_mesher.h',status='old',action='read',iostat=ier)
if( ier /= 0 ) then
- print*,'error opening file: ',trim(OUTPUT_FILES)//'surface_from_mesher.h'
+ print*,'error opening file: ',trim(OUTPUT_FILES_PATH)//'surface_from_mesher.h'
print*
print*,'please run xgenerate_databases or xspecfem3D first to create this file, exiting now...'
stop 'error opening moviedata header file'
@@ -336,10 +333,10 @@
else
write(outputname,"('/moviedata',i6.6)") it
endif
- open(unit=IOUT,file=trim(OUTPUT_FILES)//trim(outputname),status='old', &
+ open(unit=IOUT,file=trim(OUTPUT_FILES_PATH)//trim(outputname),status='old', &
action='read',form='unformatted',iostat=ier)
if( ier /= 0 ) then
- print*,'error: ',trim(OUTPUT_FILES)//trim(outputname)
+ print*,'error: ',trim(OUTPUT_FILES_PATH)//trim(outputname)
stop 'error opening moviedata file'
endif
@@ -641,15 +638,15 @@
if(USE_OPENDX) then
write(outputname,"('/DX_shaking_map.dx')")
- open(unit=11,file=trim(OUTPUT_FILES)//outputname,status='unknown')
+ open(unit=11,file=trim(OUTPUT_FILES_PATH)//outputname,status='unknown')
write(11,*) 'object 1 class array type float rank 1 shape 3 items ',nglob,' data follows'
else if(USE_AVS) then
write(outputname,"('/AVS_shaking_map.inp')")
- open(unit=11,file=trim(OUTPUT_FILES)//outputname,status='unknown')
+ open(unit=11,file=trim(OUTPUT_FILES_PATH)//outputname,status='unknown')
write(11,*) nglob,' ',nspectot_AVS_max,' 1 0 0'
else if(USE_GMT) then
write(outputname,"('/gmt_shaking_map.xyz')")
- open(unit=11,file=trim(OUTPUT_FILES)//outputname,status='unknown')
+ open(unit=11,file=trim(OUTPUT_FILES_PATH)//outputname,status='unknown')
else
stop 'wrong output format selected'
endif
@@ -658,15 +655,15 @@
if(USE_OPENDX) then
write(outputname,"('/DX_movie_',i6.6,'.dx')") ivalue
- open(unit=11,file=trim(OUTPUT_FILES)//outputname,status='unknown')
+ open(unit=11,file=trim(OUTPUT_FILES_PATH)//outputname,status='unknown')
write(11,*) 'object 1 class array type float rank 1 shape 3 items ',nglob,' data follows'
else if(USE_AVS) then
write(outputname,"('/AVS_movie_',i6.6,'.inp')") ivalue
- open(unit=11,file=trim(OUTPUT_FILES)//outputname,status='unknown')
+ open(unit=11,file=trim(OUTPUT_FILES_PATH)//outputname,status='unknown')
write(11,*) nglob,' ',nspectot_AVS_max,' 1 0 0'
else if(USE_GMT) then
write(outputname,"('/gmt_movie_',i6.6,'.xyz')") ivalue
- open(unit=11,file=trim(OUTPUT_FILES)//outputname,status='unknown')
+ open(unit=11,file=trim(OUTPUT_FILES_PATH)//outputname,status='unknown')
else
stop 'wrong output format selected'
endif
@@ -795,9 +792,9 @@ enddo ! it
print *
print *,'done creating movie or shaking map'
print *
- if(USE_OPENDX) print *,'DX files are stored in ', trim(OUTPUT_FILES), '/DX_*.dx'
- if(USE_AVS) print *,'AVS files are stored in ', trim(OUTPUT_FILES), '/AVS_*.inp'
- if(USE_GMT) print *,'GMT files are stored in ', trim(OUTPUT_FILES), '/gmt_*.xyz'
+ if (USE_OPENDX) print *, 'DX files are stored in ', trim(OUTPUT_FILES_PATH), '/DX_*.dx'
+ if (USE_AVS) print *, 'AVS files are stored in ', trim(OUTPUT_FILES_PATH), '/AVS_*.inp'
+ if (USE_GMT) print *, 'GMT files are stored in ', trim(OUTPUT_FILES_PATH), '/gmt_*.xyz'
print *
deallocate(store_val_x)
diff --git a/src/auxiliaries/rules.mk b/src/auxiliaries/rules.mk
index 27dea30..0e2f842 100644
--- a/src/auxiliaries/rules.mk
+++ b/src/auxiliaries/rules.mk
@@ -57,7 +57,6 @@ auxiliaries_SHARED_OBJECTS = \
$O/check_mesh_resolution.shared.o \
$O/create_name_database.shared.o \
$O/exit_mpi.shared.o \
- $O/get_value_parameters.shared.o \
$O/get_attenuation_model.shared.o \
$O/gll_library.shared.o \
$O/param_reader.cc.o \
@@ -83,7 +82,6 @@ model_upd_auxiliaries_OBJECTS = \
$O/check_mesh_resolution.shared.o \
$O/create_name_database.shared.o \
$O/exit_mpi.shared.o \
- $O/get_value_parameters.shared.o \
$O/get_attenuation_model.shared.o \
$O/gll_library.shared.o \
$O/initialize_simulation.spec.o \
@@ -131,7 +129,6 @@ endif
sum_kernels_auxiliaries_OBJECTS = \
$O/sum_kernels.aux.o \
$O/exit_mpi.shared.o \
- $O/get_value_parameters.shared.o \
$O/param_reader.cc.o \
$O/read_parameter_file.shared.o \
$O/read_value_parameters.shared.o \
@@ -146,7 +143,6 @@ sum_kernels_auxiliaries_OBJECTS += $(COND_MPI_OBJECTS)
smooth_vol_data_auxiliaries_OBJECTS = \
$O/smooth_vol_data.aux.o \
$O/exit_mpi.shared.o \
- $O/get_value_parameters.shared.o \
$O/gll_library.shared.o \
$O/param_reader.cc.o \
$O/read_parameter_file.shared.o \
@@ -172,7 +168,6 @@ combine_surf_data_auxiliaries_OBJECTS = \
combine_vol_data_auxiliaries_OBJECTS = \
$O/combine_vol_data.aux.o \
$O/combine_vol_data_impl.aux.o \
- $O/get_value_parameters.shared.o \
$O/read_parameter_file.shared.o \
$O/read_value_parameters.shared.o \
$O/param_reader.cc.o \
@@ -200,7 +195,6 @@ auxiliaries_MODULES += combine_vol_data_adios_mod.mod
create_movie_shakemap_AVS_DX_GMT_auxiliaries_OBJECTS = \
$O/create_movie_shakemap_AVS_DX_GMT.aux.o \
$O/get_global.shared.o \
- $O/get_value_parameters.shared.o \
$O/param_reader.cc.o \
$O/read_parameter_file.shared.o \
$O/read_value_parameters.shared.o \
diff --git a/src/decompose_mesh/rules.mk b/src/decompose_mesh/rules.mk
index 18d1137..ac40ae2 100644
--- a/src/decompose_mesh/rules.mk
+++ b/src/decompose_mesh/rules.mk
@@ -55,7 +55,6 @@ decompose_mesh_MODULES = \
$(EMPTY_MACRO)
decompose_mesh_SHARED_OBJECTS = \
- $O/get_value_parameters.shared.o \
$O/param_reader.cc.o \
$O/read_parameter_file.shared.o \
$O/read_value_parameters.shared.o \
diff --git a/src/generate_databases/generate_databases.f90 b/src/generate_databases/generate_databases.f90
index 3348b37..d1d18b8 100644
--- a/src/generate_databases/generate_databases.f90
+++ b/src/generate_databases/generate_databases.f90
@@ -201,12 +201,9 @@
call world_size(sizeprocs)
call world_rank(myrank)
-! get the base pathname for output files
- call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH)))
-
! open main output file, only written to by process 0
if(myrank == 0 .and. IMAIN /= ISTANDARD_OUTPUT) &
- open(unit=IMAIN,file=trim(OUTPUT_FILES)//'/output_mesher.txt',status='unknown')
+ open(unit=IMAIN,file=trim(OUTPUT_FILES_PATH)//'/output_mesher.txt',status='unknown')
! get MPI starting time
time_start = wtime()
diff --git a/src/generate_databases/generate_databases_par.f90 b/src/generate_databases/generate_databases_par.f90
index 1184355..62c62ef 100644
--- a/src/generate_databases/generate_databases_par.f90
+++ b/src/generate_databases/generate_databases_par.f90
@@ -68,7 +68,7 @@
logical :: USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
logical :: MOVIE_SURFACE,MOVIE_VOLUME,CREATE_SHAKEMAP,SAVE_DISPLACEMENT,USE_HIGHRES_FOR_MOVIES
- character(len=256) OUTPUT_FILES,LOCAL_PATH,TOMOGRAPHY_PATH,TRAC_PATH
+ character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,TRAC_PATH
logical :: ADIOS_ENABLED
logical :: ADIOS_FOR_DATABASES, ADIOS_FOR_MESH, ADIOS_FOR_FORWARD_ARRAYS, &
diff --git a/src/generate_databases/model_salton_trough.f90 b/src/generate_databases/model_salton_trough.f90
index 1474f63..9ddf878 100644
--- a/src/generate_databases/model_salton_trough.f90
+++ b/src/generate_databases/model_salton_trough.f90
@@ -89,15 +89,11 @@
! local parameter
integer :: ios, reclen
- character(len=256) SALTON_SEA_MODEL_FILE
+ character(len=*), parameter :: SALTON_SEA_MODEL_FILE = 'DATA/st_3D_block_harvard/regrid3_vel_p.bin'
! array length
reclen=(GOCAD_ST_NU * GOCAD_ST_NV * GOCAD_ST_NW) * 4
- ! file name
- call get_value_string(SALTON_SEA_MODEL_FILE,'model.SALTON_SEA_MODEL_FILE', &
- 'DATA/st_3D_block_harvard/regrid3_vel_p.bin')
-
! reads in file values
open(11,file=trim(SALTON_SEA_MODEL_FILE), &
status='old',action='read',form='unformatted',access='direct',recl=reclen,iostat=ios)
diff --git a/src/generate_databases/rules.mk b/src/generate_databases/rules.mk
index 64c5636..dc0e543 100644
--- a/src/generate_databases/rules.mk
+++ b/src/generate_databases/rules.mk
@@ -102,7 +102,6 @@ generate_databases_SHARED_OBJECTS = \
$O/get_jacobian_boundaries.shared.o \
$O/get_shape2D.shared.o \
$O/get_shape3D.shared.o \
- $O/get_value_parameters.shared.o \
$O/gll_library.shared.o \
$O/hex_nodes.shared.o \
$O/lagrange_poly.shared.o \
diff --git a/src/meshfem3D/get_value_parameters.f90 b/src/meshfem3D/get_value_parameters.f90
deleted file mode 100644
index f697e9d..0000000
--- a/src/meshfem3D/get_value_parameters.f90
+++ /dev/null
@@ -1,84 +0,0 @@
-!=====================================================================
-!
-! S p e c f e m 3 D V e r s i o n 2 . 1
-! ---------------------------------------
-!
-! Main historical authors: Dimitri Komatitsch and Jeroen Tromp
-! Princeton University, USA
-! and CNRS / University of Marseille, France
-! (there are currently many more authors!)
-! (c) Princeton University and CNRS / University of Marseille, July 2012
-!
-! This program is free software; you can redistribute it and/or modify
-! it under the terms of the GNU General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or
-! (at your option) any later version.
-!
-! This program is distributed in the hope that it will be useful,
-! but WITHOUT ANY WARRANTY; without even the implied warranty of
-! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-! GNU General Public License for more details.
-!
-! You should have received a copy of the GNU General Public License along
-! with this program; if not, write to the Free Software Foundation, Inc.,
-! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-!
-!=====================================================================
-
- subroutine get_value_integer(value_to_get, name, default_value)
-
- implicit none
-
- integer value_to_get, default_value
- character(len=*) name
-
- call unused_string(name)
-
- value_to_get = default_value
-
- end subroutine get_value_integer
-
-!--------------------
-
- subroutine get_value_double_precision(value_to_get, name, default_value)
-
- implicit none
-
- double precision value_to_get, default_value
- character(len=*) name
-
- call unused_string(name)
-
- value_to_get = default_value
-
- end subroutine get_value_double_precision
-
-!--------------------
-
- subroutine get_value_logical(value_to_get, name, default_value)
-
- implicit none
-
- logical value_to_get, default_value
- character(len=*) name
-
- call unused_string(name)
-
- value_to_get = default_value
-
- end subroutine get_value_logical
-
-!--------------------
-
- subroutine get_value_string(value_to_get, name, default_value)
-
- implicit none
-
- character(len=*) value_to_get, default_value
- character(len=*) name
-
- call unused_string(name)
-
- value_to_get = default_value
-
- end subroutine get_value_string
diff --git a/src/meshfem3D/meshfem3D.f90 b/src/meshfem3D/meshfem3D.f90
index c7e98d9..6db7072 100644
--- a/src/meshfem3D/meshfem3D.f90
+++ b/src/meshfem3D/meshfem3D.f90
@@ -345,7 +345,7 @@
logical ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
logical PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE,FULL_ATTENUATION_SOLID
integer MOVIE_TYPE,IMODEL
- character(len=256) OUTPUT_FILES,LOCAL_PATH,TOMOGRAPHY_PATH,TRAC_PATH
+ character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,TRAC_PATH
logical :: ADIOS_ENABLED, ADIOS_FOR_DATABASES, ADIOS_FOR_MESH, &
ADIOS_FOR_FORWARD_ARRAYS, ADIOS_FOR_KERNELS
@@ -358,12 +358,9 @@
call world_size(sizeprocs)
call world_rank(myrank)
-! get the base pathname for output files
- call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH)))
-
! open main output file, only written to by process 0
if(myrank == 0 .and. IMAIN /= ISTANDARD_OUTPUT) &
- open(unit=IMAIN,file=trim(OUTPUT_FILES)//'/output_mesher.txt',status='unknown')
+ open(unit=IMAIN,file=trim(OUTPUT_FILES_PATH)//'/output_mesher.txt',status='unknown')
! get MPI starting time
time_start = wtime()
diff --git a/src/meshfem3D/rules.mk b/src/meshfem3D/rules.mk
index 59942c8..0c3a126 100644
--- a/src/meshfem3D/rules.mk
+++ b/src/meshfem3D/rules.mk
@@ -52,7 +52,6 @@ meshfem3D_OBJECTS = \
$O/get_flags_boundaries.mesh.o \
$O/get_MPI_cutplanes_eta.mesh.o \
$O/get_MPI_cutplanes_xi.mesh.o \
- $O/get_value_parameters.mesh.o \
$O/meshfem3D.mesh.o \
$O/program_meshfem3D.mesh.o \
$O/read_mesh_parameter_file.mesh.o \
diff --git a/src/shared/exit_mpi.f90 b/src/shared/exit_mpi.f90
index e370f30..2d1fee6 100644
--- a/src/shared/exit_mpi.f90
+++ b/src/shared/exit_mpi.f90
@@ -40,16 +40,14 @@
character(len=*) error_msg
character(len=80) outputname
- character(len=256) OUTPUT_FILES
! write error message to screen
write(*,*) error_msg(1:len(error_msg))
write(*,*) 'Error detected, aborting MPI... proc ',myrank
! write error message to file
- call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH)))
write(outputname,"('/error_message',i6.6,'.txt')") myrank
- open(unit=IERROR,file=trim(OUTPUT_FILES)//outputname,status='unknown')
+ open(unit=IERROR,file=trim(OUTPUT_FILES_PATH)//outputname,status='unknown')
write(IERROR,*) error_msg(1:len(error_msg))
write(IERROR,*) 'Error detected, aborting MPI... proc ',myrank
close(IERROR)
diff --git a/src/shared/get_cmt.f90 b/src/shared/get_cmt.f90
index 88499e6..f20c064 100644
--- a/src/shared/get_cmt.f90
+++ b/src/shared/get_cmt.f90
@@ -66,8 +66,7 @@
!
!---- read hypocenter info
!
- call get_value_string(CMTSOLUTION, 'solver.CMTSOLUTION', &
- IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'CMTSOLUTION')
+ CMTSOLUTION = IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'CMTSOLUTION'
open(unit=1,file=CMTSOLUTION,status='old',action='read')
diff --git a/src/shared/get_force.f90 b/src/shared/get_force.f90
index c45987c..591d175 100644
--- a/src/shared/get_force.f90
+++ b/src/shared/get_force.f90
@@ -64,8 +64,7 @@
!
!---- read info
!
- call get_value_string(FORCESOLUTION, 'solver.FORCESOLUTION', &
- IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'FORCESOLUTION')
+ FORCESOLUTION = IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'FORCESOLUTION'
open(unit=1,file=trim(FORCESOLUTION),status='old',action='read')
diff --git a/src/shared/get_value_parameters.f90 b/src/shared/get_value_parameters.f90
deleted file mode 100644
index 666c7ec..0000000
--- a/src/shared/get_value_parameters.f90
+++ /dev/null
@@ -1,99 +0,0 @@
-!=====================================================================
-!
-! S p e c f e m 3 D V e r s i o n 2 . 1
-! ---------------------------------------
-!
-! Main historical authors: Dimitri Komatitsch and Jeroen Tromp
-! Princeton University, USA
-! and CNRS / University of Marseille, France
-! (there are currently many more authors!)
-! (c) Princeton University and CNRS / University of Marseille, July 2012
-!
-! This program is free software; you can redistribute it and/or modify
-! it under the terms of the GNU General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or
-! (at your option) any later version.
-!
-! This program is distributed in the hope that it will be useful,
-! but WITHOUT ANY WARRANTY; without even the implied warranty of
-! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-! GNU General Public License for more details.
-!
-! You should have received a copy of the GNU General Public License along
-! with this program; if not, write to the Free Software Foundation, Inc.,
-! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-!
-!=====================================================================
-
- subroutine get_value_integer(value_to_get, name, default_value)
-
- implicit none
-
- integer value_to_get, default_value
- character(len=*) name
-
- call unused_string(name)
-
- value_to_get = default_value
-
- end subroutine get_value_integer
-
-!--------------------
-
- subroutine get_value_double_precision(value_to_get, name, default_value)
-
- implicit none
-
- double precision value_to_get, default_value
- character(len=*) name
-
- call unused_string(name)
-
- value_to_get = default_value
-
- end subroutine get_value_double_precision
-
-!--------------------
-
- subroutine get_value_logical(value_to_get, name, default_value)
-
- implicit none
-
- logical value_to_get, default_value
- character(len=*) name
-
- call unused_string(name)
-
- value_to_get = default_value
-
- end subroutine get_value_logical
-
-!--------------------
-
- subroutine get_value_string(value_to_get, name, default_value)
-
- implicit none
-
- character(len=*) value_to_get, default_value
- character(len=*) name
-
- call unused_string(name)
-
- value_to_get = default_value
-
- end subroutine get_value_string
-
-!--------------------
-
-! dummy subroutine to avoid warnings about variable not used in other subroutines
- subroutine unused_string(s)
-
- implicit none
-
- character(len=*) s
-
- if (len(s) == 1) continue
-
- end subroutine unused_string
-
-
diff --git a/src/shared/read_parameter_file.f90 b/src/shared/read_parameter_file.f90
index f4586be..f4ac4e9 100644
--- a/src/shared/read_parameter_file.f90
+++ b/src/shared/read_parameter_file.f90
@@ -217,8 +217,7 @@
if( USE_FORCE_POINT_SOURCE ) then
! compute the total number of sources in the FORCESOLUTION file
! there are NLINES_PER_FORCESOLUTION_SOURCE lines per source in that file
- call get_value_string(FORCESOLUTION, 'solver.FORCESOLUTION',&
- IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'FORCESOLUTION')
+ FORCESOLUTION = IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'FORCESOLUTION'
open(unit=21,file=trim(FORCESOLUTION),iostat=ios,status='old',action='read')
if(ios /= 0) stop 'error opening FORCESOLUTION file'
@@ -239,8 +238,7 @@
else
! compute the total number of sources in the CMTSOLUTION file
! there are NLINES_PER_CMTSOLUTION_SOURCE lines per source in that file
- call get_value_string(CMTSOLUTION, 'solver.CMTSOLUTION',&
- IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'CMTSOLUTION')
+ CMTSOLUTION = IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'CMTSOLUTION'
open(unit=21,file=trim(CMTSOLUTION),iostat=ios,status='old',action='read')
if(ios /= 0) stop 'error opening CMTSOLUTION file'
diff --git a/src/shared/rules.mk b/src/shared/rules.mk
index 6f3cd80..e532c73 100644
--- a/src/shared/rules.mk
+++ b/src/shared/rules.mk
@@ -53,7 +53,6 @@ shared_OBJECTS = \
$O/get_jacobian_boundaries.shared.o \
$O/get_shape2D.shared.o \
$O/get_shape3D.shared.o \
- $O/get_value_parameters.shared.o \
$O/gll_library.shared.o \
$O/hex_nodes.shared.o \
$O/lagrange_poly.shared.o \
diff --git a/src/shared/save_header_file.f90 b/src/shared/save_header_file.f90
index 8422b07..81eb12f 100644
--- a/src/shared/save_header_file.f90
+++ b/src/shared/save_header_file.f90
@@ -55,8 +55,7 @@
endif
! copy number of elements and points in an include file for the solver
- call get_value_string(HEADER_FILE, 'solver.HEADER_FILE', &
- OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH))//'/values_from_mesher.h')
+ HEADER_FILE = OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH))//'/values_from_mesher.h'
open(unit=IOUT,file=HEADER_FILE,status='unknown')
write(IOUT,*)
@@ -133,8 +132,7 @@
! copy number of surface elements in an include file for the movies
if( nfaces_surface_glob_ext_mesh > 0 ) then
- call get_value_string(HEADER_FILE, 'solver.HEADER_FILE', &
- OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH))//'/surface_from_mesher.h')
+ HEADER_FILE = OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH))//'/surface_from_mesher.h'
open(unit=IOUT,file=HEADER_FILE,status='unknown')
write(IOUT,*) '!'
diff --git a/src/specfem3D/check_stability.f90 b/src/specfem3D/check_stability.f90
index 4973ce2..71284e5 100644
--- a/src/specfem3D/check_stability.f90
+++ b/src/specfem3D/check_stability.f90
@@ -225,7 +225,7 @@
! write time stamp file to give information about progression of simulation
write(outputname,"('/timestamp',i6.6)") it
- open(unit=IOUT,file=trim(OUTPUT_FILES)//outputname,status='unknown')
+ open(unit=IOUT,file=trim(OUTPUT_FILES_PATH)//outputname,status='unknown')
write(IOUT,*) 'Time step # ',it
write(IOUT,*) 'Time: ',sngl((it-1)*DT-t0),' seconds'
write(IOUT,*) 'Elapsed time in seconds = ',tCPU
diff --git a/src/specfem3D/initialize_simulation.f90 b/src/specfem3D/initialize_simulation.f90
index 1dcba2b..f5ba7be 100644
--- a/src/specfem3D/initialize_simulation.f90
+++ b/src/specfem3D/initialize_simulation.f90
@@ -69,9 +69,6 @@
! GPU_MODE is in par_file
call read_gpu_mode(GPU_MODE,GRAVITY)
- ! get the base pathname for output files
- call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH)))
-
! myrank is the rank of each process, between 0 and NPROC-1.
! as usual in MPI, process 0 is in charge of coordinating everything
! and also takes care of the main output
@@ -82,7 +79,7 @@
! open main output file, only written to by process 0
if(myrank == 0 .and. IMAIN /= ISTANDARD_OUTPUT) &
- open(unit=IMAIN,file=trim(OUTPUT_FILES)//'/output_solver.txt',status='unknown')
+ open(unit=IMAIN,file=trim(OUTPUT_FILES_PATH)//'/output_solver.txt',status='unknown')
! user output
if(myrank == 0) then
write(IMAIN,*)
@@ -342,8 +339,7 @@
! check that the code has been compiled with the right values
if( myrank == 0 ) then
- call get_value_string(HEADER_FILE, 'solver.HEADER_FILE', &
- OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH))//'/values_from_mesher.h')
+ HEADER_FILE = OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH))//'/values_from_mesher.h'
open(unit=IOUT,file=trim(HEADER_FILE),status='old',iostat=ier)
if( ier /= 0 ) then
@@ -365,12 +361,11 @@
! checks directories
if( myrank == 0 ) then
! tests if OUTPUT_FILES directory exists
- call get_value_string(dummystring, 'OUTPUT_FILES', OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH)))
! note: inquire behaves differently when using intel ifort or gfortran compilers
!INQUIRE( FILE = dummystring(1:len_trim(dummystring))//'/.', EXIST = exists )
- open(IOUT,file=trim(dummystring)//'/dummy.txt',status='unknown',iostat=ier)
+ open(IOUT,file=trim(OUTPUT_FILES_PATH)//'/dummy.txt',status='unknown',iostat=ier)
if( ier /= 0 ) then
- print*,"OUTPUT_FILES directory does not work: ",trim(dummystring)
+ print*,"OUTPUT_FILES directory does not work: ",trim(OUTPUT_FILES_PATH)
call exit_MPI(myrank,'error OUTPUT_FILES directory')
endif
close(IOUT,status='delete')
diff --git a/src/specfem3D/iterate_time.F90 b/src/specfem3D/iterate_time.F90
index 2fa4213..8513657 100644
--- a/src/specfem3D/iterate_time.F90
+++ b/src/specfem3D/iterate_time.F90
@@ -40,7 +40,7 @@
!---- create a Gnuplot script to display the energy curve in log scale
if( OUTPUT_ENERGY .and. myrank == 0) then
- open(unit=IOUT_ENERGY,file=trim(OUTPUT_FILES)//'plot_energy.gnu',status='unknown',action='write')
+ open(unit=IOUT_ENERGY,file=trim(OUTPUT_FILES_PATH)//'plot_energy.gnu',status='unknown',action='write')
write(IOUT_ENERGY,*) 'set term wxt'
write(IOUT_ENERGY,*) '#set term postscript landscape color solid "Helvetica" 22'
write(IOUT_ENERGY,*) '#set output "energy.ps"'
@@ -61,7 +61,7 @@
! open the file in which we will store the energy curve
if( OUTPUT_ENERGY .and. myrank == 0 ) &
- open(unit=IOUT_ENERGY,file=trim(OUTPUT_FILES)//'energy.dat',status='unknown',action='write')
+ open(unit=IOUT_ENERGY,file=trim(OUTPUT_FILES_PATH)//'energy.dat',status='unknown',action='write')
!
! s t a r t t i m e i t e r a t i o n s
@@ -80,7 +80,7 @@
! create an empty file to monitor the start of the simulation
if(myrank == 0) then
- open(unit=IOUT,file=trim(OUTPUT_FILES)//'/starttimeloop.txt',status='unknown')
+ open(unit=IOUT,file=trim(OUTPUT_FILES_PATH)//'/starttimeloop.txt',status='unknown')
write(IOUT,*) 'starting time loop'
close(IOUT)
endif
diff --git a/src/specfem3D/locate_receivers.f90 b/src/specfem3D/locate_receivers.f90
index 39d4745..31e78a8 100644
--- a/src/specfem3D/locate_receivers.f90
+++ b/src/specfem3D/locate_receivers.f90
@@ -141,7 +141,6 @@
integer, allocatable, dimension(:) :: ispec_selected_rec_all
integer :: ier
- character(len=256) OUTPUT_FILES
real(kind=CUSTOM_REAL) :: xmin,xmax,ymin,ymax,zmin,zmax
real(kind=CUSTOM_REAL) :: xmin_ELE,xmax_ELE,ymin_ELE,ymax_ELE,zmin_ELE,zmax_ELE
@@ -190,13 +189,10 @@
open(unit=IIN,file=trim(rec_filename),status='old',action='read',iostat=ios)
if (ios /= 0) call exit_mpi(myrank,'error opening file '//trim(rec_filename))
- ! get the base pathname for output files
- call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH)))
-
! checks if station locations already available
if( SU_FORMAT ) then
! checks if file with station infos located from previous run exists
- INQUIRE(file=trim(OUTPUT_FILES)//'/SU_stations_info.bin',exist=SU_station_file_exists)
+ INQUIRE(file=trim(OUTPUT_FILES_PATH)//'/SU_stations_info.bin',exist=SU_station_file_exists)
if ( SU_station_file_exists ) then
! all processes read in stations names from STATIONS file
do irec=1,nrec
@@ -206,7 +202,7 @@
close(IIN)
! master reads in available station information
if( myrank == 0 ) then
- open(unit=IOUT_SU,file=trim(OUTPUT_FILES)//'/SU_stations_info.bin', &
+ open(unit=IOUT_SU,file=trim(OUTPUT_FILES_PATH)//'/SU_stations_info.bin', &
status='old',action='read',form='unformatted',iostat=ios)
if (ios /= 0) call exit_mpi(myrank,'error opening file '//trim(rec_filename))
@@ -221,10 +217,10 @@
read(IOUT_SU) nu
close(IOUT_SU)
! write the locations of stations, so that we can load them and write them to SU headers later
- open(unit=IOUT_SU,file=trim(OUTPUT_FILES)//'/output_list_stations.txt', &
+ open(unit=IOUT_SU,file=trim(OUTPUT_FILES_PATH)//'/output_list_stations.txt', &
status='unknown',action='write',iostat=ios)
if( ios /= 0 ) &
- call exit_mpi(myrank,'error opening file '//trim(OUTPUT_FILES)//'/output_list_stations.txt')
+ call exit_mpi(myrank,'error opening file '//trim(OUTPUT_FILES_PATH)//'/output_list_stations.txt')
do irec=1,nrec
write(IOUT_SU,*) station_name(irec),network_name(irec),x_found(irec),y_found(irec),z_found(irec)
@@ -917,10 +913,10 @@
endif
! write the locations of stations, so that we can load them and write them to SU headers later
- open(unit=IOUT_SU,file=trim(OUTPUT_FILES)//'/output_list_stations.txt', &
+ open(unit=IOUT_SU,file=trim(OUTPUT_FILES_PATH)//'/output_list_stations.txt', &
status='unknown',action='write',iostat=ios)
if( ios /= 0 ) &
- call exit_mpi(myrank,'error opening file '//trim(OUTPUT_FILES)//'/output_list_stations.txt')
+ call exit_mpi(myrank,'error opening file '//trim(OUTPUT_FILES_PATH)//'/output_list_stations.txt')
do irec=1,nrec
write(IOUT_SU,*) station_name(irec),network_name(irec),x_found(irec),y_found(irec),z_found(irec)
@@ -930,7 +926,7 @@
! stores station infos for later runs
if( SU_FORMAT ) then
- open(unit=IOUT_SU,file=trim(OUTPUT_FILES)//'/SU_stations_info.bin', &
+ open(unit=IOUT_SU,file=trim(OUTPUT_FILES_PATH)//'/SU_stations_info.bin', &
status='unknown',action='write',form='unformatted',iostat=ios)
if( ios == 0 ) then
write(IOUT_SU) islice_selected_rec,ispec_selected_rec
diff --git a/src/specfem3D/locate_source.f90 b/src/specfem3D/locate_source.f90
index 8e21b93..70477ba 100644
--- a/src/specfem3D/locate_source.f90
+++ b/src/specfem3D/locate_source.f90
@@ -139,8 +139,6 @@
double precision, dimension(6,NSOURCES) :: moment_tensor
- character(len=256) OUTPUT_FILES
-
double precision, dimension(NSOURCES) :: x_found_source,y_found_source,z_found_source
double precision, dimension(NSOURCES) :: elevation
double precision distmin
@@ -164,9 +162,6 @@
!-----------------------------------------------------------------------------------
- ! get the base pathname for output files
- call get_value_string(OUTPUT_FILES, 'OUTPUT_FILES', OUTPUT_FILES_PATH(1:len_trim(OUTPUT_FILES_PATH)))
-
! read all the sources (note: each process reads the source file)
if (USE_FORCE_POINT_SOURCE) then
call get_force(tshift_src,hdur,lat,long,depth,NSOURCES,min_tshift_src_original,factor_force_source, &
@@ -909,7 +904,7 @@
call flush_IMAIN()
! output source information to a file so that we can load it and write to SU headers later
- open(unit=IOUT_SU,file=trim(OUTPUT_FILES)//'/output_list_sources.txt',status='unknown')
+ open(unit=IOUT_SU,file=trim(OUTPUT_FILES_PATH)//'/output_list_sources.txt',status='unknown')
do isource=1,NSOURCES
write(IOUT_SU,*) x_found_source(isource),y_found_source(isource),z_found_source(isource)
enddo
diff --git a/src/specfem3D/prepare_timerun.F90 b/src/specfem3D/prepare_timerun.F90
index bad0c76..a796fc5 100644
--- a/src/specfem3D/prepare_timerun.F90
+++ b/src/specfem3D/prepare_timerun.F90
@@ -447,7 +447,7 @@
write(plot_file,"('/plot_source_time_function',i2,'.txt')") NSOURCES
endif
endif
- open(unit=IOSTF,file=trim(OUTPUT_FILES)//plot_file,status='unknown',iostat=ier)
+ open(unit=IOSTF,file=trim(OUTPUT_FILES_PATH)//plot_file,status='unknown',iostat=ier)
if( ier /= 0 ) call exit_mpi(myrank,'error opening plot_source_time_function file')
endif
diff --git a/src/specfem3D/rules.mk b/src/specfem3D/rules.mk
index 970842b..6014749 100644
--- a/src/specfem3D/rules.mk
+++ b/src/specfem3D/rules.mk
@@ -124,7 +124,6 @@ specfem3D_SHARED_OBJECTS = \
$O/get_force.shared.o \
$O/get_jacobian_boundaries.shared.o \
$O/get_shape3D.shared.o \
- $O/get_value_parameters.shared.o \
$O/gll_library.shared.o \
$O/hex_nodes.shared.o \
$O/lagrange_poly.shared.o \
diff --git a/src/specfem3D/setup_sources_receivers.f90 b/src/specfem3D/setup_sources_receivers.f90
index 1cbd039..0a20614 100644
--- a/src/specfem3D/setup_sources_receivers.f90
+++ b/src/specfem3D/setup_sources_receivers.f90
@@ -340,10 +340,8 @@
! reads in station file
if (SIMULATION_TYPE == 1) then
- call get_value_string(rec_filename, 'solver.STATIONS', &
- IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'STATIONS')
- call get_value_string(filtered_rec_filename, 'solver.STATIONS_FILTERED', &
- IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'STATIONS_FILTERED')
+ rec_filename = IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'STATIONS'
+ filtered_rec_filename = IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'STATIONS_FILTERED'
call station_filter(SUPPRESS_UTM_PROJECTION,UTM_PROJECTION_ZONE,myrank,rec_filename,filtered_rec_filename,nrec, &
LATITUDE_MIN, LATITUDE_MAX, LONGITUDE_MIN, LONGITUDE_MAX)
@@ -351,10 +349,8 @@
call synchronize_all()
else
- call get_value_string(rec_filename, 'solver.STATIONS', &
- IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'STATIONS_ADJOINT')
- call get_value_string(filtered_rec_filename, 'solver.STATIONS_FILTERED', &
- IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'STATIONS_ADJOINT_FILTERED')
+ rec_filename = IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'STATIONS_ADJOINT'
+ filtered_rec_filename = IN_DATA_FILES_PATH(1:len_trim(IN_DATA_FILES_PATH))//'STATIONS_ADJOINT_FILTERED'
call station_filter(SUPPRESS_UTM_PROJECTION,UTM_PROJECTION_ZONE,myrank,rec_filename,filtered_rec_filename,nrec, &
LATITUDE_MIN, LATITUDE_MAX, LONGITUDE_MIN, LONGITUDE_MAX)
if (nrec < 1) call exit_MPI(myrank, 'adjoint simulation needs at least one receiver')
@@ -843,7 +839,7 @@
if (myrank == 0) then
! vtk file
- open(IOVTK,file=trim(OUTPUT_FILES)//'/sr.vtk',status='unknown',iostat=ier)
+ open(IOVTK,file=trim(OUTPUT_FILES_PATH)//'/sr.vtk',status='unknown',iostat=ier)
if( ier /= 0 ) stop 'error opening sr.vtk file'
! vtk header
write(IOVTK,'(a)') '# vtk DataFile Version 2.0'
@@ -954,8 +950,8 @@
! creates additional receiver and source files
if( SIMULATION_TYPE == 1 .or. SIMULATION_TYPE == 3) then
! extracts receiver locations
- filename = trim(OUTPUT_FILES)//'/sr.vtk'
- filename_new = trim(OUTPUT_FILES)//'/receiver.vtk'
+ filename = trim(OUTPUT_FILES_PATH)//'/sr.vtk'
+ filename_new = trim(OUTPUT_FILES_PATH)//'/receiver.vtk'
! vtk file for receivers only
write(system_command, &
@@ -963,7 +959,7 @@
"'",'"',nrec,'"',NSOURCES,"'",trim(filename),trim(filename_new)
! extracts source locations
- filename_new = trim(OUTPUT_FILES)//'/source.vtk'
+ filename_new = trim(OUTPUT_FILES_PATH)//'/source.vtk'
write(system_command1, &
"('awk ',a1,'{if(NR<5) print $0;if(NR==5)print ',a1,'POINTS',i6,' float',a1,';')") &
diff --git a/src/specfem3D/specfem3D_par.f90 b/src/specfem3D/specfem3D_par.f90
index fd3c7b3..8255e23 100644
--- a/src/specfem3D/specfem3D_par.f90
+++ b/src/specfem3D/specfem3D_par.f90
@@ -201,7 +201,7 @@ module specfem_par
integer :: NPROC_XI,NPROC_ETA
double precision :: LATITUDE_MIN,LATITUDE_MAX,LONGITUDE_MIN,LONGITUDE_MAX
- character(len=256) OUTPUT_FILES,LOCAL_PATH,TOMOGRAPHY_PATH,prname,dsmname,TRAC_PATH
+ character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,prname,dsmname,TRAC_PATH
logical :: ADIOS_ENABLED
logical :: ADIOS_FOR_DATABASES, ADIOS_FOR_MESH, ADIOS_FOR_FORWARD_ARRAYS, &
diff --git a/src/specfem3D/write_movie_output.f90 b/src/specfem3D/write_movie_output.f90
index 32d6c24..9cacff9 100644
--- a/src/specfem3D/write_movie_output.f90
+++ b/src/specfem3D/write_movie_output.f90
@@ -269,7 +269,7 @@
! creates shakemap file
if(myrank == 0) then
- open(unit=IOUT,file=trim(OUTPUT_FILES)//'/shakingdata',status='unknown',form='unformatted',iostat=ier)
+ open(unit=IOUT,file=trim(OUTPUT_FILES_PATH)//'/shakingdata',status='unknown',form='unformatted',iostat=ier)
if( ier /= 0 ) stop 'error opening file shakingdata'
write(IOUT) store_val_x_all_external_mesh ! x coordinates
write(IOUT) store_val_y_all_external_mesh ! y coordinates
@@ -481,7 +481,7 @@
! file output
if(myrank == 0) then
write(outputname,"('/moviedata',i6.6)") it
- open(unit=IOUT,file=trim(OUTPUT_FILES)//outputname,status='unknown',form='unformatted',iostat=ier)
+ open(unit=IOUT,file=trim(OUTPUT_FILES_PATH)//outputname,status='unknown',form='unformatted',iostat=ier)
if( ier /= 0 ) stop 'error opening file moviedata'
write(IOUT) store_val_x_all_external_mesh ! x coordinate
write(IOUT) store_val_y_all_external_mesh ! y coordinate
@@ -739,7 +739,7 @@
! file output: note that values are only stored on free surface
if(myrank == 0) then
write(outputname,"('/moviedata',i6.6)") it
- open(unit=IOUT,file=trim(OUTPUT_FILES)//outputname,status='unknown',form='unformatted',iostat=ier)
+ open(unit=IOUT,file=trim(OUTPUT_FILES_PATH)//outputname,status='unknown',form='unformatted',iostat=ier)
if( ier /= 0 ) stop 'error opening file moviedata'
write(IOUT) store_val_x_all_external_mesh ! x coordinate
write(IOUT) store_val_y_all_external_mesh ! y coordinate
@@ -922,7 +922,7 @@
! creates shakemap file: note that values are only stored on free surface
if(myrank == 0) then
- open(unit=IOUT,file=trim(OUTPUT_FILES)//'/shakingdata',status='unknown',form='unformatted',iostat=ier)
+ open(unit=IOUT,file=trim(OUTPUT_FILES_PATH)//'/shakingdata',status='unknown',form='unformatted',iostat=ier)
if( ier /= 0 ) stop 'error opening file shakingdata'
write(IOUT) store_val_x_all_external_mesh ! x coordinates
write(IOUT) store_val_y_all_external_mesh ! y coordinates
diff --git a/src/specfem3D/write_output_SU.f90 b/src/specfem3D/write_output_SU.f90
index 404cf0f..4d7711c 100644
--- a/src/specfem3D/write_output_SU.f90
+++ b/src/specfem3D/write_output_SU.f90
@@ -50,7 +50,7 @@
if( ier /= 0 ) stop 'error allocating arrays x_found y_found z_found'
! reads in station locations from output_list file
- open(unit=IIN_SU1,file=trim(OUTPUT_FILES)//'/output_list_stations.txt',status='old',iostat=ier)
+ open(unit=IIN_SU1,file=trim(OUTPUT_FILES_PATH)//'/output_list_stations.txt',status='old',iostat=ier)
if( ier /= 0 ) stop 'error opening output_list_stations.txt file'
do irec=1,nrec
@@ -59,7 +59,7 @@
close(IIN_SU1)
! reads in source locations from output_list file
- open(unit=IIN_SU1,file=trim(OUTPUT_FILES)//'/output_list_sources.txt',status='old',iostat=ier)
+ open(unit=IIN_SU1,file=trim(OUTPUT_FILES_PATH)//'/output_list_sources.txt',status='old',iostat=ier)
if( ier /= 0 ) stop 'error opening output_list_sources.txt file'
read(IIN_SU1,*) x_found_source,y_found_source,z_found_source
More information about the CIG-COMMITS
mailing list