From c4fa6097dbef8188b858a63ad264a10aa7c94d98 Mon Sep 17 00:00:00 2001 From: yye00 Date: Thu, 12 Aug 2004 22:11:25 +0000 Subject: assert fix git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOBasic/trunk@158 b589c3ab-70e8-4b4d-a09f-cba2dd200880 --- src/OutputInfo.c | 11 +++++++---- src/OutputScalar.c | 11 +++++++---- src/Startup.c | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/OutputInfo.c b/src/OutputInfo.c index 252dd48..3bbc7bf 100644 --- a/src/OutputInfo.c +++ b/src/OutputInfo.c @@ -8,7 +8,7 @@ @version $Id$ @@*/ -#include + #include #include #include @@ -96,7 +96,8 @@ static int TimeForOutput (const cGH *cctkGH) { static int output_iteration = -1; static int output_this_iteration; - assert (cctk_iteration >= output_iteration); + if(! (cctk_iteration >= output_iteration)) + CCTK_VWarn ( 0, __LINE__, __FILE__, "IOBasic", "cctk_iteration out of bounds"); if (cctk_iteration > output_iteration) { output_iteration = cctk_iteration; @@ -115,7 +116,8 @@ static int TimeForOutput (const cGH *cctkGH) } else { - assert (0); + if(! (0)) + CCTK_VWarn ( 0, __LINE__, __FILE__, "IOBasic", "outInfo_criterion out of bounds"); } return 1; @@ -424,7 +426,8 @@ void IOBasic_CheckSteerableInfoParameters (iobasicGH *myGH) } else { - assert (0); + if(! (0)) + CCTK_VWarn ( 0, __LINE__, __FILE__, "IOBasic", "outInfo_criterion out of bounds"); } /* check if the 'outInfo_reductions' parameter if it was changed */ diff --git a/src/OutputScalar.c b/src/OutputScalar.c index 243ebb2..6bea771 100644 --- a/src/OutputScalar.c +++ b/src/OutputScalar.c @@ -9,7 +9,7 @@ /* #define IOBASIC_DEBUG 1 */ -#include + #include #include #include @@ -397,7 +397,8 @@ void IOBasic_CheckSteerableScalarParameters (iobasicGH *myGH) } else { - assert (0); + if(! (0)) + CCTK_VWarn ( 0, __LINE__, __FILE__, "IOBasic", "outScalar_criterion out of bounds"); } /* check if the 'outScalar_reductions' parameter if it was changed */ @@ -511,7 +512,8 @@ static int TimeForOutput (const cGH *cctkGH) { static int output_iteration = -1; static int output_this_iteration; - assert (cctk_iteration >= output_iteration); + if(! (cctk_iteration >= output_iteration)) + CCTK_VWarn ( 0, __LINE__, __FILE__, "IOBasic", "cctk_iteration out of bounds"); if (cctk_iteration > output_iteration) { output_iteration = cctk_iteration; @@ -530,7 +532,8 @@ static int TimeForOutput (const cGH *cctkGH) } else { - assert (0); + if(! (0)) + CCTK_VWarn ( 0, __LINE__, __FILE__, "IOBasic", "outScalar_criterion out of bounds"); } return 1; diff --git a/src/Startup.c b/src/Startup.c index 3ac52ea..b88d09e 100644 --- a/src/Startup.c +++ b/src/Startup.c @@ -8,7 +8,7 @@ @version $Id$ @@*/ -#include + #include #include #include -- cgit v1.2.3