[cig-commits] r15010 - seismo/3D/ADJOINT_TOMO/measure_adj
carltape at geodynamics.org
carltape at geodynamics.org
Mon May 18 08:27:53 PDT 2009
Author: carltape
Date: 2009-05-18 08:27:52 -0700 (Mon, 18 May 2009)
New Revision: 15010
Modified:
seismo/3D/ADJOINT_TOMO/measure_adj/Makefile
seismo/3D/ADJOINT_TOMO/measure_adj/mt_measure_adj.f90
seismo/3D/ADJOINT_TOMO/measure_adj/mt_sub.f90
Log:
Modified long lines to be less than 132 for gfortran -- somehow the flag to allow long lines was implemented properly.
Modified: seismo/3D/ADJOINT_TOMO/measure_adj/Makefile
===================================================================
--- seismo/3D/ADJOINT_TOMO/measure_adj/Makefile 2009-05-18 13:49:10 UTC (rev 15009)
+++ seismo/3D/ADJOINT_TOMO/measure_adj/Makefile 2009-05-18 15:27:52 UTC (rev 15010)
@@ -3,7 +3,7 @@
#F90_FLAGS = -O2 -ffixed-line-length-132
F90_FLAGS = -O2
-LIB = -L/opt/seismo/lib -lDRWFiles -lf90recipes_gfortran -lDSacio -lDSacLib -lSacTools -lm
+LIB = -L/opt/seismo/lib -lDRWFiles -lf90recipes -lDSacio -lDSacLib -lSacTools -lm
MOD = mt_constants mt_variables mt_sub2 mt_sub
Modified: seismo/3D/ADJOINT_TOMO/measure_adj/mt_measure_adj.f90
===================================================================
--- seismo/3D/ADJOINT_TOMO/measure_adj/mt_measure_adj.f90 2009-05-18 13:49:10 UTC (rev 15009)
+++ seismo/3D/ADJOINT_TOMO/measure_adj/mt_measure_adj.f90 2009-05-18 15:27:52 UTC (rev 15010)
@@ -31,7 +31,8 @@
!double precision :: tshift_f1f2, cc_max_f1f2
double precision, dimension(NPT) :: dtau_w, dlnA_w, err_dt, err_dlnA, dzr0, dzr20
complex*16, dimension(NPT) :: trans_mtm
- integer :: nlen, nlen0, i_left, i_pmax_dat, i_pmax_syn, i_right, i_right0, istart,sta_len,net_len,chan_len, ipair, npairs, nwin, itmax
+ integer :: nlen, nlen0, i_left, i_pmax_dat, i_pmax_syn, i_right, i_right0, istart, &
+ sta_len,net_len,chan_len, ipair, npairs, nwin, itmax
logical :: use_trace, flag_short_window
!double precision :: trbdndw, a
!integer :: iord, passes
@@ -268,7 +269,8 @@
print *, 'fstart0/fend0 :', fstart0, fend0
print *, 'fstart/fend :', fstart, fend
print *, 'Tpmax :', T_pmax_dat, T_pmax_syn
-!!$ if (use_trace .and. (cc_max < BEFORE_QUALITY .or. cc_max_f1f2 < AFTER_QUALITY .or. abs(tshift_xc) > BEFORE_TSHIFT .or. abs(tshift_f1f2) > AFTER_TSHIFT)) then
+!!$ if (use_trace .and. (cc_max < BEFORE_QUALITY .or. cc_max_f1f2 < AFTER_QUALITY .or. abs(tshift_xc) &
+!!$ > BEFORE_TSHIFT .or. abs(tshift_f1f2) > AFTER_TSHIFT)) then
!!$ use_trace = .false.
!!$ if (DISPLAY_DETAILS) then
!!$ print *, 'Fail if ANY of these is true :'
Modified: seismo/3D/ADJOINT_TOMO/measure_adj/mt_sub.f90
===================================================================
--- seismo/3D/ADJOINT_TOMO/measure_adj/mt_sub.f90 2009-05-18 13:49:10 UTC (rev 15009)
+++ seismo/3D/ADJOINT_TOMO/measure_adj/mt_sub.f90 2009-05-18 15:27:52 UTC (rev 15010)
@@ -441,7 +441,8 @@
if(abs(bot_mtm(i)).le.abs(wtr_use)) trans_mtm(i) = top_mtm(i) /(bot_mtm(i)+wtr_use)
enddo
- call write_trans(filename,trans_mtm,wvec,fnum,i_right,idf_new,df,tshift_xc,phi_mul(:,iom),abs_mul(:,iom),dtau_mul(:,iom),dlnA_mul(:,iom))
+ call write_trans(filename,trans_mtm,wvec,fnum,i_right,idf_new,df, &
+ tshift_xc,phi_mul(:,iom),abs_mul(:,iom),dtau_mul(:,iom),dlnA_mul(:,iom))
enddo ! iom
@@ -597,7 +598,8 @@
double precision :: waveform_chi, waveform_d2, waveform_s2, waveform_temp1, waveform_temp2, waveform_temp3
! waveform adjoint source is passed by tr_adj_src and tr_chi
- if (iker == 0 .and. (present(am_adj_src) .or. present(am_chi))) stop 'am_adj_src and am_chi are not needed for iker = 0 (waveform adjoint source case)'
+ if (iker == 0 .and. (present(am_adj_src) .or. present(am_chi))) stop &
+ 'am_adj_src and am_chi are not needed for iker = 0 (waveform adjoint source case)'
! check the window length
if (istart + nlen > NDIM) stop 'Check istart + nlen and NPT'
@@ -995,14 +997,16 @@
! within the frequency range of interest, check various criteria
! CHT: dtau_w(j) --> abs(dtau_w(j)) for the first criterion
do j = i_left, i_right
- if (use_trace .and. (abs(dtau_w(j)) > 1./(DT_FAC*fvec(j)) .or. err_dt(j) > 1./(ERR_FAC*fvec(j)) .or. abs(dtau_w(j)) > DT_MAX_SCALE*abs(tshift_xc))) then
+ if (use_trace .and. (abs(dtau_w(j)) > 1./(DT_FAC*fvec(j)) .or. err_dt(j) > 1./(ERR_FAC*fvec(j)) &
+ .or. abs(dtau_w(j)) > DT_MAX_SCALE*abs(tshift_xc))) then
use_trace = .false.
if (DISPLAY_DETAILS) then
print *, 'rejecting trace (T leads to rejection):'
print *, ' f = ', fvec(j), j
print *, 'DT_FAC (lower) : ', abs(dtau_w(j)), 1./(DT_FAC * fvec(j)), abs(dtau_w(j)) > 1./(DT_FAC * fvec(j))
print *, 'ERR_FAC (lower) : ', err_dt(j), 1./(ERR_FAC * fvec(j)), err_dt(j) > 1./(ERR_FAC * fvec(j))
- print *, 'DT_MAX_SCALE (lower) : ', abs(dtau_w(j)), DT_MAX_SCALE*abs(tshift_xc), abs(dtau_w(j)) > DT_MAX_SCALE*abs(tshift_xc)
+ print *, 'DT_MAX_SCALE (lower) : ', abs(dtau_w(j)), DT_MAX_SCALE*abs(tshift_xc), &
+ abs(dtau_w(j)) > DT_MAX_SCALE*abs(tshift_xc)
!stop 'testing MT trace rejection'
endif
endif
@@ -1289,7 +1293,8 @@
! ---------------------------------------------------------------------------
- subroutine write_trans(filename,trans, wvec, fnum, i_right, idf_new, df, tshift, phi_wt, abs_wt, dtau_wt, dlnA_wt, dtau_wa, dlnA_wa)
+ subroutine write_trans(filename,trans, wvec, fnum, i_right, idf_new, df, tshift, &
+ phi_wt, abs_wt, dtau_wt, dlnA_wt, dtau_wa, dlnA_wa)
character(len=*), intent(in) :: filename
complex*16, intent(in) :: trans(:)
@@ -1425,7 +1430,8 @@
! -----------------------------------------------------------------------
- subroutine reconstruct_syn(datafile,filename, wseis_syn, wvec, dtau_wt, dlnA_wt, i_right, tstart, dt, nlen, tseis_recon, tseis_recon_dt)
+ subroutine reconstruct_syn(datafile,filename, wseis_syn, wvec, dtau_wt, dlnA_wt, &
+ i_right, tstart, dt, nlen, tseis_recon, tseis_recon_dt)
! reconstruct the synthetics using multitaper measurements:
! (1) apply dtau(w) to get tseis_recon_dt
More information about the CIG-COMMITS
mailing list