aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortradke <tradke@b589c3ab-70e8-4b4d-a09f-cba2dd200880>2002-04-19 08:29:14 +0000
committertradke <tradke@b589c3ab-70e8-4b4d-a09f-cba2dd200880>2002-04-19 08:29:14 +0000
commit6ac9acb632a460716dea99f28e3e5cb5cec798b3 (patch)
tree5f23c853ba20ed5ebc7646e701725e2b12da424d
parentfcc32346de7a793060209a0fe959b366a3db3183 (diff)
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
-rw-r--r--src/OutputInfo.c8
-rw-r--r--src/OutputScalar.c8
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)