From 37ada2bda567f0b1e6b8ebb70c67795754798e95 Mon Sep 17 00:00:00 2001 From: tradke Date: Fri, 19 Apr 2002 08:23:19 +0000 Subject: Bugfix in parameter evaluation: if IOASCII::out*D_every was set to 0 it would default to IO::out_every (instead of disabling IOASCII output). git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOASCII/trunk@109 94b1c47f-dcfd-45ef-a468-0854c0e9e350 --- src/Output1D.c | 3 +-- src/Output2D.c | 3 +-- src/Output3D.c | 3 +-- src/Startup.c | 6 +++--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Output1D.c b/src/Output1D.c index 47f9b4a..5b1a297 100644 --- a/src/Output1D.c +++ b/src/Output1D.c @@ -58,7 +58,6 @@ int IOASCII_Output1DGH (const cGH *GH) myGH = (asciiioGH *) CCTK_GHExtension (GH, "IOASCII"); - CheckSteerableParameters (myGH); /* loop over all variables */ for (vindex = retval = 0; vindex < CCTK_NumVars (); vindex++) @@ -249,7 +248,7 @@ static void CheckSteerableParameters (asciiioGH *myGH) /* how often to output */ i = myGH->out1D_every_default; - myGH->out1D_every_default = out1D_every > 0 ? out1D_every : out_every; + myGH->out1D_every_default = out1D_every >= 0 ? out1D_every : out_every; /* report if frequency changed */ if (myGH->out1D_every_default != i && ! CCTK_Equals (newverbose, "none")) diff --git a/src/Output2D.c b/src/Output2D.c index ec806c9..f62a635 100644 --- a/src/Output2D.c +++ b/src/Output2D.c @@ -58,7 +58,6 @@ int IOASCII_Output2DGH (const cGH *GH) myGH = (asciiioGH *) CCTK_GHExtension (GH, "IOASCII"); - CheckSteerableParameters (myGH); /* loop over all variables */ for (vindex = retval = 0; vindex < CCTK_NumVars (); vindex++) @@ -249,7 +248,7 @@ static void CheckSteerableParameters (asciiioGH *myGH) /* how often to output */ i = myGH->out2D_every_default; - myGH->out2D_every_default = out2D_every > 0 ? out2D_every : out_every; + myGH->out2D_every_default = out2D_every >= 0 ? out2D_every : out_every; /* report if frequency changed */ if (myGH->out2D_every_default != i && ! CCTK_Equals (newverbose, "none")) diff --git a/src/Output3D.c b/src/Output3D.c index e31f86f..c2f8dc4 100644 --- a/src/Output3D.c +++ b/src/Output3D.c @@ -58,7 +58,6 @@ int IOASCII_Output3DGH (const cGH *GH) myGH = (asciiioGH *) CCTK_GHExtension (GH, "IOASCII"); - CheckSteerableParameters (myGH); /* loop over all variables */ for (vindex = retval = 0; vindex < CCTK_NumVars (); vindex++) @@ -250,7 +249,7 @@ static void CheckSteerableParameters (asciiioGH *myGH) /* how often to output */ i = myGH->out3D_every_default; - myGH->out3D_every_default = out3D_every > 0 ? out3D_every : out_every; + myGH->out3D_every_default = out3D_every >= 0 ? out3D_every : out_every; /* report if frequency changed */ if (myGH->out3D_every_default != i && ! CCTK_Equals (newverbose, "none")) diff --git a/src/Startup.c b/src/Startup.c index 73ad0e4..fc9325e 100644 --- a/src/Startup.c +++ b/src/Startup.c @@ -198,9 +198,9 @@ static void *IOASCII_SetupGH (tFleshConfig *config, int conv_level, cGH *GH) myGH->out1D_vars = strdup (""); myGH->out2D_vars = strdup (""); myGH->out3D_vars = strdup (""); - myGH->out1D_every_default = 0; - myGH->out2D_every_default = 0; - myGH->out3D_every_default = 0; + myGH->out1D_every_default = out1D_every - 1; + myGH->out2D_every_default = out2D_every - 1; + myGH->out3D_every_default = out3D_every - 1; myGH->filenameList1D = NULL; myGH->fileList_2D = NULL; -- cgit v1.2.3