diff options
| -rw-r--r-- | interface.ccl | 8 | ||||
| -rw-r--r-- | param.ccl | 36 | ||||
| -rw-r--r-- | schedule.ccl | 10 |
3 files changed, 4 insertions, 50 deletions
diff --git a/interface.ccl b/interface.ccl index aaf8897..8ccbd3d 100644 --- a/interface.ccl +++ b/interface.ccl @@ -93,14 +93,12 @@ ahfgrid3, ahf_exp3 } "Grid functions to use in find3 algorithm" -real drift_correct_vars type=SCALAR +real ahf_centroid type=SCALAR { ahf_centroid_x, ahf_centroid_y, - ahf_omega_corr, - ahf_omega_cum - ahf_radvel_corr, -} "Variables for drift correction" + ahf_centroid_z +} "Centroid of one of the horizons" int drift_check type=SCALAR { @@ -61,33 +61,6 @@ REAL trapped_surface_delta "find (expansion = delta) surface" STEERABLE = ALWAYS : :: "Just a real number" } 0.0 -######################################################## -### Parameters for drift-correction/horizon-tracking ### -######################################################## - -BOOLEAN drift_correct_on "Apply drift correction (horizon-tracking shift rotation) in the angular/tangential direction" STEERABLE = ALWAYS -{ -} "no" - -INT drift_correct_horizon "Which horizon to use for drift correction (angular and radial)" -{ -0:2 :: "There are only three horizons" -} 0 - -REAL drift_correct_factor "Multiplier to use in (angular) drift correction, e.g. to over-correct the drift" STEERABLE = ALWAYS -{ - : :: "Just a real number" -} 1.1 - -BOOLEAN rad_drift_correct_on "Apply drift correction in the radial direction" STEERABLE = ALWAYS -{ -} "no" - -REAL rad_drift_correct_factor "Multiplier to use in radial drift correction, e.g. to over-correct the drift" STEERABLE = ALWAYS -{ - : :: "Just a real number" -} 1.1 - ######################################## ### Parameters for surface expansion ### @@ -531,13 +504,4 @@ shares: einstein USES BOOLEAN use_mask "" -EXTENDS KEYWORD shift "Which shift condition to use" -{ - "ahfinder" :: "Set the shift after finding horizon" -} "" - -USES REAL rotation_omega -USES REAL rotation_psipower - - diff --git a/schedule.ccl b/schedule.ccl index 8522cc2..8174b04 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -15,18 +15,10 @@ schedule AHFinder_Startup at CCTK_STARTUP LANG: C } "Register AHFinder as an IO Method" -schedule AHFinder_initdrift at CCTK_INITIAL -{ - LANG: FORTRAN -} "Initialize drift_first, ahf_omega_cum and ahf_omega_corr" - if (ahf_active) { - STORAGE: hole1_bounds,hole2_bounds,hole3_bounds,drift_correct_vars - - STORAGE: drift_check - + STORAGE: hole1_bounds,hole2_bounds,hole3_bounds,ahf_centroid STORAGE: out_scalars STORAGE: ahfinder_gaussian if (ahf_lmax > 0) |