diff options
Diffstat (limited to 'src/driver/find_horizons.cc')
| -rw-r--r-- | src/driver/find_horizons.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/driver/find_horizons.cc b/src/driver/find_horizons.cc index 8975341..24caa8c 100644 --- a/src/driver/find_horizons.cc +++ b/src/driver/find_horizons.cc @@ -17,7 +17,6 @@ #include "util_Table.h" #include "cctk.h" #include "cctk_Arguments.h" -#include "cctk_Parameters.h" #include "config.h" #include "stdc.h" @@ -93,16 +92,16 @@ extern "C" void AHFinderDirect_find_horizons(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS -DECLARE_CCTK_PARAMETERS // only try to find horizons every find_every time steps -if ((cctk_iteration % find_every) != 0) +if (! state.find_now(cctk_iteration)) then return; // *** NO-OP RETURN *** if (state.timer_handle >= 0) then CCTK_TimerResetI(state.timer_handle); const int my_proc = state.my_proc; +const int N_horizons = state.N_horizons; horizon_sequence& hs = *state.my_hs; const bool active_flag = hs.has_genuine_horizons(); const bool broadcast_horizon_shape = state.mask_info.set_mask_for_any_horizon; @@ -116,13 +115,13 @@ const struct verbose_info& verbose_info = state.verbose_info; // what are the semantics of the Cactus gxx variables? (these may // change from one call to another, so we have to re-check each time) -if (CCTK_Equals(metric_type, "physical")) +if (CCTK_Equals(state.metric_type, "physical")) then cgi.use_Cactus_conformal_metric = false; -else if (CCTK_Equals(metric_type, "static conformal")) +else if (CCTK_Equals(state.metric_type, "static conformal")) then cgi.use_Cactus_conformal_metric = (conformal_state > 0); else CCTK_VWarn(FATAL_ERROR, __LINE__, __FILE__, CCTK_THORNSTRING, -"AHFinderDirect_find_horizons(): unknown metric_type=\"%s\"!", - metric_type); /*NOTREACHED*/ +"AHFinderDirect_find_horizons(): unknown ADMBase::metric_type=\"%s\"!", + state.metric_type); /*NOTREACHED*/ // get the Cactus time step and decide if we want to output h and/or Theta now IO_info.time_iteration = cctk_iteration; @@ -174,7 +173,7 @@ case method__test_expansion_Jacobians: do_test_expansion_Jacobians(my_proc, N_horizons, state.AH_data_array, cgi, gi, Jac_info, - (test_all_Jacobian_compute_methods != 0), + state.test_all_Jacobian_compute_methods, IO_info, error_info, verbose_info, state.timer_handle); break; |