diff options
-rw-r--r-- | interface.ccl | 2 | ||||
-rw-r--r-- | src/InitialData.F77 | 17 |
2 files changed, 8 insertions, 11 deletions
diff --git a/interface.ccl b/interface.ccl index 642766a..ee17e13 100644 --- a/interface.ccl +++ b/interface.ccl @@ -3,4 +3,4 @@ implements: idscalarwave inherits: wavetoy grid -friend: wavetoy + diff --git a/src/InitialData.F77 b/src/InitialData.F77 index 354a9e6..85d1668 100644 --- a/src/InitialData.F77 +++ b/src/InitialData.F77 @@ -1,4 +1,3 @@ - /*@@ @file InitialData.F77 @date @@ -13,7 +12,6 @@ #include "cctk_arguments.h" - /*@@ @routine IDScalarWave_InitialData @date @@ -43,7 +41,7 @@ pi = 4.0*atan(1.0) - dt = cctk_delta_time + dt = CCTK_DELTA_TIME omega = sqrt(kx**2+ky**2+kz**2) @@ -86,15 +84,14 @@ c Use kx,ky,kz as number of modes in each direction. do i=1,cctk_lsh(1) phi(i,j,k) = amplitude*sin(kx*(x(i,j,k)-0.5)*pi)* - $ sin(ky*(y(i,j,k)-0.5)*pi)* - $ sin(kz*(z(i,j,k)-0.5)*pi)* - $ cos(omega*cctk_time*pi) + & sin(ky*(y(i,j,k)-0.5)*pi)* + & sin(kz*(z(i,j,k)-0.5)*pi)* + & cos(omega*cctk_time*pi) phi_old(i,j,k)= amplitude*sin(kx*(x(i,j,k)-0.5)*pi)* - $ sin(ky*(y(i,j,k)-0.5)*pi)* - $ sin(kz*(z(i,j,k)-0.5)*pi)* - $ cos(omega*(cctk_time-dt)*pi) - + & sin(ky*(y(i,j,k)-0.5)*pi)* + & sin(kz*(z(i,j,k)-0.5)*pi)* + & cos(omega*(cctk_time-dt)*pi) end do end do |