From 6ac9acb632a460716dea99f28e3e5cb5cec798b3 Mon Sep 17 00:00:00 2001 From: tradke Date: Fri, 19 Apr 2002 08:29:14 +0000 Subject: Bugfix in parameter evaluation: if IOBasic::out*_every was set to 0 it would default to IO::out_every (instead of disabling IOBasic output). git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOBasic/trunk@122 b589c3ab-70e8-4b4d-a09f-cba2dd200880 --- src/OutputInfo.c | 8 +++----- src/OutputScalar.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/OutputInfo.c b/src/OutputInfo.c index 16676e8..071f1a8 100644 --- a/src/OutputInfo.c +++ b/src/OutputInfo.c @@ -314,11 +314,9 @@ static void CheckSteerableParameters (iobasicGH *myGH) /* how often to output */ out_old = myGH->outInfo_every; - myGH->outInfo_every = out_every > 0 ? out_every : -1; - if (outInfo_every > 0) - { - myGH->outInfo_every = outInfo_every; - } + myGH->outInfo_every = outInfo_every >= 0 ? outInfo_every : out_every; + + /* report if frequency changed */ if (myGH->outInfo_every != out_old && ! CCTK_Equals (newverbose, "none")) { if (myGH->outInfo_every > 0) diff --git a/src/OutputScalar.c b/src/OutputScalar.c index 9169821..20c2695 100644 --- a/src/OutputScalar.c +++ b/src/OutputScalar.c @@ -252,11 +252,9 @@ static void CheckSteerableParameters (iobasicGH *myGH) /* how often to output */ out_old = myGH->outScalar_every; - myGH->outScalar_every = out_every > 0 ? out_every : -1; - if (outScalar_every > 0) - { - myGH->outScalar_every = outScalar_every; - } + myGH->outScalar_every = outScalar_every >= 0 ? outScalar_every : out_every; + + /* report if frequency changed */ if (myGH->outScalar_every != out_old && ! CCTK_Equals (newverbose, "none")) { if (myGH->outScalar_every > 0) -- cgit v1.2.3