diff options
Diffstat (limited to 'src/driver/setup.cc')
| -rw-r--r-- | src/driver/setup.cc | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/driver/setup.cc b/src/driver/setup.cc index 1eb977f..fc8fdee 100644 --- a/src/driver/setup.cc +++ b/src/driver/setup.cc @@ -238,11 +238,9 @@ solver_info.max_Newton_iterations__subsequent = max_Newton_iterations__subsequent; solver_info.max_allowable_Delta_h_over_h = max_allowable_Delta_h_over_h; solver_info.Theta_norm_for_convergence = Theta_norm_for_convergence; -solver_info.max_allowable_horizon_radius - = new double[state.N_horizons+1]; // horizon numbers run from - // 1 to N_horizons inclusive - // so the array size is - // N_horizons+1 +// ... horizon numbers run from 1 to N_horizons inclusive +// so the array size is N_horizons+1 +solver_info.max_allowable_horizon_radius = new double[state.N_horizons+1]; { for (int hn = 0 ; hn <= N_horizons ; ++hn) { @@ -299,8 +297,21 @@ state.BH_diagnostics_info.integral_method // mask parameters // struct mask_info& mask_info = state.mask_info; -mask_info.set_mask = (set_mask != 0); -if (mask_info.set_mask) +mask_info.set_mask_for_any_horizon = false; +// ... horizon numbers run from 1 to N_horizons inclusive +// so the array size is N_horizons+1 +mask_info.set_mask_for_this_horizon = new bool[N_horizons+1]; + { + for (int hn = 1 ; hn <= N_horizons ; ++hn) + { + mask_info.set_mask_for_this_horizon[hn] + = (set_mask_for_all_horizons != 0) + || (set_mask_for_individual_horizon[hn] != 0); + mask_info.set_mask_for_any_horizon + |= mask_info.set_mask_for_this_horizon[hn]; + } + } +if (mask_info.set_mask_for_any_horizon) then { mask_info.radius_multiplier = mask_radius_multiplier; mask_info.radius_offset = mask_radius_offset; @@ -359,8 +370,8 @@ state.N_active_procs hs, verbose_info); -// horizon numbers run from 1 to N_horizons inclusive -// so the array size is N_horizons+1 +// ... horizon numbers run from 1 to N_horizons inclusive +// so the array size is N_horizons+1 state.AH_data_array = new AH_data*[N_horizons+1]; { for (int hn = 0 ; hn <= N_horizons ; ++hn) |