From f67ac5be311b0a06091fc992ae4c93a5f20b3487 Mon Sep 17 00:00:00 2001 From: schnetter Date: Wed, 20 Feb 2008 00:19:32 +0000 Subject: Replace CCTK_VWarn with CCTK_WARN statements, since they are simpler git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/CoordBase/trunk@34 0337457d-221f-4ee6-a5f0-14255d5370d8 --- src/Domain.c | 97 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/src/Domain.c b/src/Domain.c index deab864..53ac817 100644 --- a/src/Domain.c +++ b/src/Domain.c @@ -17,18 +17,18 @@ CCTK_INT CoordBase_GetBoundarySpecification DECLARE_CCTK_PARAMETERS; if(! (size>=0)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "size is less than zero"); + CCTK_WARN (0, "size is less than zero"); if(! (nboundaryzones)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "nboundaryzones is out of bounds"); + CCTK_WARN (0, "nboundaryzones is out of bounds"); if(! (is_internal)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "is_internal is out of bounds"); + CCTK_WARN (0, "is_internal is out of bounds"); if(! (is_staggered)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "is_staggered is out of bounds"); + CCTK_WARN (0, "is_staggered is out of bounds"); if(! (shiftout)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "shiftout is out of bounds"); + CCTK_WARN (0, "shiftout is out of bounds"); if(! (size == 6)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "size is out of bounds"); + CCTK_WARN (0, "size is out of bounds"); nboundaryzones[0] = boundary_size_x_lower; nboundaryzones[1] = boundary_size_x_upper; @@ -78,24 +78,24 @@ CCTK_INT CoordBase_GetDomainSpecification int ierr; if(! (size>=0)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "size is out of bounds"); + CCTK_WARN (0, "size is out of bounds"); if(! (physical_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "physical_min is out of bounds"); + CCTK_WARN (0, "physical_min is out of bounds"); if(! (physical_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "physical_max is out of bounds"); + CCTK_WARN (0, "physical_max is out of bounds"); if(! (interior_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "interior_min is out of bounds"); + CCTK_WARN (0, "interior_min is out of bounds"); if(! (interior_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "interior_max is out of bounds"); + CCTK_WARN (0, "interior_max is out of bounds"); if(! (exterior_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "exterior_min is out of bounds"); + CCTK_WARN (0, "exterior_min is out of bounds"); if(! (exterior_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "exterior_max is out of bounds"); + CCTK_WARN (0, "exterior_max is out of bounds"); if(! (thespacing)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "thespacing is out of bounds"); + CCTK_WARN (0, "thespacing is out of bounds"); if(! (size == 3)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "size is out of bounds"); + CCTK_WARN (0, "size is out of bounds"); if (CCTK_EQUALS (domainsize, "minmax")) { @@ -175,17 +175,16 @@ CCTK_INT CoordBase_GetDomainSpecification thespacing[0] = dx; thespacing[1] = dy; thespacing[2] = dz; - + } else { - if (0) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "domainsize is out of bounds"); + CCTK_WARN (0, "domainsize is out of bounds"); } ierr = ConvertFromPhysicalBoundary (size, physical_min, physical_max, interior_min, interior_max, exterior_min, exterior_max, thespacing); if(ierr) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "Error returned from ConvertFromPhysicalBoundary"); + CCTK_WARN (0, "Error returned from ConvertFromPhysicalBoundary"); return 0; } @@ -211,29 +210,29 @@ CCTK_INT CoordBase_ConvertFromPhysicalBoundary int ierr; if(! (size>=0)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "size is out of bounds"); + CCTK_WARN (0, "size is out of bounds"); if(! (physical_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "physical_min is out of bounds"); + CCTK_WARN (0, "physical_min is out of bounds"); if(! (physical_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "physical_max is out of bounds"); + CCTK_WARN (0, "physical_max is out of bounds"); if(! (interior_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "interior_min is out of bounds"); + CCTK_WARN (0, "interior_min is out of bounds"); if(! (interior_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "interior_max is out of bounds"); + CCTK_WARN (0, "interior_max is out of bounds"); if(! (exterior_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "exterior_min is out of bounds"); + CCTK_WARN (0, "exterior_min is out of bounds"); if(! (exterior_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "exterior_max is out of bounds"); + CCTK_WARN (0, "exterior_max is out of bounds"); if(! (thespacing)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "thespacing is out of bounds"); + CCTK_WARN (0, "thespacing is out of bounds"); if(! (size == 3)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "size is out of bounds"); + CCTK_WARN (0, "size is out of bounds"); ierr = CoordBase_GetBoundarySpecification (6, nboundaryzones, is_internal, is_staggered, shiftout); if (ierr) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "error returned from function CoordBase_GetBoundarySpecification"); + CCTK_WARN (0, "error returned from function CoordBase_GetBoundarySpecification"); for (d=0; d<3; ++d) { @@ -275,29 +274,29 @@ CCTK_INT CoordBase_ConvertFromInteriorBoundary int ierr; if(! (size>=0)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "size is out of bounds"); + CCTK_WARN (0, "size is out of bounds"); if(! (physical_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "physical_min is out of bounds"); + CCTK_WARN (0, "physical_min is out of bounds"); if(! (physical_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "physical_max is out of bounds"); + CCTK_WARN (0, "physical_max is out of bounds"); if(! (interior_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "interior_min is out of bounds"); + CCTK_WARN (0, "interior_min is out of bounds"); if(! (interior_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "interior_max is out of bounds"); + CCTK_WARN (0, "interior_max is out of bounds"); if(! (exterior_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "exterior_min is out of bounds"); + CCTK_WARN (0, "exterior_min is out of bounds"); if(! (exterior_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "exterior_max is out of bounds"); + CCTK_WARN (0, "exterior_max is out of bounds"); if(! (thespacing)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "thespacing is out of bounds"); + CCTK_WARN (0, "thespacing is out of bounds"); if(! (size == 3)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "size is out of bounds"); + CCTK_WARN (0, "size is out of bounds"); ierr = CoordBase_GetBoundarySpecification (6, nboundaryzones, is_internal, is_staggered, shiftout); if (ierr) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CactusBase", "error returned from function CoordBase_GetBoundarySpecification"); + CCTK_VWarn (0, __LINE__, __FILE__, "CactusBase", "error returned from function CoordBase_GetBoundarySpecification"); for (d=0; d<3; ++d) { @@ -339,29 +338,29 @@ CCTK_INT CoordBase_ConvertFromExteriorBoundary int ierr; if(! (size>=0)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "size is out of bounds"); + CCTK_WARN (0, "size is out of bounds"); if(! (physical_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "physical_min is out of bounds"); + CCTK_WARN (0, "physical_min is out of bounds"); if(! (physical_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "physical_max is out of bounds"); + CCTK_WARN (0, "physical_max is out of bounds"); if(! (interior_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "interior_min is out of bounds"); + CCTK_WARN (0, "interior_min is out of bounds"); if(! (interior_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "interior_max is out of bounds"); + CCTK_WARN (0, "interior_max is out of bounds"); if(! (exterior_min)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "exterior_min is out of bounds"); + CCTK_WARN (0, "exterior_min is out of bounds"); if(! (exterior_max)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "exterior_max is out of bounds"); + CCTK_WARN (0, "exterior_max is out of bounds"); if(! (thespacing)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "thespacing is out of bounds"); + CCTK_WARN (0, "thespacing is out of bounds"); if(! (size == 3)) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "size is out of bounds"); + CCTK_WARN (0, "size is out of bounds"); ierr = CoordBase_GetBoundarySpecification (6, nboundaryzones, is_internal, is_staggered, shiftout); if (ierr) - CCTK_VWarn ( 0, __LINE__, __FILE__, "CoordBase", "Error returned from CoordBase_GetBoundarySpecification"); + CCTK_WARN (0, "Error returned from CoordBase_GetBoundarySpecification"); for (d=0; d<3; ++d) { -- cgit v1.2.3