diff options
Diffstat (limited to 'CarpetExtra/IDFOScalarWave')
| -rw-r--r-- | CarpetExtra/IDFOScalarWave/interface.ccl | 7 | ||||
| -rw-r--r-- | CarpetExtra/IDFOScalarWave/param.ccl | 6 | ||||
| -rw-r--r-- | CarpetExtra/IDFOScalarWave/schedule.ccl | 4 | ||||
| -rw-r--r-- | CarpetExtra/IDFOScalarWave/src/InitialData.F77 | 12 |
4 files changed, 9 insertions, 20 deletions
diff --git a/CarpetExtra/IDFOScalarWave/interface.ccl b/CarpetExtra/IDFOScalarWave/interface.ccl index bb329f723..30985311c 100644 --- a/CarpetExtra/IDFOScalarWave/interface.ccl +++ b/CarpetExtra/IDFOScalarWave/interface.ccl @@ -1,7 +1,6 @@ # Interface definition for thorn IDScalarWave -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/interface.ccl,v 1.3 2003/06/18 18:24:28 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/interface.ccl,v 1.4 2003/06/27 15:54:58 schnetter Exp $ -implements: idFOscalarwave -inherits: FOwavetoy grid -friend: FOwavetoy +implements: idfoscalarwave +inherits: fowavetoy grid diff --git a/CarpetExtra/IDFOScalarWave/param.ccl b/CarpetExtra/IDFOScalarWave/param.ccl index b0d89112a..146c8decc 100644 --- a/CarpetExtra/IDFOScalarWave/param.ccl +++ b/CarpetExtra/IDFOScalarWave/param.ccl @@ -1,11 +1,11 @@ # Parameter definitions for thorn IDScalarWave -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/param.ccl,v 1.2 2002/02/26 16:43:53 shawley Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/param.ccl,v 1.3 2003/06/27 15:54:58 schnetter Exp $ shares: grid USES KEYWORD type -restricted: +private: KEYWORD initial_data "Type of initial data" { @@ -13,8 +13,6 @@ KEYWORD initial_data "Type of initial data" "gaussian" :: "time-symmetric gaussian" } "1/r" -private: - ## Parameter for initial wavepulses REAL radius "The radius of the gaussian wave" diff --git a/CarpetExtra/IDFOScalarWave/schedule.ccl b/CarpetExtra/IDFOScalarWave/schedule.ccl index a75c6316e..79cbee17f 100644 --- a/CarpetExtra/IDFOScalarWave/schedule.ccl +++ b/CarpetExtra/IDFOScalarWave/schedule.ccl @@ -1,12 +1,12 @@ # Schedule definitions for thorn IDScalarWave -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/schedule.ccl,v 1.4 2003/06/26 19:51:10 shawley Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/schedule.ccl,v 1.5 2003/06/27 15:54:58 schnetter Exp $ schedule IDFOScalarWave_CheckParameters at PARAMCHECK { LANG: Fortran } "Check parameters" -schedule IDFOScalarWave_InitialData as WaveToy_InitialData at INITIAL +schedule IDFOScalarWave_InitialData as FOWaveToy_InitialData at INITIAL { STORAGE: FOwavetoy::scalarevolve[3] FOwavetoy::scalarevolve_derivs[3] LANG: Fortran diff --git a/CarpetExtra/IDFOScalarWave/src/InitialData.F77 b/CarpetExtra/IDFOScalarWave/src/InitialData.F77 index c92dc0431..f71eefd32 100644 --- a/CarpetExtra/IDFOScalarWave/src/InitialData.F77 +++ b/CarpetExtra/IDFOScalarWave/src/InitialData.F77 @@ -1,5 +1,5 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/src/InitialData.F77,v 1.5 2003/06/26 20:07:21 shawley Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/src/InitialData.F77,v 1.6 2003/06/27 15:54:58 schnetter Exp $ /*@@ @file InitialData.F77 @@ -40,9 +40,8 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDFOScalarWave/src/Ini INTEGER i,j,k CCTK_REAL dt,omega, cpi - CCTK_REAL r, ri3 + CCTK_REAL ri3 CCTK_REAL dxi,dyi,dzi - CCTK_REAL tmp c call CCTK_INFO ("IDFOScalarWave_InitialData") @@ -92,7 +91,6 @@ c call CCTK_INFO ("IDFOScalarWave_InitialData") $ / sigma**2 phiz(i,j,k) = phi(i,j,k)* (-2) * (z(i,j,k) - radius) $ / sigma**2 -c resid(i,j,k) = 0.0 pi_p(i,j,k) = amplitude * & exp( -(x(i,j,k) - radius - dt)**2 / sigma**2 )* @@ -204,9 +202,6 @@ c resid(i,j,k) = 0.0 & exp( -(y(i,j,k) - radius + 2*dt)**2 / sigma**2 )* & exp( -(z(i,j,k) - radius + 2*dt)**2 / sigma**2 ) -c resid_p(i,j,k) = 0.0 -c resid_p_p(i,j,k) = 0.0 - end do end do end do @@ -253,7 +248,6 @@ c Use kx,ky,kz as number of modes in each direction. phix(i,j,k) = - x(i,j,k) * ri3 phiy(i,j,k) = - y(i,j,k) * ri3 phiz(i,j,k) = - z(i,j,k) * ri3 -c resid(i,j,k) = 0.0 pi_p(i,j,k) = pi(i,j,k) pi_p_p(i,j,k) = pi(i,j,k) @@ -265,8 +259,6 @@ c resid(i,j,k) = 0.0 phiz_p_p(i,j,k) = phiz(i,j,k) phi_p(i,j,k) = phi(i,j,k) phi_p_p(i,j,k) = phi(i,j,k) -c resid_p(i,j,k) = resid(i,j,k) -c resid_p_p(i,j,k)= resid(i,j,k) end do end do |