diff options
author | schnetter <> | 2001-04-23 06:10:00 +0000 |
---|---|---|
committer | schnetter <> | 2001-04-23 06:10:00 +0000 |
commit | 3c8cafa058889929160d7019304b99fab0656df8 (patch) | |
tree | 46dd47a05e490ed976623074c18bcdac45787c81 /CarpetExtra/SpaceTimeToy/src | |
parent | bcf0f1685d561b33bb1b0c1e033adb4a145767d3 (diff) |
Modified the Carpet driver so that it uses the same new timelevel
Modified the Carpet driver so that it uses the same new timelevel
cycling as does PUGH.
Modified the CarpetIOASCII and CarpetIOFlexIO output routines so that
they always output the current time level.
Found and fixed a bug in the time interpolation in CarpetLib.
Fixed a bug where the necessary number of ghost zones for space
interpolation was calculated incorrectly.
Fixed bugs in the example parameter files that used an insufficient
number of ghost zones.
darcs-hash:20010423061011-07bb3-c69e59f7bc5f283d7632a663c0770578cdb73881.gz
Diffstat (limited to 'CarpetExtra/SpaceTimeToy/src')
-rw-r--r-- | CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 index ecb245028..a5d8eab8c 100644 --- a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 +++ b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 @@ -1,5 +1,5 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.7 2001/03/26 02:29:24 eschnett Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.8 2001/04/23 08:10:22 schnetter Exp $ #include "cctk.h" #include "cctk_Parameters.h" @@ -22,8 +22,8 @@ c Copy do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - phi_i(i,j,k) = phi(i,j,k) - psi_i(i,j,k) = psi(i,j,k) + phi_i(i,j,k) = phi_p(i,j,k) + psi_i(i,j,k) = psi_p(i,j,k) end do end do @@ -35,10 +35,10 @@ c Copy do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - u_i(i,j,k) = u(i,j,k) - vx_i(i,j,k) = vx(i,j,k) - vy_i(i,j,k) = vy(i,j,k) - vz_i(i,j,k) = vz(i,j,k) + u_i(i,j,k) = u_p(i,j,k) + vx_i(i,j,k) = vx_p(i,j,k) + vy_i(i,j,k) = vy_p(i,j,k) + vz_i(i,j,k) = vz_p(i,j,k) end do end do @@ -96,8 +96,8 @@ c Average do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - phi_i(i,j,k) = half * (phi(i,j,k) + phi_n(i,j,k)) - psi_i(i,j,k) = half * (psi(i,j,k) + psi_n(i,j,k)) + phi_i(i,j,k) = half * (phi_p(i,j,k) + phi(i,j,k)) + psi_i(i,j,k) = half * (psi_p(i,j,k) + psi(i,j,k)) end do end do @@ -109,10 +109,10 @@ c Average do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - u_i(i,j,k) = half * (u(i,j,k) + u_n(i,j,k)) - vx_i(i,j,k) = half * (vx(i,j,k) + vx_n(i,j,k)) - vy_i(i,j,k) = half * (vy(i,j,k) + vy_n(i,j,k)) - vz_i(i,j,k) = half * (vz(i,j,k) + vz_n(i,j,k)) + u_i(i,j,k) = half * (u_p(i,j,k) + u(i,j,k)) + vx_i(i,j,k) = half * (vx_p(i,j,k) + vx(i,j,k)) + vy_i(i,j,k) = half * (vy_p(i,j,k) + vy(i,j,k)) + vz_i(i,j,k) = half * (vz_p(i,j,k) + vz(i,j,k)) end do end do @@ -168,15 +168,15 @@ c Step ICN iterations dt = CCTK_DELTA_TIME c Evolve - do k=2,cctk_lsh(3)-1 - do j=2,cctk_lsh(2)-1 - do i=2,cctk_lsh(1)-1 + do k=1+cctk_nghostzones(3),cctk_lsh(3)-cctk_nghostzones(3) + do j=1+cctk_nghostzones(2),cctk_lsh(2)-cctk_nghostzones(2) + do i=1+cctk_nghostzones(1),cctk_lsh(1)-cctk_nghostzones(1) - phi_n(i,j,k) = phi(i,j,k) + phi(i,j,k) = phi_p(i,j,k) $ + dt * psi_i(i,j,k) $ + dt * u_i(i,j,k) - psi_n(i,j,k) = psi(i,j,k) + psi(i,j,k) = psi_p(i,j,k) $ + dt * (phi_i(i-1,j,k) - 2*phi_i(i,j,k) + phi_i(i+1,j,k)) / dx**2 $ + dt * (phi_i(i,j-1,k) - 2*phi_i(i,j,k) + phi_i(i,j+1,k)) / dy**2 $ + dt * (phi_i(i,j,k-1) - 2*phi_i(i,j,k) + phi_i(i,j,k+1)) / dz**2 @@ -203,15 +203,17 @@ c Evolve CCTK_REAL zero, one parameter (zero=0, one=1) - CCTK_REAL finf, npow - parameter (finf=1, npow=1) + CCTK_REAL finf + parameter (finf=1) + integer npow + parameter (npow=1) integer sw(3) integer ierr - sw(1) = 1 - sw(2) = 1 - sw(3) = 1 + sw(1) = cctk_nghostzones(1) + sw(2) = cctk_nghostzones(2) + sw(3) = cctk_nghostzones(3) c Apply boundary condition if (CCTK_EQUALS(bound, "flat")) then |