zhangyiss/DSurfTomo
1
0
Fork 0
mirror of https://github.com/HongjianFang/DSurfTomo.git synced 2025-05-07 15:41:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

comment some unnecessary warnings

Browse Source 
before vorotomo
This commit is contained in:
Hongjian Fang 2019-01-12 12:56:08 -05:00
parent f2a0f8bc4d
commit 404f55cd0f
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CalSurfG.f90
View File

@ -1030,8 +1030,8 @@ subroutine CalSurfG(nx,ny,nz,nparpi,vels,iw,rw,col,dsurf, &
integer writepath integer writepath
integer ig, igroup integer ig, igroup
gdx=5 gdx=8
gdz=5 gdz=8
asgr=1 asgr=1
sgdl=8 sgdl=8
sgs=8 sgs=8
@ -1282,6 +1282,7 @@ subroutine CalSurfG(nx,ny,nz,nparpi,vels,iw,rw,col,dsurf, &
ALLOCATE(ttnr(idm2,idm1)) ALLOCATE(ttnr(idm2,idm1))
ALLOCATE(nstsr(idm2,idm1)) ALLOCATE(nstsr(idm2,idm1))
ENDIF ENDIF
!ttnr(1:nnzb,1:nnxb)=ttn(1:nnzb,1:nnxb)
ttnr=ttn ttnr=ttn
nstsr=nsts nstsr=nsts
ogx=vnl ogx=vnl

28
src/main.f90
View File

@ -99,7 +99,7 @@ program SurfTomo
integer writepath integer writepath
real averdws real averdws
real maxnorm real maxnorm
real threshold,threshold0 real threshold0
! FOR MODEL VARIATION ! FOR MODEL VARIATION
!------------------------------------------------ !------------------------------------------------
@ -431,7 +431,7 @@ program SurfTomo
enddo enddo
averdws=averdws/maxvp averdws=averdws/maxvp
write(66,*)'Maximum and Average DWS values:',maxnorm,averdws write(66,*)'Maximum and Average DWS values:',maxnorm,averdws
write(66,*)'Threshold is:',threshold !write(66,*)'Threshold is:',threshold
! WRITE OUT RESIDUAL FOR THE FIRST AND LAST ITERATION ! WRITE OUT RESIDUAL FOR THE FIRST AND LAST ITERATION
if(iter.eq.1) then if(iter.eq.1) then
@ -514,10 +514,10 @@ program SurfTomo
leniw = 2*nar+1 leniw = 2*nar+1
lenrw = nar lenrw = nar
dv = 0 dv = 0
atol = 1e-3 atol = 1e-4
btol = 1e-3 btol = 1e-4
conlim = 1200 conlim = 100
itnlim = 1000 itnlim = 400
istop = 0 istop = 0
anorm = 0.0 anorm = 0.0
acond = 0.0 acond = 0.0
@ -528,8 +528,15 @@ program SurfTomo
call LSMR(m, n, leniw, lenrw,iw,rw,cbst, damp,& call LSMR(m, n, leniw, lenrw,iw,rw,cbst, damp,&
atol, btol, conlim, itnlim, localSize, nout,& atol, btol, conlim, itnlim, localSize, nout,&
dv, istop, itn, anorm, acond, rnorm, arnorm, xnorm) dv, istop, itn, anorm, acond, rnorm, arnorm, xnorm)
if(istop==3) print*,'istop = 3, large condition number' !if(istop==3) print*,'istop = 3, large condition number'
mean = sum(cbst(1:dall))/dall
std_devs = sqrt(sum(cbst(1:dall)**2)/dall - mean**2)
write(*,'(i2,a)'),iter,'th iteration...'
write(*,'(a,f7.3)'),'weight is:',weight
write(*,'(a,f8.1,a,f8.2,a,f8.3)'),'mean,std_devs and rms of &
residual after weighting: ',mean*1000,'ms ',1000*std_devs,'ms ',&
dnrm2(dall,cbst,1)/sqrt(real(dall))
do i =1,dall do i =1,dall
cbst(i)=cbst(i)/datweight(i) cbst(i)=cbst(i)/datweight(i)
@ -537,10 +544,9 @@ program SurfTomo
mean = sum(cbst(1:dall))/dall mean = sum(cbst(1:dall))/dall
std_devs = sqrt(sum(cbst(1:dall)**2)/dall - mean**2) std_devs = sqrt(sum(cbst(1:dall)**2)/dall - mean**2)
write(*,'(i2,a)'),iter,'th iteration...' !write(*,'(i2,a)'),iter,'th iteration...'
write(*,'(a,f7.3)'),'weight is:',weight !write(*,'(a,f7.3)'),'weight is:',weight
write(*,'(a,f8.1,a,f8.2,a,f8.3)'),'mean,std_devs and rms of & write(*,'(a,f8.1,a,f8.2,a,f8.3)'),'residual before weighting: ',mean*1000,'ms ',1000*std_devs,'ms ',&
residual: ',mean*1000,'ms ',1000*std_devs,'ms ',&
dnrm2(dall,cbst,1)/sqrt(real(dall)) dnrm2(dall,cbst,1)/sqrt(real(dall))
write(66,'(i2,a)'),iter,'th iteration...' write(66,'(i2,a)'),iter,'th iteration...'
write(66,'(a,f7.3)'),'weight is:',weight write(66,'(a,f7.3)'),'weight is:',weight