From c66c440d5abdcf8e5865dec3551f6495eae97f7e Mon Sep 17 00:00:00 2001 From: tradke Date: Sat, 16 Mar 2002 21:46:14 +0000 Subject: Slightly more informative info messages. git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOASCII/trunk@103 94b1c47f-dcfd-45ef-a468-0854c0e9e350 --- src/Output1D.c | 44 +++++++++++++++++++------------------------- src/Output2D.c | 23 ++++++++++++----------- src/Output3D.c | 19 +++++++++++-------- src/Startup.c | 53 +---------------------------------------------------- 4 files changed, 43 insertions(+), 96 deletions(-) diff --git a/src/Output1D.c b/src/Output1D.c index dae1ffd..8c18aed 100644 --- a/src/Output1D.c +++ b/src/Output1D.c @@ -294,7 +294,6 @@ int IOASCII_TriggerOutput1D (const cGH *GH, int vindex) static void CheckSteerableParameters (asciiioGH *myGH) { int i, num_vars, out_old, times_set; - int verboselength; char *fullname, *msg; static int out1D_vars_lastset = -1; DECLARE_CCTK_PARAMETERS @@ -310,13 +309,16 @@ static void CheckSteerableParameters (asciiioGH *myGH) } /* Report if frequency changed */ - if (myGH->out1D_every != out_old) + if (myGH->out1D_every != out_old && ! CCTK_Equals (newverbose, "none")) { - if (CCTK_Equals (newverbose, "standard") || - CCTK_Equals (newverbose, "full")) + if (myGH->out1D_every > 0) { - CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_1D: Output every %d iterations", - myGH->out1D_every); + CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_1D: Periodic output every %d " + "iterations", myGH->out1D_every); + } + else + { + CCTK_INFO ("IOASCII_1D: Periodic output turned off"); } } @@ -329,31 +331,23 @@ static void CheckSteerableParameters (asciiioGH *myGH) CCTK_TraverseString (out1D_vars, SetOutputFlag, myGH->do_out1D, CCTK_GROUP_OR_VAR); - if (CCTK_Equals (newverbose, "standard") || - CCTK_Equals (newverbose, "full")) + if (! CCTK_Equals (newverbose, "none")) { - - /* Count the length of the string */ - verboselength = 0; - for (i = 0; i < num_vars; i++) - { - if (myGH->do_out1D[i]) - { - fullname = CCTK_FullName (i); - verboselength += strlen(fullname)+1; - free (fullname); - } - } - verboselength += strlen("IOASCII_1D: Output requested for "); - msg = (char *)malloc((verboselength+1)*sizeof(char)); - - sprintf(msg,"IOASCII_1D: Output requested for "); + msg = NULL; for (i = 0; i < num_vars; i++) { if (myGH->do_out1D[i]) { fullname = CCTK_FullName (i); - sprintf (msg, "%s %s",msg,fullname); + if (! msg) + { + Util_asprintf (&msg, "IOASCII_1D: Periodic output requested for " + "'%s'", fullname); + } + else + { + Util_asprintf (&msg, "%s, '%s'", msg, fullname); + } free (fullname); } } diff --git a/src/Output2D.c b/src/Output2D.c index a45c10e..721a067 100644 --- a/src/Output2D.c +++ b/src/Output2D.c @@ -311,13 +311,16 @@ static void CheckSteerableParameters (asciiioGH *myGH) /* Report if frequency changed */ - if (myGH->out2D_every != out_old) + if (myGH->out2D_every != out_old && ! CCTK_Equals (newverbose, "none")) { - if (CCTK_Equals (newverbose, "standard") || - CCTK_Equals (newverbose, "full")) + if (myGH->out2D_every >0) { - CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_2D: Output every %d iterations", - myGH->out2D_every); + CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_2D: Periodic output every %d " + "iterations", myGH->out2D_every); + } + else + { + CCTK_INFO ("IOASCII_2D: Periodic output turned off"); } } @@ -330,8 +333,7 @@ static void CheckSteerableParameters (asciiioGH *myGH) CCTK_TraverseString (out2D_vars, SetOutputFlag, myGH->do_out2D, CCTK_GROUP_OR_VAR); - if (CCTK_Equals (newverbose, "standard") || - CCTK_Equals (newverbose, "full")) + if (! CCTK_Equals (newverbose, "none")) { msg = NULL; for (i = 0; i < num_vars; i++) @@ -341,12 +343,12 @@ static void CheckSteerableParameters (asciiioGH *myGH) fullname = CCTK_FullName (i); if (! msg) { - Util_asprintf (&msg, "IOASCII_2D: Output requested for %s", - fullname); + Util_asprintf (&msg, "IOASCII_2D: Periodic output requested for " + "'%s'", fullname); } else { - Util_asprintf (&msg, "%s %s", msg, fullname); + Util_asprintf (&msg, "%s, '%s'", msg, fullname); } free (fullname); } @@ -361,7 +363,6 @@ static void CheckSteerableParameters (asciiioGH *myGH) /* Save the last setting of 'out2D_vars' parameter */ out2D_vars_lastset = times_set; } - } diff --git a/src/Output3D.c b/src/Output3D.c index f5da3a8..7bd3b55 100644 --- a/src/Output3D.c +++ b/src/Output3D.c @@ -311,13 +311,16 @@ static void CheckSteerableParameters (asciiioGH *myGH) /* Report if frequency changed */ - if (myGH->out3D_every != out_old) + if (myGH->out3D_every != out_old && ! CCTK_Equals (newverbose, "none")) { - if (CCTK_Equals (newverbose, "standard") || - CCTK_Equals (newverbose, "full")) + if (myGH->out3D_every > 0) + { + CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_3D: Periodic output every %d " + "iterations", myGH->out3D_every); + } + else { - CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_3D: Output every %d iterations", - myGH->out3D_every); + CCTK_INFO ("IOASCII_3D: Periodic output turned off"); } } @@ -341,12 +344,12 @@ static void CheckSteerableParameters (asciiioGH *myGH) fullname = CCTK_FullName (i); if (! msg) { - Util_asprintf (&msg, "IOASCII_3D: Output requested for %s", - fullname); + Util_asprintf (&msg, "IOASCII_3D: Periodic output requested for " + "'%s'", fullname); } else { - Util_asprintf (&msg, "%s %s", msg, fullname); + Util_asprintf (&msg, "%s, '%s'", msg, fullname); } free (fullname); } diff --git a/src/Startup.c b/src/Startup.c index 86e639a..de7dfb4 100644 --- a/src/Startup.c +++ b/src/Startup.c @@ -99,9 +99,9 @@ static void *IOASCII_SetupGH (tFleshConfig *config, int convergence_level, cGH *GH) { - DECLARE_CCTK_PARAMETERS int i, j, numvars, maxdim; asciiioGH *newGH; + DECLARE_CCTK_PARAMETERS /* suppress compiler warnings about unused variables */ @@ -182,57 +182,6 @@ static void *IOASCII_SetupGH (tFleshConfig *config, newGH->sp2xyz[i] = (int *) calloc ((i+1), sizeof (int )); } - /* How often to output */ - newGH->out1D_every = out_every > 0 ? out_every : -1; - if (out1D_every > 0) - { - newGH->out1D_every = out1D_every; - } - newGH->out2D_every = out_every > 0 ? out_every : -1; - if (out2D_every > 0) - { - newGH->out2D_every = out2D_every; - } - newGH->out3D_every = out_every > 0 ? out_every : -1; - if (out3D_every > 0) - { - newGH->out3D_every = out3D_every; - } - - if (CCTK_Equals (newverbose, "standard") || - CCTK_Equals (newverbose, "full")) - { - if (out1D_every > 0) - { - CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_1D: Output every %d iterations", - newGH->out1D_every); - } - else - { - CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_1D: Output not activated"); - } - if (out2D_every > 0) - { - CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_2D: Output every %d iterations", - newGH->out2D_every); - } - else - { - CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_2D: Output not activated"); - } - if (out3D_every > 0) - { - CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_3D: Output every %d iterations", - newGH->out3D_every); - } - else - { - CCTK_VInfo (CCTK_THORNSTRING, "IOASCII_3D: Output not activated"); - } - } - - - /* Deal with the output directories */ /* Check whether "outdirXD" was set. If so take this dir otherwise default to "IO::outdir" */ -- cgit v1.2.3