diff options
| author | allen <allen@f5a6acaf-da7d-456b-b0a8-35edbc60b392> | 1999-09-25 10:50:19 +0000 |
|---|---|---|
| committer | allen <allen@f5a6acaf-da7d-456b-b0a8-35edbc60b392> | 1999-09-25 10:50:19 +0000 |
| commit | d88778d06df2be3c021da103891d96de5983af09 (patch) | |
| tree | e7630ed6d73654175bb221f0812a5a2a5b00d220 | |
| parent | d9d0202511329217ed051a37662811eec440b711 (diff) | |
Fixing up par files
git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/IDScalarWave/trunk@10 f5a6acaf-da7d-456b-b0a8-35edbc60b392
| -rw-r--r-- | src/InitialData.F77 | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/src/InitialData.F77 b/src/InitialData.F77 index 85d1668..7d7463e 100644 --- a/src/InitialData.F77 +++ b/src/InitialData.F77 @@ -33,8 +33,7 @@ DECLARE_CCTK_FARGUMENTS DECLARE_CCTK_PARAMETERS - - INTEGER CCTK_Equals + DECLARE_CCTK_FUNCTIONS INTEGER i,j,k CCTK_REAL dt,omega, pi @@ -45,7 +44,7 @@ omega = sqrt(kx**2+ky**2+kz**2) - if (CCTK_Equals(initial_data,"plane").eq.1) then + if (CCTK_EQUALS(initial_data,"plane")) then do k=1,cctk_lsh(3) do j=1,cctk_lsh(2) @@ -60,22 +59,24 @@ end do end do - else if (CCTK_Equals(initial_data,"gaussian").eq.1) then + else if (CCTK_EQUALS(initial_data,"gaussian")) then - do k=1,cctk_lsh(3) - do j=1,cctk_lsh(2) - do i=1,cctk_lsh(1) + do k=1, cctk_lsh(3) + do j=1, cctk_lsh(2) + do i=1, cctk_lsh(1) - phi(i,j,k) = amplitude*exp( -(sqrt(x(i,j,k)**2 - & +y(i,j,k)**2+z(i,j,k)**2)-radius)**2/sigma**2) - phi_old(i,j,k) = amplitude*exp( -(sqrt(x(i,j,k)**2 - & +y(i,j,k)**2+z(i,j,k)**2)-radius-dt)**2/sigma**2) + phi(i,j,k) = amplitude*exp( + & -(sqrt(x(i,j,k)**2 + & +y(i,j,k)**2+z(i,j,k)**2)-radius)**2/sigma**2) + phi_old(i,j,k) = amplitude*exp( + & -(sqrt(x(i,j,k)**2 + & +y(i,j,k)**2+z(i,j,k)**2)-radius-dt)**2/sigma**2) end do end do end do - else if (CCTK_Equals(initial_data, "box").eq.1) then + else if (CCTK_EQUALS(initial_data, "box")) then c Use kx,ky,kz as number of modes in each direction. @@ -99,14 +100,6 @@ c Use kx,ky,kz as number of modes in each direction. end if -c Apply symmetry boundary conditions -c ---------------------------------- - call ApplySymmetry(cctkGH,"wavetoy::scalarevolve") - -c Synchronise -c ----------- - call CCTK_SyncGroup(cctkGH,"wavetoy::scalarevolve") - return end |