diff options
Diffstat (limited to 'src/driver/setup.cc')
| -rw-r--r-- | src/driver/setup.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/driver/setup.cc b/src/driver/setup.cc index d2a59b1..34cc0cd 100644 --- a/src/driver/setup.cc +++ b/src/driver/setup.cc @@ -111,11 +111,10 @@ verbose_info.print_algorithm_details = (state.verbose_info.verbose_level >= verbose_level__algorithm_details); state.timer_handle = (print_timing_stats != 0) ? CCTK_TimerCreateI() : -1; -state.surface_integral_method - = patch::decode_integration_method(surface_integral_method); struct IO_info& IO_info = state.IO_info; IO_info.file_format = decode_file_format(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_H = how_often_to_output_H_of_h; IO_info.output_ghost_zones_for_h = (output_ghost_zones_for_h != 0); @@ -134,7 +133,6 @@ Jac_info.Jacobian_storage_method Jac_info.perturbation_amplitude = Jacobian_perturbation_amplitude; struct solver_info& solver_info = state.solver_info; -solver_info.output_initial_guess = (output_initial_guess != 0); solver_info.debugging_output_at_each_Newton_iteration = (debugging_output_at_each_Newton_iteration != 0); solver_info.max_Newton_iterations__initial @@ -213,6 +211,13 @@ gi.check_that_geometry_is_finite = (check_that_geometry_is_finite != 0); // +// other misc setup +// +state.diagnostics_info.surface_integral_method + = patch::decode_integration_method(surface_integral_method); + + +// // create AH-specific info for each AH // @@ -354,12 +359,10 @@ enum method { if (STRING_EQUAL(method_string, "horizon function")) then return method__horizon_function; -else if (STRING_EQUAL(method_string, "Jacobian test")) - then return method__Jacobian_test; -else if (STRING_EQUAL(method_string, "Jacobian test (NP only)")) - then return method__Jacobian_test_NP_only; -else if (STRING_EQUAL(method_string, "Newton solve")) - then return method__Newton_solve; +else if (STRING_EQUAL(method_string, "test Jacobian")) + then return method__test_Jacobian; +else if (STRING_EQUAL(method_string, "find horizon")) + then return method__find_horizon; else CCTK_VWarn(-1, __LINE__, __FILE__, CCTK_THORNSTRING, "decode_method(): unknown method_string=\"%s\"!", method_string); /*NOTREACHED*/ |