change from running in CCTK_POSTSTEP (which doesn't work with Carpet)

to CCTK_ANALYSIS (which does, yea!)

...
Alas, due to the @*(#&%@*&(%#$ "trigger" behavior of Cactus,
the only way to force a routine to run in CCTK_ANALYSIS is
to use a dummy I/O method to fake doing output at every time
step.  Fortunately, Erik Schnetter has already written the code
for this, so AHFinderDirect now just used that.  Thus AHFinderDirect
now depends on thorn TAT/always.  All thornlists and par files
will have to be changed to compile in  always  and activate it
before activating AHFinderDirect.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@1156 f88db872-0e4f-0410-b76b-b9085cfa78c5

13 files changed, 23 insertions, 15 deletions

diff --git a/doc/documentation.tex b/doc/documentation.tex
index cb008ab..a83ab80 100644
--- a/doc/documentation.tex
+++ b/doc/documentation.tex
@@ -266,8 +266,14 @@ here's what works and what doesn't:
 \item	Obviously, your Cactus configuration must include
 	\thorn{AHFinderDirect}, and your \code{ActiveThorns} parameter(s)
 	must activate it.  \thorn{AHFinderDirect} inherits from \thorn{Grid},
-	\thorn{ADMBase}, \thorn{SpaceMask}, and \thorn{StaticConformal},
-	so you'll need those (or more precisely some thorns providing them),
+	\thorn{ADMBase}, \thorn{SpaceMask}, \thorn{StaticConformal},
+	and \thorn{always},%%%
+\footnote{%%%
+	 Thorn \thorn{always} lives in the \arrangement{TAT}
+	 arrangement, which can be obtained via the same
+	 anonymous-CVS checkout as thorn \thorn{AHFinderDirect}.
+	 }%%%
+{}	so you'll need those (or more precisely some thorns providing them),
 	too.
 \item	\verb|Grid::domain = "full"|, \verb|"bitant"|,
 	\verb|"quadrant"|, and \verb|"octant"| are supported.
diff --git a/interface.ccl b/interface.ccl
index 5f9c416..7337c49 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -2,7 +2,7 @@
 # $Header$
 
 implements: AHFinderDirect
-inherits: Grid ADMBase StaticConformal SpaceMask
+inherits: Grid ADMBase StaticConformal SpaceMask always
 
 # include file provided by SpaceMask
 USES INCLUDE: SpaceMask.h
diff --git a/par/Kerr-centered.par b/par/Kerr-centered.par
index 70630ac..00c9316 100644
--- a/par/Kerr-centered.par
+++ b/par/Kerr-centered.par
@@ -32,7 +32,7 @@ Exact::Kerr_KerrSchild__spin = 0.6
 
 ########################################
 
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 
diff --git a/par/Kerr-tiny.par b/par/Kerr-tiny.par
index 4edaaca..d7e67ad 100644
--- a/par/Kerr-tiny.par
+++ b/par/Kerr-tiny.par
@@ -35,7 +35,7 @@ Exact::Kerr_KerrSchild__spin = 0.6
 
 ########################################
 
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 AHFinderDirect::h_base_file_name     = "Kerr-tiny.h"
 
 AHFinderDirect::N_horizons = 1
diff --git a/par/Kerr.par b/par/Kerr.par
index 1de0a26..51c73c7 100644
--- a/par/Kerr.par
+++ b/par/Kerr.par
@@ -32,7 +32,7 @@ Exact::Kerr_KerrSchild__spin = 0.6
 
 ########################################
 
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 
diff --git a/par/bl-bad.par b/par/bl-bad.par
index 0a1976b..7156aa3 100644
--- a/par/bl-bad.par
+++ b/par/bl-bad.par
@@ -64,7 +64,7 @@ ADMBase::shift_evolution_method = "static"
 # AHFinderDirect
 #
 
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/bl-y.par b/par/bl-y.par
index 49f6888..02827b6 100644
--- a/par/bl-y.par
+++ b/par/bl-y.par
@@ -62,7 +62,7 @@ ADMBase::shift_evolution_method = "static"
 # AHFinderDirect
 #
 
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/bl.par b/par/bl.par
index 17512d0..2ea3b5c 100644
--- a/par/bl.par
+++ b/par/bl.par
@@ -62,7 +62,7 @@ ADMBase::shift_evolution_method = "static"
 # AHFinderDirect
 #
 
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/misner-ghost2-mask-noshrink.par b/par/misner-ghost2-mask-noshrink.par
index f062175..bfc530f 100644
--- a/par/misner-ghost2-mask-noshrink.par
+++ b/par/misner-ghost2-mask-noshrink.par
@@ -74,7 +74,7 @@ IOASCII::out3D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/misner-mask-noshrink.par b/par/misner-mask-noshrink.par
index bc2f827..55fd698 100644
--- a/par/misner-mask-noshrink.par
+++ b/par/misner-mask-noshrink.par
@@ -71,7 +71,7 @@ IOASCII::out3D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/misner-mask-xnoshrink.par b/par/misner-mask-xnoshrink.par
index 6a9d79b..4a982bf 100644
--- a/par/misner-mask-xnoshrink.par
+++ b/par/misner-mask-xnoshrink.par
@@ -71,7 +71,7 @@ IOASCII::out3D_vars = "SpaceMask::emask"
 # AHFinderDirect
 #
 
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/par/misner.par b/par/misner.par
index 2e3f534..b57525a 100644
--- a/par/misner.par
+++ b/par/misner.par
@@ -57,7 +57,7 @@ ADMBase::shift_evolution_method = "static"
 # AHFinderDirect
 #
 
-ActiveThorns = "AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
+ActiveThorns = "always AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect"
 
 AHFinderDirect::print_timing_stats = "true"
 ##AHFinderDirect::verbose_level = "algorithm details"
diff --git a/schedule.ccl b/schedule.ccl
index f617fe7..2abf1f6 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -9,18 +9,20 @@ schedule AHFinderDirect_setup at CCTK_BASEGRID after SpatialCoordinates
 
 if (find_every != 0)
 	{
-	schedule AHFinderDirect_find_horizons at CCTK_POSTSTEP
+	schedule AHFinderDirect_find_horizons at CCTK_ANALYSIS
 		 {
 		 lang: C
 		 options: global
+		 triggers: always
 		 } "find apparent horizon(s) after this time step"
 
 	if (set_mask != 0)
 		{
-		schedule AHFinderDirect_do_masks at CCTK_POSTSTEP \
+		schedule AHFinderDirect_do_masks at CCTK_ANALYSIS \
 		   after AHFinderDirect_find_horizons
 			 {
 			 lang: C
+			 triggers: always
 			 } "set mask(s) based on apparent horizon position(s)"
 		}
 	}