From 344373f02b022765ff7c08b6e83a4666dcdec436 Mon Sep 17 00:00:00 2001 From: allen Date: Fri, 18 Jul 2003 17:10:42 +0000 Subject: Changes to use of new boundary infrastructure git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/WaveToyF90/trunk@83 f80f6fb6-8356-4fd4-90bc-d84ad503c100 --- param.ccl | 2 +- src/WaveToy.F | 36 ++++-------------------------------- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/param.ccl b/param.ccl index 41e348c..33b2e33 100644 --- a/param.ccl +++ b/param.ccl @@ -1,7 +1,7 @@ # Parameter definitions for thorn WaveToyF90 # $Header$ -private: +restricted: KEYWORD bound "Type of boundary condition to use" { diff --git a/src/WaveToy.F b/src/WaveToy.F index 7e99de7..8738576 100644 --- a/src/WaveToy.F +++ b/src/WaveToy.F @@ -112,23 +112,7 @@ CCTK_INT Boundary_SelectVarForBC integer i - integer :: ierr=-1 - integer,dimension(3):: sw=1 - CCTK_REAL,parameter :: sval = 0.0 - CCTK_REAL,parameter :: rzero = 0.0 - CCTK_REAL,parameter :: rone = 1.0 - - integer,parameter :: swdir = 1 - integer,parameter :: ione = 1,mione=-1 - integer,parameter :: itwo = 2,mitwo=-2 - integer,parameter :: ithree = 3,mithree=-3 - integer,parameter :: ifour = 4,izero = 0 - - CCTK_REAL finf - integer npow - - finf = 1.0d0 - npow = 1 + integer :: ierr=0 c Apply the symmetry boundary conditions on any coordinate axes c ------------------------------------------------------------- @@ -152,27 +136,15 @@ c be passed ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, $ "wavetoy::phi", "Robin"); else if (CCTK_EQUALS(bound,"zero")) then -c Face specific calls are not working yet with the new boundary interface: -c call BndScalarDirVN(ierr,cctkGH,swdir,mione ,sval,"wavetoy::phi") -c BOUNDARY_ERROR -c call BndScalarDirVN(ierr,cctkGH,swdir,ione ,sval,"wavetoy::phi") -c BOUNDARY_ERROR -c call BndScalarDirVN(ierr,cctkGH,swdir,mitwo ,sval,"wavetoy::phi") -c BOUNDARY_ERROR -c call BndScalarDirVN(ierr,cctkGH,swdir,itwo ,sval,"wavetoy::phi") -c BOUNDARY_ERROR -c call BndScalarDirVN(ierr,cctkGH,swdir,mithree,sval,"wavetoy::phi") -c BOUNDARY_ERROR -c call BndScalarDirVN(ierr,cctkGH,swdir,ithree ,sval,"wavetoy::phi") -c BOUNDARY_ERROR ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, $ "wavetoy::phi", "Scalar"); else if (.NOT. CCTK_EQUALS(bound,"none")) then - call CCTK_WARN(0,"Unrecognized boundary condition") + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, + $ "wavetoy::phi", "None"); end if if (ierr < 0) then - call CCTK_WARN(0,"WaveToyF90_Boundaries: Error in boundary routines") + call CCTK_WARN(0,"WaveToyF90_Boundaries: Error in selecting boundary condition") end if end subroutine WaveToyF90_Boundaries -- cgit v1.2.3