diff options
Diffstat (limited to 'src/Extract.F')
| -rw-r--r-- | src/Extract.F | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/Extract.F b/src/Extract.F index ace99fb..b4ba753 100644 --- a/src/Extract.F +++ b/src/Extract.F @@ -83,6 +83,7 @@ c Local variables INTEGER myproc,ierr CCTK_REAL dx,dy,dz + CCTK_INT :: nx, ny, nz character*80 infoline @@ -93,6 +94,10 @@ c ------------------------------------------------------------------ dy = cctk_delta_space(2) dz = cctk_delta_space(3) + nx = cctk_lsh(1) + ny = cctk_lsh(2) + nz = cctk_lsh(3) + c ------------------------------------------------------------------ c c 0. Check to see if Extract should have been called @@ -149,13 +154,13 @@ c Set the value of igrid c Create 1D coordinate arrays - do ix = 1, cctk_lsh(1) + do ix = 1, nx x_1d(ix) = x(ix,1,1) enddo - do iy = 1, cctk_lsh(2) + do iy = 1, ny y_1d(iy) = y(1,iy,1) enddo - do iz = 1, cctk_lsh(3) + do iz = 1, nz z_1d(iz) = z(1,1,iz) enddo @@ -218,6 +223,9 @@ c Get m_mode in this case too, or the T3E has a junk value (PW) mmode = m_mode ALLOCATE(Qodd(2,2:lmode,0:mmode),Qeven(2,2:lmode,0:mmode)) ENDIF +c print*,'Extract Qodd' +c print*,lbound(Qodd,1),lbound(Qodd,2),lbound(Qodd,3) +c print*,size(Qodd,1),size(Qodd,2),size(Qodd,3) c Check do not have bad values for the modes @@ -377,13 +385,17 @@ c Do extraction at each radius extract_at_each_radius: DO WHILE (radius < r2) +c print*,'Calling D3_extract' +c print*,nx,ny,nz,Nt,Np CALL D3_extract(cctkGH,conformal_state,do_ADMmass,do_momentum,do_spin, & igrid,orig,myproc,interpolation_operator,interpolation_order, - & Nt,Np,all_modes,lmode, + & Nt,Np,nx,ny,nz,all_modes,lmode, & mmode,x_1d,y_1d,z_1d,Dx,Dy,Dz,Psi_power,Psi,g00, & gxx,gxy,gxz,gyy,gyz,gzz,kxx,kxy,kxz,kyy,kyz,kzz, & radius,ADMmass,momentum,spin,mass,rsch, & Qodd,Qeven,temp3d,dtaudt) +c print*,Qodd,Qeven +c print*,'Exited D3_extract' IF (verbose == 1) THEN WRITE(*,*) "Extracted at r =",radius @@ -551,7 +563,7 @@ c Cannot use the conformal equation for ADM mass now CALL D3_extract(cctkGH,conformal_state,do_ADMmass,do_momentum,do_spin, & igrid,orig,myproc,interpolation_operator,interpolation_order, - & Nt,Np,all_modes, + & Nt,Np,nx,ny,nz,all_modes, & lmode,mmode,x_1d,y_1d,z_1d, & Dx,Dy,Dz,Psi_power,Psi,g00,gxx,gxy,gxz,gyy,gyz,gzz,kxx,kxy,kxz, & kyy,kyz,kzz,radius,ADMmass,momentum,spin,mass,rsch, |