diff options
Diffstat (limited to 'src/OutputInfo.c')
| -rw-r--r-- | src/OutputInfo.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/OutputInfo.c b/src/OutputInfo.c index c704ac2..252dd48 100644 --- a/src/OutputInfo.c +++ b/src/OutputInfo.c @@ -57,7 +57,6 @@ CCTK_FILEVERSION(CactusBase_IOBasic_OutputInfo_c) /******************************************************************** ******************** Internal Routines ************************ ********************************************************************/ -static void CheckSteerableParameters (iobasicGH *myGH); static void PrintHeader (iobasicGH *myGH, int num_vars); static int TimeForOutput (const cGH *cctkGH); @@ -72,7 +71,7 @@ static int TimeForOutput (const cGH *cctkGH) myGH = CCTK_GHExtension (cctkGH, "IOBasic"); /* check if steerable parameters changed */ - CheckSteerableParameters (myGH); + IOBasic_CheckSteerableInfoParameters (myGH); /* how to decide when to output? */ /* (return if no output is required) */ @@ -130,7 +129,7 @@ static int TimeForOutput (const cGH *cctkGH) @desc Loops over all variables and prints output if requested @enddesc - @calls CheckSteerableParameters + @calls IOBasic_CheckSteerableInfoParameters PrintHeader IOBasic_WriteInfo @@ -157,7 +156,7 @@ int IOBasic_InfoOutputGH (const cGH *GH) myGH = CCTK_GHExtension (GH, "IOBasic"); /* check if steerable parameters changed */ - CheckSteerableParameters (myGH); + IOBasic_CheckSteerableInfoParameters (myGH); if (! TimeForOutput(GH)) return 0; @@ -232,7 +231,7 @@ int IOBasic_InfoOutputGH (const cGH *GH) @desc Decides if it is time to output a variable using info output @enddesc - @calls CheckSteerableParameters + @calls IOBasic_CheckSteerableInfoParameters @var GH @vdesc Pointer to CCTK GH @@ -260,7 +259,7 @@ int IOBasic_TimeForInfoOutput (const cGH *GH, int vindex) myGH = CCTK_GHExtension (GH, "IOBasic"); /* check if steerable parameters changed */ - CheckSteerableParameters (myGH); + IOBasic_CheckSteerableInfoParameters (myGH); if (myGH->info_reductions[vindex].num_reductions == 0) { @@ -337,11 +336,8 @@ int IOBasic_TriggerInfoOutput (const cGH *GH, int vindex) } -/******************************************************************** - ******************** Internal Routines ************************ - ********************************************************************/ /*@@ - @routine CheckSteerableParameters + @routine IOBasic_CheckSteerableInfoParameters @date Tue 31 Jul 2001 @author Thomas Radke @desc @@ -359,7 +355,7 @@ int IOBasic_TriggerInfoOutput (const cGH *GH, int vindex) @vio in @endvar @@*/ -static void CheckSteerableParameters (iobasicGH *myGH) +void IOBasic_CheckSteerableInfoParameters (iobasicGH *myGH) { int vindex, out_old, times_set, update_reductions_list; CCTK_REAL outdt_old; @@ -385,12 +381,12 @@ static void CheckSteerableParameters (iobasicGH *myGH) { if (myGH->outInfo_every > 0) { - CCTK_VInfo (CCTK_THORNSTRING, "Info: Periodic output every %d iterations", + CCTK_VInfo (CCTK_THORNSTRING, "Periodic info output every %d iterations", myGH->outInfo_every); } else { - CCTK_INFO ("Info: Periodic output turned off"); + CCTK_INFO ("Periodic info output turned off"); } } @@ -411,12 +407,12 @@ static void CheckSteerableParameters (iobasicGH *myGH) { if (myGH->outInfo_dt >= 0) { - CCTK_VInfo (CCTK_THORNSTRING, "Info: Periodic output dt %g", + CCTK_VInfo (CCTK_THORNSTRING, "Periodic info output dt %g", (double)myGH->outInfo_dt); } else { - CCTK_INFO ("Info: Periodic output turned off"); + CCTK_INFO ("Periodic info output turned off"); } } @@ -467,7 +463,8 @@ static void CheckSteerableParameters (iobasicGH *myGH) if (CCTK_TraverseString (outInfo_vars, IOBasic_AssignReductionList, &info, CCTK_GROUP_OR_VAR) < 0) { - CCTK_WARN (1, "Failed to parse 'IOBasic::outInfo_vars' parameter"); + CCTK_WARN (myGH->stop_on_parse_errors ? 0 : 1, + "error while parsing parameter 'IOBasic::outInfo_vars'"); } myGH->info_reductions_changed = 1; @@ -475,6 +472,9 @@ static void CheckSteerableParameters (iobasicGH *myGH) } +/******************************************************************** + ******************** Internal Routines ************************ + ********************************************************************/ /*@@ @routine PrintHeader @date Tue 31 Jul 2001 @@ -517,7 +517,7 @@ static void PrintHeader (iobasicGH *myGH, int num_vars) fullname = CCTK_FullName (vindex); if (! msg) { - Util_asprintf (&msg, "Info: Periodic output requested for '%s'", + Util_asprintf (&msg, "Periodic info output requested for '%s'", fullname); } else |