diff options
| -rw-r--r-- | interface.ccl | 48 | ||||
| -rw-r--r-- | param.ccl | 94 | ||||
| -rw-r--r-- | schedule.ccl | 8 |
3 files changed, 54 insertions, 96 deletions
diff --git a/interface.ccl b/interface.ccl index 16c6baf..55dc0d7 100644 --- a/interface.ccl +++ b/interface.ccl @@ -6,6 +6,10 @@ implements: ahfinder inherits: interp einstein grid IO +################## +### PUBLIC ### +################## + public: real ahfindergrid type=GF @@ -24,6 +28,45 @@ ahmask } "Grid function for masking" +############################### +### Scalars for excision ### +############################### + +real hole1_bounds type=SCALAR +{ +dhole1_xmin, +dhole1_ymin, +dhole1_zmin, +dhole1_xmax, +dhole1_ymax, +dhole1_zmax +} "Bounds of excision box for hole 1" + +real hole2_bounds type=SCALAR +{ +dhole2_xmin, +dhole2_ymin, +dhole2_zmin, +dhole2_xmax, +dhole2_ymax, +dhole2_zmax +} "Bounds of excision box for hole 2" + +real hole3_bounds type=SCALAR +{ +dhole3_xmin, +dhole3_ymin, +dhole3_zmin, +dhole3_xmax, +dhole3_ymax, +dhole3_zmax +} "Bounds of excision box for hole 3" + + +################### +### PRIVATE ### +################### + private: real ahfgradient type=GF @@ -44,3 +87,8 @@ real find3grid type=GF ahfgrid3, ahf_exp3 } "Grid functions to use in find3 algorithm" + + + + + @@ -17,100 +17,6 @@ BOOLEAN ahf_persists "Do the finder grid functions stay around?" } "yes" -# Parameters for excision. These parameters are not supposed -# to be set in the parameter file. Instead, they are modified -# by the finder at run time (not very kosher, but it works). - -REAL dhole1_xmin "Lower x bound of excised region 1" -{ -: :: "Any value" -} 0.0 - -REAL dhole1_ymin "Lower y bound of excised region 1" -{ -: :: "Any value" -} 0.0 - -REAL dhole1_zmin "Lower z bound of excised region 1" -{ -: :: "Any value" -} 0.0 - -REAL dhole1_xmax "Upper x bound of excised region 1" -{ -: :: "Any value" -} 0.0 - -REAL dhole1_ymax "Upper y bound of excised region 1" -{ -: :: "Any value" -} 0.0 - -REAL dhole1_zmax "Upper z bound of excised region 1" -{ -: :: "Any value" -} 0.0 - -REAL dhole2_xmin "Lower x bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole2_ymin "Lower y bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole2_zmin "Lower z bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole2_xmax "Upper x bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole2_ymax "Upper y bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole2_zmax "Upper z bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole3_xmin "Lower x bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole3_ymin "Lower y bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole3_zmin "Lower z bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole3_xmax "Upper x bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole3_ymax "Upper y bound of excised region 2" -{ -: :: "Any value" -} 0.0 - -REAL dhole3_zmax "Upper z bound of excised region 2" -{ -: :: "Any value" -} 0.0 - ############################## ### PRIVATE PARAMETERS ### diff --git a/schedule.ccl b/schedule.ccl index 2a9d464..3d11cb5 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -13,7 +13,9 @@ schedule AHFinder_SetSym at CCTK_BASEGRID if (ahf_persists) { - STORAGE: ahfindergrid,ahfinderexp,ahfgradient,ahfinder_gauss,find3grid,ahfmask + STORAGE: ahfindergrid,ahfinderexp,ahfgradient,ahfinder_gauss,find3grid + STORAGE: ahfmask + STORAGE: hole1_bounds,hole2_bounds,hole3_bounds schedule ahfinder at CCTK_POSTSTEP { @@ -26,13 +28,15 @@ else if (CCTK_Equals(ahf_mask,"off")) schedule ahfinder at CCTK_POSTSTEP { LANG: Fortran - STORAGE: ahfindergrid,ahfinderexp,ahfgradient,ahfinder_gauss,find3grid,ahfmask + STORAGE: ahfindergrid,ahfinderexp,ahfgradient,ahfinder_gauss,find3grid + STORAGE: ahfmask } "Call apparent horizon finder" } else { STORAGE: ahfmask + STORAGE: hole1_bounds,hole2_bounds,hole3_bounds schedule ahfinder at CCTK_POSTSTEP { |