diff options
| -rw-r--r-- | doc/documentation.tex | 4 | ||||
| -rw-r--r-- | interface.ccl | 2 | ||||
| -rw-r--r-- | par/Kerr-centered.par | 2 | ||||
| -rw-r--r-- | par/Kerr.par | 2 | ||||
| -rw-r--r-- | param.ccl | 4 | ||||
| -rw-r--r-- | src/driver/driver.hh | 3 | ||||
| -rw-r--r-- | src/driver/find_horizons.cc | 8 | ||||
| -rw-r--r-- | src/driver/setup.cc | 4 |
8 files changed, 14 insertions, 15 deletions
diff --git a/doc/documentation.tex b/doc/documentation.tex index 7258ec5..cb008ab 100644 --- a/doc/documentation.tex +++ b/doc/documentation.tex @@ -658,13 +658,13 @@ parameters controlling if, how often, and how these should be written to data files: \begin{description} -\item[\code{how\_often\_to\_output\_h}] +\item[\code{output\_h\_every}] \mbox{}\\ If \verb|find_AHs_at_poststep| is set to true, \thorn{AHFinderDirect} will try to find the apparent horizon(s) at every time step. However, you can control how often (if at all) the apparent horizon shape(s) are written to - data files: this is only done if \verb|how_often_to_output_h| + data files: this is only done if \verb|output_h_every| is nonzero, and the Cactus time step number \verb|cctk_iteration| is an integral multiple of this parameter. diff --git a/interface.ccl b/interface.ccl index 5f9c416..7b58b4e 100644 --- a/interface.ccl +++ b/interface.ccl @@ -2,7 +2,7 @@ # $Header$ implements: AHFinderDirect -inherits: Grid ADMBase StaticConformal SpaceMask +inherits: Grid ADMBase StaticConformal SpaceMask IO # include file provided by SpaceMask USES INCLUDE: SpaceMask.h diff --git a/par/Kerr-centered.par b/par/Kerr-centered.par index 11dfd86..70630ac 100644 --- a/par/Kerr-centered.par +++ b/par/Kerr-centered.par @@ -36,7 +36,7 @@ ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect" AHFinderDirect::print_timing_stats = "true" -AHFinderDirect::how_often_to_output_Theta = 1 +AHFinderDirect::output_Theta_every = 1 AHFinderDirect::h_base_file_name = "Kerr.h" AHFinderDirect::Theta_base_file_name = "Kerr.Theta" diff --git a/par/Kerr.par b/par/Kerr.par index 07daf4c..1de0a26 100644 --- a/par/Kerr.par +++ b/par/Kerr.par @@ -36,7 +36,7 @@ ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect" AHFinderDirect::print_timing_stats = "true" -AHFinderDirect::how_often_to_output_Theta = 1 +AHFinderDirect::output_Theta_every = 1 AHFinderDirect::h_base_file_name = "Kerr.h" AHFinderDirect::Theta_base_file_name = "Kerr.Theta" @@ -264,7 +264,7 @@ real initial_guess__coord_ellipsoid__z_radius[11] "z radius of ellipsoid" # apparent horizons at each time step, and compute/print small-sized # diagnostics, but this parameter may be used to reduce the number # and size of output files -int how_often_to_output_h \ +int output_h_every \ "how often (in Cactus time steps) should we output h (0 to disable)?" { 0 :: "don't output h at all" @@ -273,7 +273,7 @@ int how_often_to_output_h \ # setting this > 0 is probably only of interest if the Newton iteration # fails to converge, or if you're debugging AHFinderDirect internals -int how_often_to_output_Theta \ +int output_Theta_every \ "how often (in Cactus time steps) should we output the Theta(h) functions?" { 0 :: "don't output Theta(h) at all" diff --git a/src/driver/driver.hh b/src/driver/driver.hh index dca349e..c60d3b6 100644 --- a/src/driver/driver.hh +++ b/src/driver/driver.hh @@ -124,8 +124,7 @@ struct IO_info { enum horizon_file_format horizon_file_format; bool output_initial_guess; - int how_often_to_output_h, - how_often_to_output_Theta; + int output_h_every, output_Theta_every; // based on the above, do we want to output things now (this time step)? bool output_h, output_Theta; diff --git a/src/driver/find_horizons.cc b/src/driver/find_horizons.cc index 2a0cd39..1d457cf 100644 --- a/src/driver/find_horizons.cc +++ b/src/driver/find_horizons.cc @@ -124,11 +124,11 @@ else CCTK_VWarn(FATAL_ERROR, __LINE__, __FILE__, CCTK_THORNSTRING, IO_info.time_iteration = cctk_iteration; IO_info.time = cctk_time; IO_info.output_h - = (IO_info.how_often_to_output_h > 0) - && ((IO_info.time_iteration % IO_info.how_often_to_output_h) == 0); + = (IO_info.output_h_every > 0) + && ((IO_info.time_iteration % IO_info.output_h_every) == 0); IO_info.output_Theta - = (IO_info.how_often_to_output_Theta > 0) - && ((IO_info.time_iteration % IO_info.how_often_to_output_Theta) == 0); + = (IO_info.output_Theta_every > 0) + && ((IO_info.time_iteration % IO_info.output_Theta_every) == 0); // set initial guess for any (genuine) horizons that need it, // i.e. for any (genuine) horizons where we didn't find the horizon previously diff --git a/src/driver/setup.cc b/src/driver/setup.cc index b5703da..b48faa9 100644 --- a/src/driver/setup.cc +++ b/src/driver/setup.cc @@ -243,8 +243,8 @@ solver_info.Theta_norm_for_convergence = Theta_norm_for_convergence; struct IO_info& IO_info = state.IO_info; IO_info.horizon_file_format = decode_horizon_file_format(horizon_file_format); IO_info.output_initial_guess = (output_initial_guess != 0); -IO_info.how_often_to_output_h = how_often_to_output_h; -IO_info.how_often_to_output_Theta = how_often_to_output_Theta; +IO_info.output_h_every = output_h_every; +IO_info.output_Theta_every = output_Theta_every; IO_info.output_h = false; // dummy value IO_info.output_Theta = false; // dummy value IO_info.output_ghost_zones_for_h = (output_ghost_zones_for_h != 0); |