[cig-commits] r21763 - in seismo/3D/SPECFEM3D/branches/coupling_vadim/src: decompose_mesh generate_databases shared specfem3D
vadim at geodynamics.org
vadim at geodynamics.org
Mon Apr 8 09:39:25 PDT 2013
Author: vadim
Date: 2013-04-08 09:39:25 -0700 (Mon, 08 Apr 2013)
New Revision: 21763
Modified:
seismo/3D/SPECFEM3D/branches/coupling_vadim/src/decompose_mesh/decompose_mesh.F90
seismo/3D/SPECFEM3D/branches/coupling_vadim/src/decompose_mesh/program_decompose_mesh.f90
seismo/3D/SPECFEM3D/branches/coupling_vadim/src/generate_databases/generate_databases.f90
seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/combine_vol_data.f90
seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/create_movie_shakemap_AVS_DX_GMT.f90
seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/read_parameter_file.f90
seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/smooth_vol_data.f90
seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/sum_kernels.f90
seismo/3D/SPECFEM3D/branches/coupling_vadim/src/specfem3D/initialize_simulation.f90
seismo/3D/SPECFEM3D/branches/coupling_vadim/src/specfem3D/specfem3D_par.f90
Log:
add TRAC_PATH : path for DSM dierectory in read_parameter_file
Modified: seismo/3D/SPECFEM3D/branches/coupling_vadim/src/decompose_mesh/decompose_mesh.F90
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/src/decompose_mesh/decompose_mesh.F90 2013-04-08 16:19:21 UTC (rev 21762)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/src/decompose_mesh/decompose_mesh.F90 2013-04-08 16:39:25 UTC (rev 21763)
@@ -152,7 +152,7 @@
APPROXIMATE_OCEAN_LOAD,TOPOGRAPHY,USE_FORCE_POINT_SOURCE
logical :: STACEY_ABSORBING_CONDITIONS,SAVE_FORWARD,STACEY_INSTEAD_OF_FREE_SURFACE
logical :: ANISOTROPY,SAVE_MESH_FILES,USE_RICKER_TIME_FUNCTION,PRINT_SOURCE_TIME_FUNCTION
- character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH
+ character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,TRACT_PATH !! VM VM added TRACT_PATH
integer :: IMODEL
contains
Modified: seismo/3D/SPECFEM3D/branches/coupling_vadim/src/decompose_mesh/program_decompose_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/src/decompose_mesh/program_decompose_mesh.f90 2013-04-08 16:19:21 UTC (rev 21762)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/src/decompose_mesh/program_decompose_mesh.f90 2013-04-08 16:39:25 UTC (rev 21763)
@@ -81,7 +81,7 @@
NTSTEP_BETWEEN_READ_ADJSRC,NOISE_TOMOGRAPHY, &
USE_FORCE_POINT_SOURCE,STACEY_INSTEAD_OF_FREE_SURFACE, &
USE_RICKER_TIME_FUNCTION,OLSEN_ATTENUATION_RATIO,PML_CONDITIONS, &
- PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL)
+ PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL,TRAC_PATH)
! reads in (CUBIT) mesh files: mesh_file,nodes_coord_file, ...
call read_mesh_files()
Modified: seismo/3D/SPECFEM3D/branches/coupling_vadim/src/generate_databases/generate_databases.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/src/generate_databases/generate_databases.f90 2013-04-08 16:19:21 UTC (rev 21762)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/src/generate_databases/generate_databases.f90 2013-04-08 16:39:25 UTC (rev 21763)
@@ -253,7 +253,7 @@
use generate_databases_par
implicit none
-! reads Par_file
+! reads Par_file !! VM VM add TRAC_PATH
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
@@ -265,7 +265,7 @@
NTSTEP_BETWEEN_READ_ADJSRC,NOISE_TOMOGRAPHY, &
USE_FORCE_POINT_SOURCE,STACEY_INSTEAD_OF_FREE_SURFACE, &
USE_RICKER_TIME_FUNCTION,OLSEN_ATTENUATION_RATIO,PML_CONDITIONS, &
- PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL)
+ PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL,TRAC_PATH)
! check that the code is running with the requested nb of processes
if(sizeprocs /= NPROC) then
Modified: seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/combine_vol_data.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/combine_vol_data.f90 2013-04-08 16:19:21 UTC (rev 21762)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/combine_vol_data.f90 2013-04-08 16:39:25 UTC (rev 21763)
@@ -101,7 +101,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
- character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH
+ character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,TRAC_PATH
integer :: IMODEL
! checks given arguments
@@ -173,7 +173,7 @@
HIGH_RESOLUTION_MESH = .true.
endif
- ! needs local_path for mesh files
+ ! needs local_path for mesh files !! VM VM added TRAC_PATH
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
@@ -185,7 +185,7 @@
NTSTEP_BETWEEN_READ_ADJSRC,NOISE_TOMOGRAPHY, &
USE_FORCE_POINT_SOURCE,STACEY_INSTEAD_OF_FREE_SURFACE, &
USE_RICKER_TIME_FUNCTION,OLSEN_ATTENUATION_RATIO,PML_CONDITIONS, &
- PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL)
+ PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL,TRAC_PATH)
print *, 'Slice list: '
print *, node_list(1:num_node)
Modified: seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/create_movie_shakemap_AVS_DX_GMT.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/create_movie_shakemap_AVS_DX_GMT.f90 2013-04-08 16:19:21 UTC (rev 21762)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/create_movie_shakemap_AVS_DX_GMT.f90 2013-04-08 16:39:25 UTC (rev 21763)
@@ -96,7 +96,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
- character(len=256) OUTPUT_FILES,LOCAL_PATH,TOMOGRAPHY_PATH
+ character(len=256) OUTPUT_FILES,LOCAL_PATH,TOMOGRAPHY_PATH,TRAC_PATH
integer NPROC
integer ier
integer MOVIE_TYPE,IMODEL
@@ -127,7 +127,7 @@
print *,'reading parameter file'
print *
- ! read the parameter file
+ ! read the parameter file !! VM VM added TRAC_PATH
call read_parameter_file(NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
@@ -139,7 +139,7 @@
NTSTEP_BETWEEN_READ_ADJSRC,NOISE_TOMOGRAPHY, &
USE_FORCE_POINT_SOURCE,STACEY_INSTEAD_OF_FREE_SURFACE, &
USE_RICKER_TIME_FUNCTION,OLSEN_ATTENUATION_RATIO,PML_CONDITIONS, &
- PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL)
+ PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL,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)))
Modified: seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/read_parameter_file.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/read_parameter_file.f90 2013-04-08 16:19:21 UTC (rev 21762)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/read_parameter_file.f90 2013-04-08 16:39:25 UTC (rev 21763)
@@ -34,7 +34,7 @@
SIMULATION_TYPE,SAVE_FORWARD,NTSTEP_BETWEEN_READ_ADJSRC,NOISE_TOMOGRAPHY, &
USE_FORCE_POINT_SOURCE,STACEY_INSTEAD_OF_FREE_SURFACE, &
USE_RICKER_TIME_FUNCTION,OLSEN_ATTENUATION_RATIO,PML_CONDITIONS, &
- PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL)
+ PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL,TRAC_PATH)
implicit none
@@ -53,7 +53,7 @@
logical USE_FORCE_POINT_SOURCE,STACEY_INSTEAD_OF_FREE_SURFACE,USE_RICKER_TIME_FUNCTION
logical PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE
- character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,CMTSOLUTION,FORCESOLUTION
+ character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,CMTSOLUTION,FORCESOLUTION,TRAC_PATH ! VM VM add TRAC_PATH for DSM
! local variables
integer ::ios,icounter,isource,idummy,nproc_eta_old,nproc_xi_old
@@ -170,7 +170,11 @@
if(err_occurred() /= 0) return
call read_value_logical(PRINT_SOURCE_TIME_FUNCTION, 'solver.PRINT_SOURCE_TIME_FUNCTION')
if(err_occurred() /= 0) return
-
+ !! VM VM read the traction path directory
+ if (USE_DSM) then
+ call read_value_string(TRAC_PATH, 'TRAC_PATH')
+ if(err_occurred() /= 0) return
+ end if
! close parameter file
call close_parameter_file()
Modified: seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/smooth_vol_data.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/smooth_vol_data.f90 2013-04-08 16:19:21 UTC (rev 21762)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/smooth_vol_data.f90 2013-04-08 16:39:25 UTC (rev 21763)
@@ -109,7 +109,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
- character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH
+ character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,TRAC_PATH
integer :: MOVIE_TYPE,IMODEL
! smoothing parameters
@@ -211,7 +211,7 @@
print*," out dir: ",trim(outdir)
endif
- ! needs local_path for mesh files
+ ! needs local_path for mesh files !! VM VM added TRAC_PATH
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
@@ -223,7 +223,7 @@
NTSTEP_BETWEEN_READ_ADJSRC,NOISE_TOMOGRAPHY, &
USE_FORCE_POINT_SOURCE,STACEY_INSTEAD_OF_FREE_SURFACE, &
USE_RICKER_TIME_FUNCTION,OLSEN_ATTENUATION_RATIO,PML_CONDITIONS, &
- PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL)
+ PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL,TRAC_PATH)
! checks if number of MPI process as specified
if (sizeprocs /= NPROC) then
Modified: seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/sum_kernels.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/sum_kernels.f90 2013-04-08 16:19:21 UTC (rev 21762)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/src/shared/sum_kernels.f90 2013-04-08 16:39:25 UTC (rev 21763)
@@ -116,7 +116,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
- character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH
+ character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,TRAC_PATH
! ============ program starts here =====================
! initialize the MPI communicator and start the NPROCTOT MPI processes
@@ -150,7 +150,7 @@
write(*,*)
endif
- ! needs local_path for mesh files
+ ! needs local_path for mesh files !! VM VM added TRAC_PATH
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
@@ -162,7 +162,7 @@
NTSTEP_BETWEEN_READ_ADJSRC,NOISE_TOMOGRAPHY, &
USE_FORCE_POINT_SOURCE,STACEY_INSTEAD_OF_FREE_SURFACE, &
USE_RICKER_TIME_FUNCTION,OLSEN_ATTENUATION_RATIO,PML_CONDITIONS, &
- PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL)
+ PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL,TRAC_PATH)
! checks if number of MPI process as specified
if (sizeprocs /= NPROC) then
Modified: seismo/3D/SPECFEM3D/branches/coupling_vadim/src/specfem3D/initialize_simulation.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/src/specfem3D/initialize_simulation.f90 2013-04-08 16:19:21 UTC (rev 21762)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/src/specfem3D/initialize_simulation.f90 2013-04-08 16:39:25 UTC (rev 21763)
@@ -38,7 +38,7 @@
integer :: ier
- ! read the parameter file
+ ! read the parameter file !! VM VM added TRACT_PATH
call read_parameter_file( NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
UTM_PROJECTION_ZONE,SUPPRESS_UTM_PROJECTION,TOMOGRAPHY_PATH, &
ATTENUATION,USE_OLSEN_ATTENUATION,LOCAL_PATH,NSOURCES, &
@@ -50,7 +50,7 @@
NTSTEP_BETWEEN_READ_ADJSRC,NOISE_TOMOGRAPHY, &
USE_FORCE_POINT_SOURCE,STACEY_INSTEAD_OF_FREE_SURFACE, &
USE_RICKER_TIME_FUNCTION,OLSEN_ATTENUATION_RATIO,PML_CONDITIONS, &
- PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL)
+ PML_INSTEAD_OF_FREE_SURFACE,f0_FOR_PML,IMODEL,TRAC_PATH)
!! DK DK added this for now (March 2013) because CPML is not yet implemented for USE_DEVILLE_PRODUCTS;
!! DK DK we will soon add it (in a month or so)
Modified: seismo/3D/SPECFEM3D/branches/coupling_vadim/src/specfem3D/specfem3D_par.f90
===================================================================
--- seismo/3D/SPECFEM3D/branches/coupling_vadim/src/specfem3D/specfem3D_par.f90 2013-04-08 16:19:21 UTC (rev 21762)
+++ seismo/3D/SPECFEM3D/branches/coupling_vadim/src/specfem3D/specfem3D_par.f90 2013-04-08 16:39:25 UTC (rev 21763)
@@ -193,9 +193,9 @@
! parameters read from mesh parameter file
integer :: NPROC_XI,NPROC_ETA
double precision :: LATITUDE_MIN,LATITUDE_MAX,LONGITUDE_MIN,LONGITUDE_MAX
+! VM VM added path for DSM
+ character(len=256) OUTPUT_FILES,LOCAL_PATH,TOMOGRAPHY_PATH,prname,TRAC_PATH,dsmname
- character(len=256) OUTPUT_FILES,LOCAL_PATH,TOMOGRAPHY_PATH,prname
-
! names of the data files for all the processors in MPI
character(len=256) outputname
More information about the CIG-COMMITS
mailing list