diff options
| author | goodale <goodale@4451c3c6-1034-4891-99ea-21147727ccdf> | 2004-05-06 02:10:18 +0000 |
|---|---|---|
| committer | goodale <goodale@4451c3c6-1034-4891-99ea-21147727ccdf> | 2004-05-06 02:10:18 +0000 |
| commit | 47ce0ccdd290fbd82b17a022f30b883840ed068b (patch) | |
| tree | 47d1a265e45a7efd5f35ecab647d62bcf9e5a2aa | |
| parent | 2c6b05310e36b93a20dd6f0150dbed1aad4fbd60 (diff) | |
Making WaveToy versions more consistent. This change also fixes the bug
in some of the implementations whereby "zero" rather than "scalar" was
passed to the boundary condition routines - PR 1676.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/WaveToyF77/trunk@118 4451c3c6-1034-4891-99ea-21147727ccdf
| -rw-r--r-- | src/WaveToy.F77 | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/WaveToy.F77 b/src/WaveToy.F77 index 0f08c09..ad415c7 100644 --- a/src/WaveToy.F77 +++ b/src/WaveToy.F77 @@ -5,6 +5,7 @@ @desc Evolution routines for the wave equation solver @enddesc + @version $Header$ @@*/ #include "cctk.h" @@ -113,31 +114,27 @@ c ---------------- c Local declarations CCTK_INT ierr + CHARACTER*100 boundary + INTEGER length + ierr = 0 +c The "bound" parameter needs to be converted into a Fortran string. + call CCTK_FortranString(length,bound,boundary) + c Apply the outer boundary conditions c ----------------------------------- c Note: In each of the following calls to Boundary_SelectVarForBC, c default arguments are used, so an invalid table handle of -1 can c be passed - if (CCTK_EQUALS(bound,"flat")) then - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - $ "wavetoy::phi", "Flat") - else if (CCTK_EQUALS(bound,"static")) then + if (CCTK_EQUALS(bound,"flat") .or. CCTK_EQUALS(bound,"static") .or. + $ CCTK_EQUALS(bound,"radiation") .or. CCTK_EQUALS(bound,"robin") .or. + $ CCTK_EQUALS(bound,"none") ) then ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - $ "wavetoy::phi", "Static") - else if (CCTK_EQUALS(bound,"radiation")) then - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - $ "wavetoy::phi", "Radiation") - else if (CCTK_EQUALS(bound,"robin")) then - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - $ "wavetoy::phi", "Robin") + $ "wavetoy::phi", boundary) else if (CCTK_EQUALS(bound,"zero")) then ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, $ "wavetoy::phi", "Scalar") - else if (CCTK_EQUALS(bound,"none")) then - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, - $ "wavetoy::phi", "None") end if if (ierr .lt. 0) then |