[cig-commits] [commit] devel: changes output format of seismogram names to **network**.**station**.. (72999fd)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Jan 8 11:53:50 PST 2015
Repository : https://github.com/geodynamics/specfem3d_globe
On branch : devel
Link : https://github.com/geodynamics/specfem3d_globe/compare/3ad4ad0dda8bce0265d5fa9ed7567ee338346d81...133892d126073f174444ba2cb859e8cc72f5478e
>---------------------------------------------------------------
commit 72999fdaa5d46f24f14254f1e31cdc1bdc772efc
Author: daniel peter <peterda at ethz.ch>
Date: Wed Jan 7 21:17:58 2015 +0100
changes output format of seismogram names to **network**.**station**..
>---------------------------------------------------------------
72999fdaa5d46f24f14254f1e31cdc1bdc772efc
DATA/detect_duplicates_stations_file.f90 | 14 ++++++++------
src/gpu/prepare_mesh_constants_gpu.c | 3 +--
src/specfem3D/compute_arrays_source.f90 | 9 ++++++---
src/specfem3D/locate_receivers.f90 | 20 ++++++++++----------
src/specfem3D/read_adjoint_sources.f90 | 9 +++++----
src/specfem3D/setup_sources_receivers.f90 | 2 +-
src/specfem3D/write_seismograms.f90 | 11 ++++++-----
src/tomography/rules.mk | 3 +++
8 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/DATA/detect_duplicates_stations_file.f90 b/DATA/detect_duplicates_stations_file.f90
index d27a0d2..62646bf 100644
--- a/DATA/detect_duplicates_stations_file.f90
+++ b/DATA/detect_duplicates_stations_file.f90
@@ -58,9 +58,10 @@
do irec2 = irec+1,nrec
if(is_a_duplicate(irec2)) cycle
if(station_name(irec) == station_name(irec2) .and. network_name(irec) == network_name(irec2)) then
- print *,station_name(irec2)(1:len_trim(station_name(irec2))),'.', &
- network_name(irec2)(1:len_trim(network_name(irec2))),' is a duplicate of ',&
- station_name(irec)(1:len_trim(station_name(irec))),'.',network_name(irec)(1:len_trim(network_name(irec))), &
+ print *, &
+ network_name(irec2)(1:len_trim(network_name(irec2))),'.',station_name(irec2)(1:len_trim(station_name(irec2))), &
+ ' is a duplicate of ',&
+ network_name(irec)(1:len_trim(network_name(irec))),'.',station_name(irec)(1:len_trim(station_name(irec))), &
' (same name)'
is_a_duplicate(irec2) = .true.
endif
@@ -75,9 +76,10 @@
do irec2 = irec+1,nrec
if(is_a_duplicate(irec2)) cycle
if(stlat(irec) == stlat(irec2) .and. stlon(irec) == stlon(irec2)) then
- print *,station_name(irec2)(1:len_trim(station_name(irec2))),'.', &
- network_name(irec2)(1:len_trim(network_name(irec2))),' is a duplicate of ',&
- station_name(irec)(1:len_trim(station_name(irec))),'.',network_name(irec)(1:len_trim(network_name(irec))), &
+ print *, &
+ network_name(irec2)(1:len_trim(network_name(irec2))),'.',station_name(irec2)(1:len_trim(station_name(irec2))), &
+ ' is a duplicate of ', &
+ network_name(irec)(1:len_trim(network_name(irec))),'.',station_name(irec)(1:len_trim(station_name(irec))), &
' (same lat/long)'
is_a_duplicate(irec2) = .true.
endif
diff --git a/src/gpu/prepare_mesh_constants_gpu.c b/src/gpu/prepare_mesh_constants_gpu.c
index d8eecfa..934ee52 100644
--- a/src/gpu/prepare_mesh_constants_gpu.c
+++ b/src/gpu/prepare_mesh_constants_gpu.c
@@ -29,7 +29,6 @@
#include "mesh_constants_gpu.h"
-
/* ----------------------------------------------------------------------------------------------- */
// OpenCL setup
/* ----------------------------------------------------------------------------------------------- */
@@ -393,7 +392,7 @@ void FC_FUNC_ (prepare_constants_device,
// buffer for crust_mantle arrays has maximum size
if (mp->compute_and_store_strain){
- size = max(mp->NGLOB_CRUST_MANTLE, NGLL3 * (mp->NSPEC_CRUST_MANTLE));
+ size = MAX(mp->NGLOB_CRUST_MANTLE, NGLL3 * (mp->NSPEC_CRUST_MANTLE));
} else{
size = mp->NGLOB_CRUST_MANTLE;
}
diff --git a/src/specfem3D/compute_arrays_source.f90 b/src/specfem3D/compute_arrays_source.f90
index e01bcac..2bf651c 100644
--- a/src/specfem3D/compute_arrays_source.f90
+++ b/src/specfem3D/compute_arrays_source.f90
@@ -232,9 +232,12 @@
!read(IIN_ADJ,*,iostat=ios) junk, adj_src(icomp,itime-it_start+1)
read(IIN_ADJ,*,iostat=ios) junk, adj_src(icomp,index_i)
- if (ios /= 0) &
- call exit_MPI(myrank, &
- 'file '//trim(filename)//' has wrong length, please check with your simulation duration')
+ if (ios /= 0) then
+ print*,'Error reading adjoint source: ',trim(filename)
+ print*,'rank ',myrank,' - time step: ',itime,' it_start: ',it_start,' it_end: ',it_end
+ print*,' ',trim(filename)//'has wrong length, please check with your simulation duration'
+ call exit_MPI(myrank,'file '//trim(filename)//' has wrong length, please check with your simulation duration')
+ endif
enddo
close(IIN_ADJ)
diff --git a/src/specfem3D/locate_receivers.f90 b/src/specfem3D/locate_receivers.f90
index abe59b1..8c24853 100644
--- a/src/specfem3D/locate_receivers.f90
+++ b/src/specfem3D/locate_receivers.f90
@@ -527,8 +527,9 @@
write(IMAIN,*) 'Stations sorted by epicentral distance:'
do i = 1,nrec
irec = irec_dist_ordered(i)
- write(IMAIN,'(a,i6,a,a24,a,f12.6,a)') ' Station #',irec,': ',trim(station_name(irec))//'.'//trim(network_name(irec)), &
- ' epicentral distance: ',sngl(epidist(irec)),' degrees'
+ write(IMAIN,'(a,i6,a,a24,a,f12.6,a)') ' Station #',irec,': ', &
+ trim(network_name(irec))//'.'//trim(station_name(irec)), &
+ ' epicentral distance: ',sngl(epidist(irec)),' degrees'
enddo
deallocate(irec_dist_ordered)
@@ -859,7 +860,7 @@
if (DISPLAY_DETAILS_STATIONS .or. final_distance(irec) > 0.01d0) then
write(IMAIN,*)
- write(IMAIN,*) 'Station #',irec,': ',trim(station_name(irec))//'.'//trim(network_name(irec))
+ write(IMAIN,*) 'Station #',irec,': ',trim(network_name(irec))//'.'//trim(station_name(irec))
write(IMAIN,*) ' original latitude: ',sngl(stlat(irec))
write(IMAIN,*) ' original longitude: ',sngl(stlon(irec))
write(IMAIN,*) ' epicentral distance: ',sngl(epidist(irec))
@@ -871,7 +872,7 @@
! add warning if estimate is poor
! (usually means receiver outside the mesh given by the user)
if (final_distance(irec) > THRESHOLD_EXCLUDE_STATION) then
- write(IMAIN,*) 'Station #',irec,': ',trim(station_name(irec))//'.'//trim(network_name(irec))
+ write(IMAIN,*) 'Station #',irec,': ',trim(network_name(irec))//'.'//trim(station_name(irec))
write(IMAIN,*) '*****************************************************************'
if (NCHUNKS_VAL == 6) then
write(IMAIN,*) '***** WARNING: receiver location estimate is poor, therefore receiver excluded *****'
@@ -947,9 +948,9 @@
write(IOUT,*) 'total number of stations: ',nrec
write(IOUT,*)
do irec = 1,nrec
- write(IOUT,*) station_name(irec)(1:len_trim(station_name(irec))), &
- '.',network_name(irec)(1:len_trim(network_name(irec))), &
- ' epicentral distance ',sngl(epidist(irec)),' deg'
+ write(IOUT,*) &
+ network_name(irec)(1:len_trim(network_name(irec))),'.',station_name(irec)(1:len_trim(station_name(irec))), &
+ ' epicentral distance ',sngl(epidist(irec)),' deg'
enddo
close(IOUT)
@@ -960,9 +961,8 @@
if (ier /= 0 ) call exit_MPI(myrank,'Error opening file STATIONS_FILTERED')
! loop on all the stations to read station information
do irec = 1,nrec
- write(IOUT,'(a8,1x,a3,6x,f8.4,1x,f9.4,1x,f6.1,1x,f6.1)') trim(station_name(irec)),&
- trim(network_name(irec)),sngl(stlat(irec)),&
- sngl(stlon(irec)),sngl(stele(irec)),sngl(stbur(irec))
+ write(IOUT,'(a8,1x,a3,6x,f8.4,1x,f9.4,1x,f6.1,1x,f6.1)') trim(station_name(irec)),trim(network_name(irec)), &
+ sngl(stlat(irec)),sngl(stlon(irec)),sngl(stele(irec)),sngl(stbur(irec))
enddo
! close receiver file
close(IOUT)
diff --git a/src/specfem3D/read_adjoint_sources.f90 b/src/specfem3D/read_adjoint_sources.f90
index f496cff..28d38ac 100644
--- a/src/specfem3D/read_adjoint_sources.f90
+++ b/src/specfem3D/read_adjoint_sources.f90
@@ -161,10 +161,10 @@
! increases counter
irec_local = irec_local + 1
- ! adjoint source file name **sta**.**net**
- adj_source_file = trim(station_name(irec))//'.'//trim(network_name(irec))
+ ! adjoint source file name **net**.**sta**
+ adj_source_file = trim(network_name(irec))//'.'//trim(station_name(irec))
- ! reads in **sta**.**net**.**.adj files
+ ! reads in *.adj files
call compute_arrays_source_adjoint(myrank,adj_source_file, &
xi_receiver(irec),eta_receiver(irec),gamma_receiver(irec), &
nu(:,:,irec),tmp_sourcearray, &
@@ -215,8 +215,9 @@
character(len=3),dimension(NDIM) :: comp
character(len=2) :: bic
+ ! checks **net**.**sta**.**MX**.adj files for correct number of time steps
! root file name
- adj_source_file = trim(station_name(irec))//'.'//trim(network_name(irec))
+ adj_source_file = trim(network_name(irec))//'.'//trim(station_name(irec))
! bandwidth code
! by Ebru
diff --git a/src/specfem3D/setup_sources_receivers.f90 b/src/specfem3D/setup_sources_receivers.f90
index c3a319d..8f6ed51 100644
--- a/src/specfem3D/setup_sources_receivers.f90
+++ b/src/specfem3D/setup_sources_receivers.f90
@@ -422,7 +422,7 @@
! updates counter
nadj_rec_local = nadj_rec_local + 1
- ! checks **sta**.**net**.**MX**.adj files for correct number of time steps
+ ! checks **net**.**sta**.**MX**.adj files for correct number of time steps
call check_adjoint_sources(irec,nadj_files_found)
endif
enddo
diff --git a/src/specfem3D/write_seismograms.f90 b/src/specfem3D/write_seismograms.f90
index 2c6fbb2..c159cae 100644
--- a/src/specfem3D/write_seismograms.f90
+++ b/src/specfem3D/write_seismograms.f90
@@ -504,12 +504,13 @@ contains
call exit_MPI(myrank,'wrong length of network name')
! create the name of the seismogram file using the station name and network name
- write(sisname,"('/',a,'.',a,'.',a3,'.sem')") station_name(irec)(1:length_station_name), &
- network_name(irec)(1:length_network_name),chn
+ ! using format: **net**.**sta**.channel
+ write(sisname,"('/',a,'.',a,'.',a3,'.sem')") network_name(irec)(1:length_network_name), &
+ station_name(irec)(1:length_station_name),chn
! create this name also for the text line added to the unique big seismogram file
- write(sisname_big_file,"(a,'.',a,'.',a3,'.sem')") station_name(irec)(1:length_station_name), &
- network_name(irec)(1:length_network_name),chn
+ write(sisname_big_file,"(a,'.',a,'.',a3,'.sem')") network_name(irec)(1:length_network_name), &
+ station_name(irec)(1:length_station_name),chn
! SAC output format
if (OUTPUT_SEISMOS_SAC_ALPHANUM .or. OUTPUT_SEISMOS_SAC_BINARY ) &
@@ -585,7 +586,7 @@ contains
! create the name of the seismogram file for each slice
! file name includes the name of the station, the network and the component
- write(sisname,"(a2,i6.6,'.',a,'.',a3,'.sem')") '/S',irec,'NT',chn
+ write(sisname,"(a3,'.',a1,i6.6,'.',a3,'.sem')") '/NT','S',irec,chn
! save seismograms in text format with no subsampling.
! Because we do not subsample the output, this can result in large files
diff --git a/src/tomography/rules.mk b/src/tomography/rules.mk
index 4243976..d37cf07 100644
--- a/src/tomography/rules.mk
+++ b/src/tomography/rules.mk
@@ -183,6 +183,9 @@ xconvert_model_file_adios_OBJECTS = \
xconvert_model_file_adios_SHARED_OBJECTS = \
$O/shared_par.shared_module.o \
$O/parallel.sharedmpi.o \
+ $O/param_reader.cc.o \
+ $O/read_parameter_file.shared.o \
+ $O/read_value_parameters.shared.o \
$O/adios_helpers_definitions.shared_adios_module.o \
$O/adios_helpers_writers.shared_adios_module.o \
$O/adios_helpers.shared_adios.o \
More information about the CIG-COMMITS
mailing list