Some fixes, some cleanup.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TwoPunctures/trunk@11 b2a53a04-0f4f-0410-87ed-f9f25ced00cf

3 files changed, 139 insertions, 9 deletions

diff --git a/test/bam.par b/test/bam.par
new file mode 100644
index 0000000..6c401c4
--- /dev/null
+++ b/test/bam.par
@@ -0,0 +1,61 @@
+# $Header$
+
+ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase"
+ActiveThorns = "PUGH PUGHReduce PUGHSlab"
+ActiveThorns = "IOASCII IOBasic IOUtil"
+ActiveThorns = "ADMBase StaticConformal"
+ActiveThorns = "ADMConstraints ADMCoupling ADMMacros SpaceMask"
+ActiveThorns = "BAM_Elliptic EllBase"
+
+Cactus::cctk_itlast		= 0
+ 
+Time::dtfac			= 0.25
+
+Grid::type			= "byrange"
+Grid::domain			= "full"
+Grid::xmin                      = -4
+Grid::xmax                      =  4
+Grid::ymin                      = -4
+Grid::ymax			=  4
+Grid::zmin                      = -4
+Grid::zmax			=  4
+Driver::global_nx		= 35
+Driver::global_ny		= 35
+Driver::global_nz		= 35
+
+ADMBase::initial_data		= "BrBr"
+
+BAM_Elliptic::redblack_decouple = "yes"
+BAM_Elliptic::bam_persist       = "yes"
+BAM_Elliptic::brbr_tolres2  	= 1e-6
+BAM_Elliptic::brbr_maxcycles 	= 100
+BAM_Elliptic::brbr_mincycles 	= 3
+
+BAM_Elliptic::bhm1		=  1.5
+BAM_Elliptic::bhx1		=  1.5
+BAM_Elliptic::bhpy1		=  2.0
+BAM_Elliptic::bhsy1		=  0.5
+BAM_Elliptic::bhsz1		= -0.5
+
+BAM_Elliptic::bhm2		=  1.0
+BAM_Elliptic::bhx2		= -1.5
+BAM_Elliptic::bhpy2		= -2.0
+BAM_Elliptic::bhsx2		= -1.0
+BAM_Elliptic::bhsz2		= -1.0
+
+BAM_Elliptic::bam_bound		= "bamrobin"
+
+ADMBase::metric_type		= "static conformal"
+StaticConformal::conformal_storage = "factor+derivs+2nd derivs"
+
+ADMBase::lapse_evolution_method	= "static"
+ADMBase::initial_lapse		= "one"
+  
+IO::out_dir			= $parfile
+IO::out_fileinfo		= "axis labels"
+
+IOBasic::outScalar_every	= 1
+IOBasic::outScalar_vars		= "staticconformal::psi admbase::metric admbase::curv admconstraints::hamiltonian admconstraints::momentum"
+
+IOASCII::out1D_every		= 1
+IOASCII::out1D_vars		= "staticconformal::psi admbase::metric admbase::curv admconstraints::hamiltonian admconstraints::momentum"
diff --git a/test/idpuncture.par b/test/idpuncture.par
new file mode 100644
index 0000000..96df1aa
--- /dev/null
+++ b/test/idpuncture.par
@@ -0,0 +1,64 @@
+# $Header$
+
+ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase"
+ActiveThorns = "PUGH PUGHReduce PUGHSlab"
+ActiveThorns = "IOASCII IOBasic IOUtil"
+ActiveThorns = "ADMBase StaticConformal"
+ActiveThorns = "ADMConstraints ADMCoupling ADMMacros SpaceMask"
+ActiveThorns = "IDPuncture TATelliptic TATJacobi TATMG TATPETSc"
+
+Cactus::cctk_itlast		= 0
+ 
+Time::dtfac			= 0.25
+
+Grid::type			= "byrange"
+Grid::domain			= "full"
+Grid::xmin                      = -4
+Grid::xmax                      =  4
+Grid::ymin                      = -4
+Grid::ymax			=  4
+Grid::zmin                      = -4
+Grid::zmax			=  4
+Driver::global_nx		= 35
+Driver::global_ny		= 35
+Driver::global_nz		= 35
+
+ADMBase::initial_data		= "puncture"
+
+IDPuncture::verbose		= "yes"
+
+IDPuncture::bhm1		=  1.5
+IDPuncture::bhx1		=  1.5
+IDPuncture::bhpy1		=  2.0
+IDPuncture::bhsy1		=  0.5
+IDPuncture::bhsz1		= -0.5
+
+IDPuncture::bhm2		=  1.0
+IDPuncture::bhx2		= -1.5
+IDPuncture::bhpy2		= -2.0
+IDPuncture::bhsx2		= -1.0
+IDPuncture::bhsz2		= -1.0
+
+IDPuncture::bound		= "robin"
+
+IDPuncture::solver		= "TATPETSc"
+
+ADMBase::metric_type		= "static conformal"
+StaticConformal::conformal_storage = "factor+derivs+2nd derivs"
+
+ADMBase::lapse_evolution_method	= "static"
+ADMBase::initial_lapse		= "one"
+
+TATJacobi::verbose		= yes
+
+TATPETSc::verbose		= yes
+TATPETsc::options		= "-snes_monitor -get_total_flops"
+  
+IO::out_dir			= $parfile
+IO::out_fileinfo		= "axis labels"
+
+IOBasic::outScalar_every	= 1
+IOBasic::outScalar_vars		= "staticconformal::psi admbase::metric admbase::curv admconstraints::hamiltonian admconstraints::momentum idpuncture::u idpuncture::M idpuncture::N"
+
+IOASCII::out1D_every		= 1
+IOASCII::out1D_vars		= "staticconformal::psi admbase::metric admbase::curv admconstraints::hamiltonian admconstraints::momentum idpuncture::u idpuncture::M idpuncture::N"
diff --git a/test/twopunctures.par b/test/twopunctures.par
index 85be41d..29af25b 100644
--- a/test/twopunctures.par
+++ b/test/twopunctures.par
@@ -1,6 +1,11 @@
 # $Header$
 
-ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase PUGH PUGHReduce PUGHSlab IOASCII IOBasic IOUtil ADMBase StaticConformal TwoPunctures"
+ActiveThorns = "Boundary CartGrid3D Time CoordBase SymBase"
+ActiveThorns = "PUGH PUGHReduce PUGHSlab"
+ActiveThorns = "IOASCII IOBasic IOUtil"
+ActiveThorns = "ADMBase StaticConformal"
+ActiveThorns = "ADMConstraints ADMCoupling ADMMacros SpaceMask"
+ActiveThorns = "TwoPunctures"
 
 Cactus::cctk_itlast		= 0
 
@@ -26,17 +31,17 @@ TwoPunctures::npoints_A         = 20
 TwoPunctures::npoints_B         = 20
 TwoPunctures::npoints_phi       = 12
 
-TwoPunctures::par_b             = 1.5
+TwoPunctures::par_b             =  1.5
 
-TwoPunctures::par_m_plus        = 1.5
-TwoPunctures::par_P_plus[1]     = 2.0
-TwoPunctures::par_S_plus[1]     = 0.5
-TwoPunctures::par_S_plus[2]     = 0.5
+TwoPunctures::par_m_plus        =  1.5
+TwoPunctures::par_P_plus[1]     =  2.0
+TwoPunctures::par_S_plus[1]     =  0.5
+TwoPunctures::par_S_plus[2]     = -0.5
 
 TwoPunctures::par_m_minus       =  1.0
 TwoPunctures::par_P_minus[1]    = -2.0
 TwoPunctures::par_S_minus[0]    = -1.0
-TwoPunctures::par_S_minus[2]    =  1.0
+TwoPunctures::par_S_minus[2]    = -1.0
 
 ADMBase::metric_type		= "static conformal"
 StaticConformal::conformal_storage = "factor+derivs+2nd derivs"
@@ -48,7 +53,7 @@ IO::out_dir			= $parfile
 IO::out_fileinfo		= "axis labels"
 
 IOBasic::outScalar_every	= 1
-IOBasic::outScalar_vars		= "staticconformal::psi admbase::metric admbase::curv TwoPunctures::puncture_u"
+IOBasic::outScalar_vars		= "staticconformal::psi admbase::metric admbase::curv admconstraints::hamiltonian admconstraints::momentum TwoPunctures::puncture_u"
 
 IOASCII::out1D_every		= 1
-IOASCII::out1D_vars		= "staticconformal::psi admbase::metric admbase::curv TwoPunctures::puncture_u"
+IOASCII::out1D_vars		= "staticconformal::psi admbase::metric admbase::curv admconstraints::hamiltonian admconstraints::momentum TwoPunctures::puncture_u"