diff options
-rw-r--r-- | run/test-both-ahfinders/both-ahf.par | 18 | ||||
-rw-r--r-- | run/test-both-ahfinders/hemi-ahf.par (renamed from run/test-both-ahfinders/try.par) | 20 | ||||
-rw-r--r-- | run/test-both-ahfinders/hemi.par (renamed from run/test-both-ahfinders/hemi5.par) | 12 | ||||
-rw-r--r-- | run/test-both-ahfinders/hemi5-ahf.par | 57 |
4 files changed, 23 insertions, 84 deletions
diff --git a/run/test-both-ahfinders/both-ahf.par b/run/test-both-ahfinders/both-ahf.par index 6d23397..6bc3e60 100644 --- a/run/test-both-ahfinders/both-ahf.par +++ b/run/test-both-ahfinders/both-ahf.par @@ -39,11 +39,9 @@ AHFinderDirect::find_AHs_at_poststep = "false" AHFinderDirect::verbose_level = "algorithm details" AHFinderDirect::print_timing_stats = "true" -AHFinderDirect::method = "Newton solve" -AHFinderDirect::final_H_update_if_exit_x_H_small = "true" -AHFinderDIrect::surface_integral_method = "Simpson's rule (variant)" -AHFinderDirect::h_base_file_name = "both-ahf.h" -AHFinderDirect::H_of_h_base_file_name = "both-ahf.H" +AHFinderDirect::final_Theta_update_if_Delta_h_converged = "true" +AHFinderDirect::h_base_file_name = "both-ahf.h" +AHFinderDirect::Theta_base_file_name = "both-ahf.Theta" AHFinderDirect::N_horizons = 1 AHFinderDirect::origin_x[1] = 0.5 @@ -55,11 +53,11 @@ AHFinderDirect::N_zones_per_right_angle = 18 AHFinderDirect::geometry_interpolator_pars = "order=3 out_of_range_tolerance={-1.0 -1.0 -1.0 -1.0 -1.0 -1.0}" -AHFinderDirect::initial_guess_method = "sphere" -AHFinderDirect::initial_guess__sphere__x_center[1] = -0.2 -AHFinderDirect::initial_guess__sphere__y_center[1] = 0.3 -AHFinderDirect::initial_guess__sphere__z_center[1] = 0.0 -AHFinderDirect::initial_guess__sphere__radius[1] = 2.0 +AHFinderDirect::initial_guess_method = "coordinate sphere" +AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2 +AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.3 +AHFinderDirect::initial_guess__coord_sphere__z_center[1] = 0.0 +AHFinderDirect::initial_guess__coord_sphere__radius[1] = 2.0 # AHFinder AHFinder::ahf_active = "true" diff --git a/run/test-both-ahfinders/try.par b/run/test-both-ahfinders/hemi-ahf.par index 09220b1..1d96f61 100644 --- a/run/test-both-ahfinders/try.par +++ b/run/test-both-ahfinders/hemi-ahf.par @@ -1,5 +1,5 @@ # parameter file for patch system test -ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect" +ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge StaticConformal Exact AHFinderDirect" # flesh cactus::cctk_itlast = 0 @@ -34,11 +34,9 @@ AHFinderDirect::find_AHs_at_poststep = "false" AHFinderDirect::verbose_level = "algorithm details" AHFinderDirect::print_timing_stats = "true" -AHFinderDirect::method = "Newton solve" -AHFinderDirect::final_H_update_if_exit_x_H_small = "true" -AHFinderDIrect::surface_integral_method = "Simpson's rule (variant)" -AHFinderDirect::h_base_file_name = "try.h" -AHFinderDirect::H_of_h_base_file_name = "try.H" +AHFinderDirect::final_Theta_update_if_Delta_h_converged = "true" +AHFinderDirect::h_base_file_name = "hemi-ahf.h" +AHFinderDirect::Theta_base_file_name = "hemi-ahf.Theta" AHFinderDirect::N_horizons = 1 AHFinderDirect::origin_x[1] = 0.5 @@ -50,8 +48,8 @@ AHFinderDirect::N_zones_per_right_angle = 18 AHFinderDirect::geometry_interpolator_pars = "order=3 out_of_range_tolerance={-1.0 -1.0 -1.0 -1.0 -1.0 -1.0}" -AHFinderDirect::initial_guess_method = "sphere" -AHFinderDirect::initial_guess__sphere__x_center[1] = -0.2 -AHFinderDirect::initial_guess__sphere__y_center[1] = 0.3 -AHFinderDirect::initial_guess__sphere__z_center[1] = 0.0 -AHFinderDirect::initial_guess__sphere__radius[1] = 2.0 +AHFinderDirect::initial_guess_method = "coordinate sphere" +AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2 +AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.3 +AHFinderDirect::initial_guess__coord_sphere__z_center[1] = 0.0 +AHFinderDirect::initial_guess__coord_sphere__radius[1] = 2.0 diff --git a/run/test-both-ahfinders/hemi5.par b/run/test-both-ahfinders/hemi.par index bf7a645..b2d2285 100644 --- a/run/test-both-ahfinders/hemi5.par +++ b/run/test-both-ahfinders/hemi.par @@ -1,5 +1,5 @@ # parameter file for patch system test -ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect" +ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge StaticConformal Exact AHFinderDirect" # flesh cactus::cctk_itlast = 0 @@ -34,11 +34,11 @@ AHFinderDirect::find_AHs_at_poststep = "false" AHFinderDirect::verbose_level = "algorithm details" AHFinderDirect::print_timing_stats = "true" -AHFinderDirect::method = "horizon function" -AHFinderDirect::final_H_update_if_exit_x_H_small = "true" -AHFinderDIrect::surface_integral_method = "Simpson's rule (variant)" -AHFinderDirect::h_base_file_name = "hemi5.h" -AHFinderDirect::H_of_h_base_file_name = "hemi5.H" +AHFinderDirect::method = "evaluate expansion" +AHFinderDirect::final_Theta_update_if_Delta_h_converged = "true" +AHFinderDirect::h_base_file_name = "hemi.h" +AHFinderDirect::how_often_to_output_Theta = 1 +AHFinderDirect::Theta_base_file_name = "hemi.Theta" AHFinderDirect::N_horizons = 1 AHFinderDirect::origin_x[1] = 0.5 diff --git a/run/test-both-ahfinders/hemi5-ahf.par b/run/test-both-ahfinders/hemi5-ahf.par deleted file mode 100644 index 9d1a4f0..0000000 --- a/run/test-both-ahfinders/hemi5-ahf.par +++ /dev/null @@ -1,57 +0,0 @@ -# parameter file for patch system test -ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect" - -# flesh -cactus::cctk_itlast = 0 - -# PUGH -driver::ghost_size = 2 -driver::global_nx = 31 -driver::global_ny = 31 -driver::global_nz = 17 - -# CartGrid3D -grid::domain = "bitant" -grid::avoid_origin = "false" -grid::type = "byspacing" -grid::dxyz = 0.2 - -# ADMBase -ADMBase::initial_lapse = "exact" -ADMBase::initial_shift = "exact" -ADMBase::initial_data = "exact" -ADMBase::lapse_evolution_method = "static" -ADMBase::shift_evolution_method = "static" -ADMBase::metric_type = "physical" - -# Exact -Exact::exact_model = "Kerr/Kerr-Schild" -Exact::Kerr_KerrSchild__mass = 1.0 -Exact::Kerr_KerrSchild__spin = 0.6 - -AHFinderDirect::find_AHs_at_postinitial = "true" -AHFinderDirect::find_AHs_at_poststep = "false" -AHFinderDirect::verbose_level = "algorithm details" -AHFinderDirect::print_timing_stats = "true" - -AHFinderDirect::method = "Newton solve" -AHFinderDirect::final_H_update_if_exit_x_H_small = "true" -AHFinderDIrect::surface_integral_method = "Simpson's rule (variant)" -AHFinderDirect::h_base_file_name = "hemi5-ahf.h" -AHFinderDirect::H_of_h_base_file_name = "hemi5-ahf.H" - -AHFinderDirect::N_horizons = 1 -AHFinderDirect::origin_x[1] = 0.5 -AHFinderDirect::origin_y[1] = 0.7 -AHFinderDirect::origin_z[1] = 0.0 -AHFinderDirect::ghost_zone_width = 2 -AHFinderDirect::patch_overlap_width = 1 -AHFinderDirect::N_zones_per_right_angle = 18 - -AHFinderDirect::geometry_interpolator_pars = "order=3 out_of_range_tolerance={-1.0 -1.0 -1.0 -1.0 -1.0 -1.0}" - -AHFinderDirect::initial_guess_method = "sphere" -AHFinderDirect::initial_guess__sphere__x_center[1] = -0.2 -AHFinderDirect::initial_guess__sphere__y_center[1] = 0.3 -AHFinderDirect::initial_guess__sphere__z_center[1] = 0.0 -AHFinderDirect::initial_guess__sphere__radius[1] = 2.0 |