diff options
author | allen <allen@f80f6fb6-8356-4fd4-90bc-d84ad503c100> | 1999-09-04 11:07:02 +0000 |
---|---|---|
committer | allen <allen@f80f6fb6-8356-4fd4-90bc-d84ad503c100> | 1999-09-04 11:07:02 +0000 |
commit | 6fdb31f4fa147be1067f8c43e365a638ccedda2f (patch) | |
tree | 18e85ef15179f2dbb556523ef6031f23445c1874 /src | |
parent | 53f1e5d0e5ab6597791bcea513f29bcb75787547 (diff) |
Removing initial data and setting timestep, these jobs are in their
own thorns now.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/WaveToyF90/trunk@12 f80f6fb6-8356-4fd4-90bc-d84ad503c100
Diffstat (limited to 'src')
-rw-r--r-- | src/CheckParameters.F | 51 | ||||
-rw-r--r-- | src/InitialData.F | 96 | ||||
-rw-r--r-- | src/WaveToy.F | 2 | ||||
-rw-r--r-- | src/make.code.defn | 2 |
4 files changed, 2 insertions, 149 deletions
diff --git a/src/CheckParameters.F b/src/CheckParameters.F deleted file mode 100644 index e02897e..0000000 --- a/src/CheckParameters.F +++ /dev/null @@ -1,51 +0,0 @@ - /*@@ - @file CheckParameters.F - @date - @author Gabrielle Allen - @desc - Check parameters for the wave equation evolver - @enddesc - @@*/ - -#include "cctk.h" -#include "cctk_parameters.h" -#include "cctk_arguments.h" - - - /*@@ - @routine WaveToy_CheckParameters - @date - @author Gabrielle Allen - @desc - Check parameters for the wave equation evolver - @enddesc - @calls - @calledby - @history - - @endhistory - -@@*/ - - subroutine WaveToyF90_CheckParameters(CCTK_FARGUMENTS) - - implicit none - - DECLARE_CCTK_FARGUMENTS - DECLARE_CCTK_PARAMETERS - - INTEGER CCTK_Equals - - if (CCTK_Equals(initial_data,"box")==1) then - - if (CCTK_Equals(type, "box")==0) then - call CCTK_PARAMWARN("Must have a box grid with box initial data") - end if - - if (kx==0 .or. ky==0 .or. kz==0) then - call CCTK_PARAMWARN("Cannot have zero kx,ky,kz for box initial data") - end if - - end if - - end subroutine WaveToyF90_CheckParameters diff --git a/src/InitialData.F b/src/InitialData.F deleted file mode 100644 index 1f12a5f..0000000 --- a/src/InitialData.F +++ /dev/null @@ -1,96 +0,0 @@ - /*@@ - @file InitialData.F - @date - @author Tom Goodale - @desc - Initial data for the 3D Wave Equation - @enddesc - @@*/ - -#include "cctk.h" -#include "cctk_parameters.h" -#include "cctk_arguments.h" - - - - /*@@ - @routine WaveToyF90_InitialData - @date - @author Tom Goodale - @desc - Set up initial data for the wave equation - @enddesc - @calls - @calledby - @history - - @endhistory - -@@*/ - - subroutine WaveToyF90_InitialData(CCTK_FARGUMENTS) - - implicit none - - DECLARE_CCTK_FARGUMENTS - DECLARE_CCTK_PARAMETERS - - INTEGER CCTK_Equals - - INTEGER :: i - CCTK_REAL :: dt,omega, pi - CCTK_REAL :: min_delta,dx,dy,dz - - pi = 4.0*atan(1.0) - -c Grid spacing shortcuts -c ---------------------- - dx = cctk_delta_space(1) - dy = cctk_delta_space(2) - dz = cctk_delta_space(3) - -c Calculate timestep -c ------------------ - min_delta = min(dx,dy,dz) - cctk_delta_time = dtfac*min_delta - dt = cctk_delta_time - omega = sqrt(kx**2+ky**2+kz**2) - - if (CCTK_Equals(initial_data,"plane")==1) then - - phi = amplitude*cos(kx*x+ky*y+kz*z+omega*cctk_time) - phi_old = amplitude*cos(kx*x+ky*y+kz*z+omega*(cctk_time-dt)) - - else if (CCTK_Equals(initial_data,"gaussian")==1) then - - call CCTK_INFO("Gaussian initial data for Wave Equation"); - phi = amplitude*exp( -(sqrt(x**2+y**2+z**2)-radius)**2/sigma**2) - phi_old = amplitude*exp( -(sqrt(x**2+y**2+z**2)-radius-dt)**2/sigma**2) - - else if (CCTK_Equals(initial_data, "box")==1) then - -c Use kx,ky,kz as number of modes in each direction. - - phi = amplitude*sin(kx*(x-0.5)*pi)* - $ sin(ky*(y-0.5)*pi)* - $ sin(kz*(z-0.5)*pi)* - $ cos(omega*cctk_time*pi) - - phi_old = amplitude*sin(kx*(x-0.5)*pi)* - $ sin(ky*(y-0.5)*pi)* - $ sin(kz*(z-0.5)*pi)* - $ cos(omega*(cctk_time-dt)*pi) - - end if - -c Apply symmetry boundary conditions -c ---------------------------------- - call ApplySymmetry(cctkGH,"wavetoy::scalarevolve") - -c Synchronise -c ----------- - call CCTK_SyncGroup(cctkGH,"wavetoy::scalarevolve") - - end subroutine WaveToyF90_InitialData - - diff --git a/src/WaveToy.F b/src/WaveToy.F index f800edf..7d93465 100644 --- a/src/WaveToy.F +++ b/src/WaveToy.F @@ -43,7 +43,7 @@ if (CCTK_Equals(bound,"flat")==1) then call ApplyFlatBC(cctkGH,sw,"wavetoy::phi") else if (CCTK_Equals(bound,"radiation")==1) then - call ApplyRadiativeBC(cctkGH,zero,sw,"wavetoy::phi","wavetoyf90::phi_old") + call ApplyRadiativeBC(cctkGH,zero,sw,"wavetoy::phi","wavetoy::phi_old") end if end subroutine wavetoyf90_boundaries diff --git a/src/make.code.defn b/src/make.code.defn index 6797754..94b12c3 100644 --- a/src/make.code.defn +++ b/src/make.code.defn @@ -2,7 +2,7 @@ # $Header$ # Source files in this directory -SRCS = InitialData.F InitSymBound.F CheckParameters.F WaveToy.F Startup.c +SRCS = InitSymBound.F WaveToy.F Startup.c # Subdirectories containing source files SUBDIRS = |