From 8b92cb0c94a56fd6e888569b43e151c5cb7008b7 Mon Sep 17 00:00:00 2001 From: schnetter <> Date: Tue, 8 Jan 2002 13:20:00 +0000 Subject: Added new 1/r initial data for WaveToy. Added new 1/r initial data for WaveToy. Added excision to WaveToy for 1/r data. darcs-hash:20020108132057-07bb3-541b25e99f5d694d4baa82ce3d09ced4383b27c9.gz --- CarpetExtra/IDScalarWave/param.ccl | 3 ++- CarpetExtra/IDScalarWave/src/InitialData.F77 | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'CarpetExtra/IDScalarWave') diff --git a/CarpetExtra/IDScalarWave/param.ccl b/CarpetExtra/IDScalarWave/param.ccl index 9b9d7fc1a..75244b562 100644 --- a/CarpetExtra/IDScalarWave/param.ccl +++ b/CarpetExtra/IDScalarWave/param.ccl @@ -1,5 +1,5 @@ # Parameter definitions for thorn IDScalarWave -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/param.ccl,v 1.2 2001/03/05 14:31:46 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/param.ccl,v 1.3 2002/01/08 14:20:57 schnetter Exp $ shares: grid @@ -12,6 +12,7 @@ KEYWORD initial_data "Type of initial data" "plane" :: "Plane wave" "gaussian" :: "Gaussian wave" "box" :: "Box wave" + "1/r" :: "1/r data" "none" :: "No initial data, zero phi" } "gaussian" diff --git a/CarpetExtra/IDScalarWave/src/InitialData.F77 b/CarpetExtra/IDScalarWave/src/InitialData.F77 index 739c6d2d2..5f330c924 100644 --- a/CarpetExtra/IDScalarWave/src/InitialData.F77 +++ b/CarpetExtra/IDScalarWave/src/InitialData.F77 @@ -1,5 +1,5 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/src/InitialData.F77,v 1.8 2001/12/14 18:00:01 schnetter Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/src/InitialData.F77,v 1.9 2002/01/08 14:20:57 schnetter Exp $ /*@@ @file InitialData.F77 @@ -132,6 +132,20 @@ c Use kx,ky,kz as number of modes in each direction. end do end do + else if (CCTK_EQUALS(initial_data, "1/r")) then + + do k=1,cctk_lsh(3) + do j=1,cctk_lsh(2) + do i=1,cctk_lsh(1) + + phi(i,j,k) = 1 / spher3d_r(i,j,k) + phi_p(i,j,k) = 1 / spher3d_r(i,j,k) + phi_p_p(i,j,k) = 1 / spher3d_r(i,j,k) + + end do + end do + end do + else do k=1,cctk_lsh(3) -- cgit v1.2.3