Using three time levels.

darcs-hash:20010326002850-f6438-82257c36db375047ccc8fa1ea38cf6e0a18ed30c.gz

1 files changed, 44 insertions, 9 deletions

diff --git a/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77 b/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77
index 4fcc252de..5582ed669 100644
--- a/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77
+++ b/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77
@@ -1,5 +1,5 @@
 c     -*-Fortran-*-
-c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77,v 1.3 2001/03/20 17:27:26 eschnett Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77,v 1.4 2001/03/26 02:28:54 eschnett Exp $
       
 #include "cctk.h"
 #include "cctk_Parameters.h"
@@ -15,12 +15,15 @@ c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/Ini
       
       CCTK_REAL pi
       CCTK_REAL omega
+      CCTK_REAL dt
       integer i,j,k
       
       pi = 4*atan(1.d0)
       
       omega = sqrt(kx**2+ky**2+kz**2)
       
+      dt = CCTK_DELTA_TIME
+      
       if (CCTK_EQUALS(initial_data,"plane")) then 
          
          do k=1,cctk_lsh(3)
@@ -35,6 +38,14 @@ c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/Ini
      $                 + kz*cart3d_z(i,j,k) + omega*cctk_time) * pi)
      $                 * pi * omega
                   
+                  phi_p(i,j,k) = amplitude
+     $                 * cos((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k)
+     $                 + kz*cart3d_z(i,j,k) + omega*(cctk_time-dt)) * pi)
+                  psi_p(i,j,k) = - amplitude
+     $                 * sin((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k)
+     $                 + kz*cart3d_z(i,j,k) + omega*(cctk_time-dt)) * pi)
+     $                 * pi * omega
+                  
                end do
             end do
          end do
@@ -50,6 +61,11 @@ c     $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/Ini
                   psi(i,j,k) = phi(i,j,k)
      $                 * 2 * (spher3d_r(i,j,k) - radius - cctk_time) / sigma**2
                   
+                  phi_p(i,j,k) = amplitude / spher3d_r(i,j,k)
+     $                 * exp(- (spher3d_r(i,j,k) - radius - (cctk_time-dt))**2 / sigma**2)
+                  psi_p(i,j,k) = phi(i,j,k)
+     $                 * 2 * (spher3d_r(i,j,k) - radius - (cctk_time-dt)) / sigma**2
+                  
                end do
             end do
          end do
@@ -67,7 +83,6 @@ c     Use kx,ky,kz as number of modes in each direction.
      $                 * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi)
      $                 * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi)
      $                 * cos(omega * cctk_time * pi)
-                  
                   psi(i,j,k) = - amplitude
      $                 * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi)
      $                 * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi)
@@ -75,6 +90,18 @@ c     Use kx,ky,kz as number of modes in each direction.
      $                 * sin(omega * cctk_time * pi)
      $                 * omega * pi
                   
+                  phi_p(i,j,k) = amplitude
+     $                 * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi)
+     $                 * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi)
+     $                 * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi)
+     $                 * cos(omega * (cctk_time-dt) * pi)
+                  psi_p(i,j,k) = - amplitude
+     $                 * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi)
+     $                 * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi)
+     $                 * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi)
+     $                 * sin(omega * (cctk_time-dt) * pi)
+     $                 * omega * pi
+                  
                end do
             end do
          end do
@@ -88,20 +115,28 @@ c     Use kx,ky,kz as number of modes in each direction.
                   phi(i,j,k) = 0
                   psi(i,j,k) = 0
                   
+                  phi_p(i,j,k) = 0
+                  psi_p(i,j,k) = 0
+                  
                end do
             end do
          end do 
          
       end if
       
-      do k=1,cctk_lsh(3)
-         do j=1,cctk_lsh(2)
-            do i=1,cctk_lsh(1)
-               
-               psi(i,j,k) = psi(i,j,k) - u(i,j,k)
-               
+      if (cctk_isthornactive("hydrotoy").eq.1) then
+         
+         do k=1,cctk_lsh(3)
+            do j=1,cctk_lsh(2)
+               do i=1,cctk_lsh(1)
+                  
+                  psi(i,j,k) = psi(i,j,k) - u(i,j,k)
+                  psi_p(i,j,k) = psi_p(i,j,k) - u_p(i,j,k)
+                  
+               end do
             end do
          end do
-      end do 
+         
+      end if
       
       end