diff options
Diffstat (limited to 'CarpetExtra/IDScalarWaveMoL')
| -rw-r--r-- | CarpetExtra/IDScalarWaveMoL/param.ccl | 32 | ||||
| -rw-r--r-- | CarpetExtra/IDScalarWaveMoL/schedule.ccl | 2 | ||||
| -rw-r--r-- | CarpetExtra/IDScalarWaveMoL/src/errors.F77 | 3 | ||||
| -rw-r--r-- | CarpetExtra/IDScalarWaveMoL/src/initialdata.F77 | 48 |
4 files changed, 20 insertions, 65 deletions
diff --git a/CarpetExtra/IDScalarWaveMoL/param.ccl b/CarpetExtra/IDScalarWaveMoL/param.ccl index b7d933e69..67d341ef5 100644 --- a/CarpetExtra/IDScalarWaveMoL/param.ccl +++ b/CarpetExtra/IDScalarWaveMoL/param.ccl @@ -1,15 +1,5 @@ # Parameter definitions for thorn IDScalarWaveMoL -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/param.ccl,v 1.2 2003/08/14 17:22:09 schnetter Exp $ - -KEYWORD initial_data "Initial data" -{ - "plane wave" :: "Plane wave" - "Gaussian pulse" :: "Gaussian pulse" -} "plane wave" - - - -# Plane wave specification +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/param.ccl,v 1.1 2003/06/18 18:24:29 schnetter Exp $ CCTK_REAL wave_number[3] "Wave number" { @@ -21,30 +11,12 @@ CCTK_REAL phase_offset[3] "Phase offset" *:* :: "" } 0.0 - - -# Gaussian pulse specification - -CCTK_REAL pulse_direction[3] "Pulse width" -{ - *:* :: "" -} 0.0 - -CCTK_REAL pulse_offset[3] "Pulse offset" -{ - *:* :: "" -} 0.0 - - - -# Generic specifications - CCTK_REAL time_offset "Time offset" { *:* :: "" } 0.0 -CCTK_REAL amplitude "Amplitude" +CCTK_REAL amplitude "Wave amplitude" { *:* :: "" } 1.0 diff --git a/CarpetExtra/IDScalarWaveMoL/schedule.ccl b/CarpetExtra/IDScalarWaveMoL/schedule.ccl index 4cb14d4d9..85b47361e 100644 --- a/CarpetExtra/IDScalarWaveMoL/schedule.ccl +++ b/CarpetExtra/IDScalarWaveMoL/schedule.ccl @@ -1,5 +1,5 @@ # Schedule definitions for thorn IDScalarWaveMoL -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/schedule.ccl,v 1.2 2003/11/05 16:18:40 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/schedule.ccl,v 1.1 2003/06/18 18:24:29 schnetter Exp $ SCHEDULE IDScalarWaveMoL_InitialData AT initial { diff --git a/CarpetExtra/IDScalarWaveMoL/src/errors.F77 b/CarpetExtra/IDScalarWaveMoL/src/errors.F77 index a47394f84..8bfeac41c 100644 --- a/CarpetExtra/IDScalarWaveMoL/src/errors.F77 +++ b/CarpetExtra/IDScalarWaveMoL/src/errors.F77 @@ -1,8 +1,7 @@ -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/src/errors.F77,v 1.2 2003/11/05 16:18:40 schnetter Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/src/errors.F77,v 1.1 2003/06/18 18:24:29 schnetter Exp $ #include "cctk.h" #include "cctk_Arguments.h" -#include "cctk_Functions.h" #include "cctk_Parameters.h" subroutine IDScalarWaveMoL_Errors (CCTK_ARGUMENTS) diff --git a/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77 b/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77 index f8385b48a..1e7f5923c 100644 --- a/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77 +++ b/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77 @@ -1,8 +1,7 @@ -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77,v 1.3 2003/11/05 16:18:40 schnetter Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/src/initialdata.F77,v 1.1 2003/06/18 18:24:29 schnetter Exp $ #include "cctk.h" #include "cctk_Arguments.h" -#include "cctk_Functions.h" #include "cctk_Parameters.h" subroutine IDScalarWaveMoL_InitialData (CCTK_ARGUMENTS) @@ -13,37 +12,22 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWaveMoL/src/in CCTK_REAL pi parameter (pi = 3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117068d0) CCTK_REAL omega - CCTK_REAL tmp integer i, j, k - if (CCTK_EQUALS(initial_data, "plane wave")) then - omega = sqrt(wave_number(1)**2 + wave_number(2)**2 - $ + wave_number(3)**2) - do k=1,cctk_lsh(3) - do j=1,cctk_lsh(2) - do i=1,cctk_lsh(1) - tmp = wave_number(1)*(x(i,j,k)-phase_offset(1)) - $ + wave_number(2)*(y(i,j,k)-phase_offset(2)) - $ + wave_number(3)*(z(i,j,k)-phase_offset(3)) - $ + omega*(cctk_time-time_offset) - phi(i,j,k) = amplitude * cos (2*pi * tmp) - psi(i,j,k) = - amplitude * 2*pi * omega * sin (2*pi * tmp) - end do + omega = sqrt(wave_number(1)**2 + wave_number(2)**2 + wave_number(3)**2) + do k=1,cctk_lsh(3) + do j=1,cctk_lsh(2) + do i=1,cctk_lsh(1) + phi(i,j,k) = amplitude * cos (2*pi * + $ ( wave_number(1)*(x(i,j,k)-phase_offset(1)) + $ + wave_number(2)*(y(i,j,k)-phase_offset(2)) + $ + wave_number(3)*(z(i,j,k)-phase_offset(3)) + $ + omega*(cctk_time-time_offset))) + psi(i,j,k) = - amplitude * 2*pi * omega * sin (2*pi * + $ ( wave_number(1)*(x(i,j,k)-phase_offset(1)) + $ + wave_number(2)*(y(i,j,k)-phase_offset(2)) + $ + wave_number(3)*(z(i,j,k)-phase_offset(3)) + $ + omega*(cctk_time-time_offset))) end do end do - else if (CCTK_EQUALS(initial_data, "Gaussian pulse")) then - omega = sqrt(pulse_direction(1)**2 + pulse_direction(2)**2 - $ + pulse_direction(3)**2) - do k=1,cctk_lsh(3) - do j=1,cctk_lsh(2) - do i=1,cctk_lsh(1) - tmp = pulse_direction(1)*(x(i,j,k)-pulse_offset(1)) - $ + pulse_direction(2)*(y(i,j,k)-pulse_offset(2)) - $ + pulse_direction(3)*(z(i,j,k)-pulse_offset(3)) - $ + omega*(cctk_time-time_offset) - phi(i,j,k) = amplitude * exp (-0.5d0 * tmp**2) - psi(i,j,k) = - tmp * omega * phi(i,j,k) - end do - end do - end do - end if + end do end |