diff options
| -rw-r--r-- | CarpetExtra/IDScalarWave/src/CheckParameters.F77 | 9 | ||||
| -rw-r--r-- | CarpetExtra/IDScalarWave/src/InitialData.F77 | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/CarpetExtra/IDScalarWave/src/CheckParameters.F77 b/CarpetExtra/IDScalarWave/src/CheckParameters.F77 index 722bad3cc..521ab0be7 100644 --- a/CarpetExtra/IDScalarWave/src/CheckParameters.F77 +++ b/CarpetExtra/IDScalarWave/src/CheckParameters.F77 @@ -34,15 +34,10 @@ c -*-Fortran-*- implicit none DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_FUNCTIONS DECLARE_CCTK_PARAMETERS - INTEGER CCTK_Equals - - if (CCTK_Equals(initial_data,"box").eq.1) then - - if (CCTK_Equals(type, "box").eq.0) then - call CCTK_PARAMWARN("Must have a box grid with box initial data") - end if + if (CCTK_EQUALS(initial_data,"box")) then if (kx.eq.0 .or. ky.eq.0 .or. kz.eq.0) then call CCTK_PARAMWARN("Cannot have zero kx,ky,kz for box initial data") diff --git a/CarpetExtra/IDScalarWave/src/InitialData.F77 b/CarpetExtra/IDScalarWave/src/InitialData.F77 index ac277ce8f..e0c2398d8 100644 --- a/CarpetExtra/IDScalarWave/src/InitialData.F77 +++ b/CarpetExtra/IDScalarWave/src/InitialData.F77 @@ -55,11 +55,11 @@ c print '("IDScalarWave_InitialData")' do i=1,cctk_lsh(1) phi(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) + $ * cos((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) + $ + kz*cart3d_z(i,j,k) + omega*cctk_time) * pi) 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)) + $ * cos((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) + $ + kz*cart3d_z(i,j,k) + omega*(cctk_time - dt)) * pi) end do end do @@ -122,5 +122,3 @@ c Use kx,ky,kz as number of modes in each direction. end if end - - |