separate template parameter files for each family of runs;

also do runs in subdirectories (not in cvs)


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

9 files changed, 403 insertions, 4 deletions

diff --git a/run/test-ahfinderdirect/surface/Kerr-dx0.05-template.par b/run/test-ahfinderdirect/surface/Kerr-dx0.05-template.par
new file mode 100644
index 0000000..81e2fbc
--- /dev/null
+++ b/run/test-ahfinderdirect/surface/Kerr-dx0.05-template.par
@@ -0,0 +1,65 @@
+# parameter file for patch system test
+# uses variables
+#	$delta_drho_dsigma
+#	$surface_integral_method
+#	$origin_x
+#	$origin_y
+#	$origin_z
+#	$base_name
+ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect"
+
+# flesh
+cactus::cctk_itlast = 0
+
+# PUGH
+driver::ghost_size = 5
+driver::global_nx = 101
+driver::global_ny = 101
+driver::global_nz = 56
+
+# CartGrid3D
+grid::domain = "bitant"
+grid::avoid_origin = "false"
+grid::type = "byspacing"
+grid::dxyz = 0.05
+
+# 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 = "horizon function"
+AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
+AHFinderDirect::surface_integral_method = "$surface_integral_method"
+##AHFinderDirect::output_initial_guess = "false"
+##AHFinderDirect::output_h = "false"
+##AHFinderDirect::output_H_of_h = "false"
+AHFinderDirect::h_base_file_name      = "$base_name.h"
+AHFinderDirect::H_of_h_base_file_name = "$base_name.H"
+
+AHFinderDirect::N_horizons = 1
+AHFinderDirect::origin_x[1] = $origin_x
+AHFinderDirect::origin_y[1] = $origin_y
+AHFinderDirect::origin_z[1] = 0.0
+AHFinderDirect::N_ghost_points = 2
+AHFinderDirect::N_overlap_points = 1
+AHFinderDirect::delta_drho_dsigma = $delta_drho_dsigma
+
+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 = "Kerr/Kerr-Schild"
+AHFinderDirect::initial_guess__Kerr_KerrSchild__mass[1] = 1.0
+AHFinderDirect::initial_guess__Kerr_KerrSchild__spin[1] = 0.6
diff --git a/run/test-ahfinderdirect/surface/Kerr-dx0.1-template.par b/run/test-ahfinderdirect/surface/Kerr-dx0.1-template.par
new file mode 100644
index 0000000..89e5535
--- /dev/null
+++ b/run/test-ahfinderdirect/surface/Kerr-dx0.1-template.par
@@ -0,0 +1,65 @@
+# parameter file for patch system test
+# uses variables
+#	$delta_drho_dsigma
+#	$surface_integral_method
+#	$origin_x
+#	$origin_y
+#	$origin_z
+#	$base_name
+ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect"
+
+# flesh
+cactus::cctk_itlast = 0
+
+# PUGH
+driver::ghost_size = 2
+driver::global_nx = 61
+driver::global_ny = 61
+driver::global_nz = 33
+
+# CartGrid3D
+grid::domain = "bitant"
+grid::avoid_origin = "false"
+grid::type = "byspacing"
+grid::dxyz = 0.1
+
+# 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 = "horizon function"
+AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
+AHFinderDirect::surface_integral_method = "$surface_integral_method"
+##AHFinderDirect::output_initial_guess = "false"
+##AHFinderDirect::output_h = "false"
+##AHFinderDirect::output_H_of_h = "false"
+AHFinderDirect::h_base_file_name      = "$base_name.h"
+AHFinderDirect::H_of_h_base_file_name = "$base_name.H"
+
+AHFinderDirect::N_horizons = 1
+AHFinderDirect::origin_x[1] = $origin_x
+AHFinderDirect::origin_y[1] = $origin_y
+AHFinderDirect::origin_z[1] = 0.0
+AHFinderDirect::N_ghost_points = 2
+AHFinderDirect::N_overlap_points = 1
+AHFinderDirect::delta_drho_dsigma = $delta_drho_dsigma
+
+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 = "Kerr/Kerr-Schild"
+AHFinderDirect::initial_guess__Kerr_KerrSchild__mass[1] = 1.0
+AHFinderDirect::initial_guess__Kerr_KerrSchild__spin[1] = 0.6
diff --git a/run/test-ahfinderdirect/surface/Kerr-mass1.5-dx0.1-template.par b/run/test-ahfinderdirect/surface/Kerr-mass1.5-dx0.1-template.par
new file mode 100644
index 0000000..3a5730e
--- /dev/null
+++ b/run/test-ahfinderdirect/surface/Kerr-mass1.5-dx0.1-template.par
@@ -0,0 +1,65 @@
+# parameter file for patch system test
+# uses variables
+#	$delta_drho_dsigma
+#	$surface_integral_method
+#	$origin_x
+#	$origin_y
+#	$origin_z
+#	$base_name
+ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect"
+
+# flesh
+cactus::cctk_itlast = 0
+
+# PUGH
+driver::ghost_size = 3
+driver::global_nx = 71
+driver::global_ny = 71
+driver::global_nz = 39
+
+# CartGrid3D
+grid::domain = "bitant"
+grid::avoid_origin = "false"
+grid::type = "byspacing"
+grid::dxyz = 0.1
+
+# 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.5
+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 = "horizon function"
+AHFinderDirect::final_H_update_if_exit_x_H_small = "true"
+AHFinderDirect::surface_integral_method = "$surface_integral_method"
+##AHFinderDirect::output_initial_guess = "false"
+##AHFinderDirect::output_h = "false"
+##AHFinderDirect::output_H_of_h = "false"
+AHFinderDirect::h_base_file_name      = "$base_name.h"
+AHFinderDirect::H_of_h_base_file_name = "$base_name.H"
+
+AHFinderDirect::N_horizons = 1
+AHFinderDirect::origin_x[1] = $origin_x
+AHFinderDirect::origin_y[1] = $origin_y
+AHFinderDirect::origin_z[1] = 0.0
+AHFinderDirect::N_ghost_points = 2
+AHFinderDirect::N_overlap_points = 1
+AHFinderDirect::delta_drho_dsigma = $delta_drho_dsigma
+
+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 = "Kerr/Kerr-Schild"
+AHFinderDirect::initial_guess__Kerr_KerrSchild__mass[1] = 1.5
+AHFinderDirect::initial_guess__Kerr_KerrSchild__spin[1] = 0.6
diff --git a/run/test-ahfinderdirect/surface/Kerr-spin0-dx0.1-template.par b/run/test-ahfinderdirect/surface/Kerr-spin0-dx0.1-template.par
new file mode 100644
index 0000000..3bcf547
--- /dev/null
+++ b/run/test-ahfinderdirect/surface/Kerr-spin0-dx0.1-template.par
@@ -0,0 +1,65 @@
+# parameter file for patch system test
+# uses variables
+#	$delta_drho_dsigma
+#	$surface_integral_method
+#	$origin_x
+#	$origin_y
+#	$origin_z
+#	$base_name
+ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect"
+
+# flesh
+cactus::cctk_itlast = 0
+
+# PUGH
+driver::ghost_size = 3
+driver::global_nx = 51
+driver::global_ny = 51
+driver::global_nz = 29
+
+# CartGrid3D
+grid::domain = "bitant"
+grid::avoid_origin = "false"
+grid::type = "byspacing"
+grid::dxyz = 0.1
+
+# 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.0
+
+AHFinderDirect::find_AHs_at_postinitial = "true"
+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 = "$surface_integral_method"
+##AHFinderDirect::output_initial_guess = "false"
+##AHFinderDirect::output_h = "false"
+##AHFinderDirect::output_H_of_h = "false"
+AHFinderDirect::h_base_file_name      = "$base_name.h"
+AHFinderDirect::H_of_h_base_file_name = "$base_name.H"
+
+AHFinderDirect::N_horizons = 1
+AHFinderDirect::origin_x[1] = $origin_x
+AHFinderDirect::origin_y[1] = $origin_y
+AHFinderDirect::origin_z[1] = 0.0
+AHFinderDirect::N_ghost_points = 2
+AHFinderDirect::N_overlap_points = 1
+AHFinderDirect::delta_drho_dsigma = $delta_drho_dsigma
+
+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 = "Kerr/Kerr-Schild"
+AHFinderDirect::initial_guess__Kerr_KerrSchild__mass[1] = 1.0
+AHFinderDirect::initial_guess__Kerr_KerrSchild__spin[1] = 0.0
diff --git a/run/test-ahfinderdirect/surface/Kerr-spin0.8-dx0.1-template.par b/run/test-ahfinderdirect/surface/Kerr-spin0.8-dx0.1-template.par
new file mode 100644
index 0000000..34e5352
--- /dev/null
+++ b/run/test-ahfinderdirect/surface/Kerr-spin0.8-dx0.1-template.par
@@ -0,0 +1,65 @@
+# parameter file for patch system test
+# uses variables
+#	$delta_drho_dsigma
+#	$surface_integral_method
+#	$origin_x
+#	$origin_y
+#	$origin_z
+#	$base_name
+ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect"
+
+# flesh
+cactus::cctk_itlast = 0
+
+# PUGH
+driver::ghost_size = 3
+driver::global_nx = 51
+driver::global_ny = 51
+driver::global_nz = 29
+
+# CartGrid3D
+grid::domain = "bitant"
+grid::avoid_origin = "false"
+grid::type = "byspacing"
+grid::dxyz = 0.1
+
+# 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.8
+
+AHFinderDirect::find_AHs_at_postinitial = "true"
+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 = "$surface_integral_method"
+##AHFinderDirect::output_initial_guess = "false"
+##AHFinderDirect::output_h = "false"
+##AHFinderDirect::output_H_of_h = "false"
+AHFinderDirect::h_base_file_name      = "$base_name.h"
+AHFinderDirect::H_of_h_base_file_name = "$base_name.H"
+
+AHFinderDirect::N_horizons = 1
+AHFinderDirect::origin_x[1] = $origin_x
+AHFinderDirect::origin_y[1] = $origin_y
+AHFinderDirect::origin_z[1] = 0.0
+AHFinderDirect::N_ghost_points = 2
+AHFinderDirect::N_overlap_points = 1
+AHFinderDirect::delta_drho_dsigma = $delta_drho_dsigma
+
+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 = "Kerr/Kerr-Schild"
+AHFinderDirect::initial_guess__Kerr_KerrSchild__mass[1] = 1.0
+AHFinderDirect::initial_guess__Kerr_KerrSchild__spin[1] = 0.8
diff --git a/run/test-ahfinderdirect/surface/Schw-dx0.1-template.par b/run/test-ahfinderdirect/surface/Schw-dx0.1-template.par
new file mode 100644
index 0000000..d8c6ab7
--- /dev/null
+++ b/run/test-ahfinderdirect/surface/Schw-dx0.1-template.par
@@ -0,0 +1,63 @@
+# parameter file for patch system test
+# uses variables
+#	$delta_drho_dsigma
+#	$surface_integral_method
+#	$origin_x
+#	$origin_y
+#	$origin_z
+#	$base_name
+ActiveThorns = "CartGrid3D LocalInterp PUGH ADMBase ADMCoupling CoordGauge Exact AHFinderDirect"
+
+# flesh
+cactus::cctk_itlast = 0
+
+# PUGH
+driver::ghost_size = 3
+driver::global_nx = 51
+driver::global_ny = 51
+driver::global_nz = 29
+
+# CartGrid3D
+grid::domain = "bitant"
+grid::avoid_origin = "false"
+grid::type = "byspacing"
+grid::dxyz = 0.1
+
+# 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 = "Schwarzschild/EF"
+Exact::Schwarzschild_EF__mass = 1.0
+
+AHFinderDirect::find_AHs_at_postinitial = "true"
+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 = "$surface_integral_method"
+##AHFinderDirect::output_initial_guess = "false"
+##AHFinderDirect::output_h = "false"
+##AHFinderDirect::output_H_of_h = "false"
+AHFinderDirect::h_base_file_name      = "$base_name.h"
+AHFinderDirect::H_of_h_base_file_name = "$base_name.H"
+
+AHFinderDirect::N_horizons = 1
+AHFinderDirect::origin_x[1] = $origin_x
+AHFinderDirect::origin_y[1] = $origin_y
+AHFinderDirect::origin_z[1] = 0.0
+AHFinderDirect::N_ghost_points = 2
+AHFinderDirect::N_overlap_points = 1
+AHFinderDirect::delta_drho_dsigma = $delta_drho_dsigma
+
+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__radius[1] = 2.0
diff --git a/run/test-ahfinderdirect/surface/template.par b/run/test-ahfinderdirect/surface/Schw-hardwire-template.par
index a44a644..a44a644 100644
--- a/run/test-ahfinderdirect/surface/template.par
+++ b/run/test-ahfinderdirect/surface/Schw-hardwire-template.par
diff --git a/run/test-ahfinderdirect/surface/doit.grep b/run/test-ahfinderdirect/surface/doit.grep
index b006e82..dc854ca 100755
--- a/run/test-ahfinderdirect/surface/doit.grep
+++ b/run/test-ahfinderdirect/surface/doit.grep
@@ -6,8 +6,8 @@
 	do
 	name="$method$offset"
 	echo $name
-	fgrep 'AH found' Schw*$name.log \
-	   | sed -e 's/^Schw//' \
+	fgrep 'AH found' *$name.log \
+	   | sed -e 's/^[^0-9]*//' \
 		 -e 's/-.*AH found: A=/	/' \
 		 -e 's/ m=/	/' \
 		 -e 's/ at (/	/' \
diff --git a/run/test-ahfinderdirect/surface/doit.run b/run/test-ahfinderdirect/surface/doit.run
index 367b397..9768d40 100755
--- a/run/test-ahfinderdirect/surface/doit.run
+++ b/run/test-ahfinderdirect/surface/doit.run
@@ -1,5 +1,16 @@
 #!/bin/sh
 
+#
+# Usage:
+#	doit.run template.par name-prefix
+# where
+#	template.par  is the name of a template parameter file
+#	name-prefix   is a prefix for the names of the generated .par
+#			and .log files
+#
+template="$1"
+prefix="$2"
+
 	for offset in 0 1
 	do
 	if [ $offset -eq 1 ]
@@ -21,7 +32,7 @@
 		   then method_name='Simpson-variant'
 		   else method_name="$method"
 		fi
-		base=Schw${delta}-${method_name}${offset_name}
+		base=${prefix}${delta}-${method_name}${offset_name}
 		##echo ":${delta}:${method}:${origin_x}:${origin_y}:${origin_z}:"
 		##echo ":${delta}:${method_name}:${origin_x}:${origin_y}:${origin_z}:"
 		##echo $base
@@ -32,7 +43,7 @@
 		    -e "s#\$origin_y#$origin_y#" \
 		    -e "s#\$origin_z#$origin_z#" \
 		    -e "s#\$base_name#$base#" \
-		    <template.par >$base.par
+		    <$template >$base.par
 		cactus_test-ahfinderdirect $base.par 2>&1 | tee $base.log
 		
 		done