diff options
-rw-r--r-- | param.ccl | 4 | ||||
-rw-r--r-- | src/WaveToy.c | 46 |
2 files changed, 12 insertions, 38 deletions
@@ -1,11 +1,11 @@ # Parameter definitions for thorn WaveToyC # $Header$ -private: +restricted: KEYWORD bound "Type of boundary condition to use" { - "none" :: "No boundary condition" + "none" :: "Apply no boundary condition" "flat" :: "Flat boundary condition" "static" :: "Static boundary condition" "radiation" :: "Radiation boundary condition" diff --git a/src/WaveToy.c b/src/WaveToy.c index 2088202..a13b5bd 100644 --- a/src/WaveToy.c +++ b/src/WaveToy.c @@ -116,53 +116,27 @@ void WaveToyC_Boundaries(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - int ierr=-1; + int ierr=0; ierr = CartSymGN(cctkGH,"wavetoy::scalarevolve"); - if (CCTK_EQUALS(bound,"flat")) + if (CCTK_EQUALS(bound,"flat") || CCTK_EQUALS(bound,"static") || + CCTK_EQUALS(bound,"radiation") || CCTK_EQUALS(bound,"robin") || + CCTK_EQUALS(bound,"zero") || CCTK_EQUALS(bound,"none")) { /* Uses all default arguments, so invalid table handle -1 can be passed */ ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, "wavetoy::phi", - "Flat"); - } - else if (CCTK_Equals(bound,"static")) - { - /* Uses all default arguments, so invalid table handle -1 can be passed */ - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, "wavetoy::phi", - "Static"); - } - else if (CCTK_Equals(bound,"radiation")) - { - /* Uses all default arguments, so invalid table handle -1 can be passed */ - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, "wavetoy::phi", - "Radiation"); - } - else if (CCTK_Equals(bound,"robin")) - { - /* Uses all default arguments, so invalid table handle -1 can be passed */ - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, "wavetoy::phi", - "Robin"); - } - else if (CCTK_Equals(bound,"zero")) - { - /* Uses all default arguments, so invalid table handle -1 can be passed */ - ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, "wavetoy::phi", - "Scalar"); - } - else if (CCTK_Equals(bound,"none")) - { - /* Do nothing */ - } - else - { - CCTK_WARN(0,"Boundary condition not recognized"); + bound); } if (ierr < 0) { - CCTK_WARN(0,"Boundary conditions not applied - giving up!"); + CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING, + "WaveToyC_Boundaries: Error selecting boundary " + "condition %s",bound); } return; } + + |