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

change G*Gp

Browse Source
This commit is contained in:
Hongjian Fang 2020-04-19 13:36:13 -04:00
parent b657c68d28
commit 74e80f4b74
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.f90
View File

@ -63,7 +63,7 @@ program SurfTomo
integer,dimension(:),allocatable::nsrc1
integer,dimension(:,:),allocatable::periods
real,dimension(:),allocatable::rw
integer,dimension(:),allocatable::iw,col
integer,dimension(:),allocatable::iw,col,nrow
real,dimension(:),allocatable::dv,norm,dvsub,dvstd,dvall
! real,dimension(:),allocatable::dvall
real,dimension(:,:,:),allocatable::vsf
@ -305,7 +305,7 @@ program SurfTomo
if(checkstat > 0)then
write(6,*)'error with allocate: integer iw'
endif
allocate(col(maxnar), stat=checkstat)
allocate(col(maxnar),nrow(dall), stat=checkstat)
if(checkstat > 0)then
write(6,*)'error with allocate: integer iw'
endif
@ -417,14 +417,17 @@ program SurfTomo
lenrw = nar
iw(1)=nar
iw(nar+2:2*nar+1) = col(1:nar)
do i = 1,nar
nrow(iw(1+i)) = nrow(iw(1+i))+1
enddo
print*,'no. of nonzero:',nar,minval(cbst),maxval(cbst)
!$omp parallel &
!$omp default(private) &
!$omp shared(leniw,lenrw,iw,rw,cbst,goxd,gozd,dvxd,dvzd,depz,maxvp) &
!$omp shared(leniw,lenrw,col,nrow,rw,cbst,goxd,gozd,dvxd,dvzd,depz,maxvp) &
!$omp shared(nx,ny,nz,dall,ncells,hvratio,damp,nrealizations,dvall)
!$omp do
do iproj = 1,nrealizations
call voronoiproj(leniw,lenrw,iw,rw,cbst,goxd,dvxd,gozd,dvzd,depz,&
call voronoiproj(leniw,lenrw,col,nrow,rw,cbst,goxd,dvxd,gozd,dvzd,depz,&
nx,ny,nz,dall,ncells,hvratio,damp,iproj,dvsub)
dvall((iproj-1)*maxvp+1:iproj*maxvp) = dvsub(1:maxvp)
enddo
@ -618,6 +621,7 @@ program SurfTomo
write(66,*)'Output inverted shear velocity model &
to ',outmodel
if (vorotomo /= 0) then
write(outmodel,'(a,a)') trim(inputfile),'Measure_std.dat'
open(64,file=outmodel)
do k=1,nz-1
@ -629,6 +633,7 @@ program SurfTomo
enddo
enddo
close(64)
endif
endif
@ -645,7 +650,7 @@ program SurfTomo
deallocate(wavetype,igrt,nrc1)
deallocate(nsrc1,periods)
deallocate(rw)
deallocate(iw,col)
deallocate(iw,col,nrow)
deallocate(cbst,wt,dtres,datweight)
deallocate(dv,dvsub,dvstd,dvall)
deallocate(norm)

16
src/voronoiproj.f90
View File

@ -1,11 +1,12 @@
subroutine voronoiproj(leniw,lenrw,iw,rw,dres,goxd,dvxd,gozd,dvzd,depz,&
subroutine voronoiproj(leniw,lenrw,colg,nrow,rw,dres,goxd,dvxd,gozd,dvzd,depz,&
nx,ny,nz,nd,ncells,hvratio,damp,iproj,dv)
use lsmrModule, only:lsmr
implicit none
integer leniw,lenrw
integer nx,ny,nz
integer iw(leniw)
! integer iw(leniw)
integer colg(leniw),nrow(nd)
real depz(nz)
real rw(lenrw)
integer ncells
@ -38,6 +39,7 @@ subroutine voronoiproj(leniw,lenrw,iw,rw,dres,goxd,dvxd,gozd,dvzd,depz,&
real xnorm
integer localSize,nout,itn
integer leniw_p,lenrw_p,leniwgp,lenrwgp
integer start
allocate(lat(nx-2),lon(ny-2),rad(nz-1))
ndim = (nx-2)*(ny-2)*(nz-1)
@ -102,9 +104,13 @@ subroutine voronoiproj(leniw,lenrw,iw,rw,dres,goxd,dvxd,gozd,dvzd,depz,&
nzid = 0
do ii = 1,nd
grow = 0
gcol = 0
gcol(ii) = 1.0
call aprod(2,nd,ndim,grow,gcol,leniw,lenrw,iw,rw)
start = sum(nrow(1:ii-1))
do ix = 1,nrow(ii)
grow(colg(start+ix)) = rw(start+ix)
enddo
!gcol = 0
!gcol(ii) = 1.0
!call aprod(2,nd,ndim,grow,gcol,leniw,lenrw,iw,rw)
subrow = 0
call aprod(1,ncells,ndim,grow,subrow,leniw_p,lenrw_p,iw_p,rw_p)
do ix = 1,ncells