From bb8612ae0c144ec379e06f6ec52f27f6a2f134a7 Mon Sep 17 00:00:00 2001 From: allen Date: Sun, 26 Aug 2001 17:22:14 +0000 Subject: Adding more output for newverbose parameter on startup/steering: - IO method registration - Directory used - Output every - Variables output git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOBasic/trunk@100 b589c3ab-70e8-4b4d-a09f-cba2dd200880 --- src/OutputScalar.c | 26 ++++++++++++++++++++++++++ src/Startup.c | 9 +++++---- 2 files changed, 31 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/OutputScalar.c b/src/OutputScalar.c index 155b1dc..ed9c149 100644 --- a/src/OutputScalar.c +++ b/src/OutputScalar.c @@ -288,17 +288,30 @@ int IOBasic_TriggerScalarOutput (cGH *GH, int vindex) static void CheckSteerableParameters (iobasicGH *myGH) { DECLARE_CCTK_PARAMETERS + int out_old; int times_set; + int i; static int outScalar_vars_lastset = -1; /* 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; } + if (myGH->outScalar_every != out_old) + { + if (CCTK_Equals (newverbose, "standard") || + CCTK_Equals (newverbose, "full")) + { + CCTK_VInfo (CCTK_THORNSTRING, "Scalar: Output every %d iterations", + myGH->outScalar_every); + } + } + /* re-parse the 'outScalar_vars' parameter if it was changed */ times_set = CCTK_ParameterQueryTimesSet ("outScalar_vars", CCTK_THORNSTRING); if (times_set != outScalar_vars_lastset) @@ -307,6 +320,19 @@ static void CheckSteerableParameters (iobasicGH *myGH) CCTK_TraverseString (outScalar_vars, SetOutputFlag, myGH->do_outScalar, CCTK_GROUP_OR_VAR); + if (CCTK_Equals (newverbose, "standard") || + CCTK_Equals (newverbose, "full")) + { + for (i=0;ido_outScalar[i]) + { + CCTK_VInfo (CCTK_THORNSTRING, + "Scalar: Output requested for %s",CCTK_FullName(i)); + } + } + } + /* Save the last setting of 'outScalar_vars' parameter */ outScalar_vars_lastset = times_set; } diff --git a/src/Startup.c b/src/Startup.c index c6eed2d..30c6bc4 100644 --- a/src/Startup.c +++ b/src/Startup.c @@ -182,12 +182,13 @@ static void *IOBasic_SetupGH (tFleshConfig *config, "IOBasic_SetupGH: Couldn't create Scalar output directory " "'%s'", newGH->outdirScalar); } - else if (i > 0 && CCTK_Equals (newverbose, "full")) + else if (i >= 0 && CCTK_Equals (newverbose, "full")) { - CCTK_VInfo (CCTK_THORNSTRING, - "IOBasic_InitGH: Scalar output directory '%s' already " - "exists", newGH->outdirScalar); + CCTK_VInfo (CCTK_THORNSTRING, + "Scalar: Output to directory '%s'", + newGH->outdirScalar); } + } } -- cgit v1.2.3