Use mask without using excision calls, this may need some more tweaking

depending on how excision labels points in the mask, but this will be
sorted out in the near future.

Converted to F77, then realised that this might be a bad idea since people
might be including F90 in the CalcTmunu stuff, so left the files labeled
as F90 for now.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/ADMConstraints/trunk@69 b7a48df3-cbbf-4440-997f-b4b717c9f7fc

54 files changed, 532 insertions, 0 deletions

diff --git a/test/ADMConstraints_Mask.par b/test/ADMConstraints_Mask.par
new file mode 100644
index 0000000..20d1678
--- /dev/null
+++ b/test/ADMConstraints_Mask.par
@@ -0,0 +1,52 @@
+!DESC "Constraints for Schwarzschild with mask activated"
+
+# $Header$
+#
+# /*@@
+#   @file      test_ADM_1.par
+#   @date      Sunday 24th July
+#   @author    Gabrielle Allen
+#   @desc
+#   ADMConstraints test file
+#   @enddesc
+# @@*/           
+
+# Required thorns
+ActiveThorns = "Boundary Time ADMconstraints pugh ADM CoordGauge pughreduce cartgrid3d ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic"
+
+# GENERAL
+
+driver::global_nx  =  20
+driver::global_ny  =  20
+driver::global_nz  =  20
+
+grid::type         =  "byspacing"
+grid::dxyz         =  0.2
+grid::domain     =  "octant"
+
+cactus::cctk_itlast        =  3
+
+
+# Einstein
+
+SpaceMask::use_mask       = "yes"
+
+ADMBase::initial_data     = "schwarzschild"
+ADMBase::metric_type      = "static conformal"
+ADMBase::evolution_method = "ADM"
+ADMBase::lapse_evolution_method  =  "1+log"
+
+adm::method               =  "stagleap"
+adm::bound                =  "flat"
+
+# Output
+
+IO::out_dir         = "ADMConstraints_Mask"
+IO::out_fileinfo   = "none"
+
+IOBasic::outScalar_every = 1 
+IOBasic::outScalar_vars  = "admconstraints::hamiltonian admconstraints::momentum"
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "admconstraints::ham admbase::gxx"
+
diff --git a/test/ADMConstraints_Mask/ADMConstraints_Mask.par b/test/ADMConstraints_Mask/ADMConstraints_Mask.par
new file mode 100644
index 0000000..9aa0995
--- /dev/null
+++ b/test/ADMConstraints_Mask/ADMConstraints_Mask.par
@@ -0,0 +1,46 @@
+!DESC "Constraints for Schwarzschild with mask activated"
+
+# $Header$
+#
+# /*@@
+#   @file      test_ADM_1.par
+#   @date      Sunday 24th July
+#   @author    Gabrielle Allen
+#   @desc
+#   ADMConstraints test file
+#   @enddesc
+# @@*/           
+
+# Required thorns
+ActiveThorns = "Boundary Time ADMconstraints pugh pughreduce cartgrid3d ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic"
+
+# GENERAL
+
+driver::global_nx  =  20
+driver::global_ny  =  20
+driver::global_nz  =  20
+
+grid::type         =  "byspacing"
+grid::dxyz         =  0.2
+grid::domain     =  "octant"
+
+cactus::cctk_itlast        =  0
+
+
+# Einstein
+
+SpaceMask::use_mask       = "yes"
+ADMBase::initial_data     = "schwarzschild"
+ADMBase::metric_type      = "static conformal"
+
+# Output
+
+IO::out_dir         = "ADMConstraints_Mask"
+IO::out_fileinfo   = "none"
+
+IOBasic::outScalar_every = 1 
+IOBasic::outScalar_vars  = "admconstraints::hamiltonian admconstraints::momentum"
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "admconstraints::ham admbase::gxx"
+
diff --git a/test/ADMConstraints_Mask/ham_maximum.xg b/test/ADMConstraints_Mask/ham_maximum.xg
new file mode 100644
index 0000000..ad2b029
--- /dev/null
+++ b/test/ADMConstraints_Mask/ham_maximum.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0002044852710
+0.2000000000000	0.0007982173981
+0.3000000000000	0.0017258133454
diff --git a/test/ADMConstraints_Mask/ham_minimum.xg b/test/ADMConstraints_Mask/ham_minimum.xg
new file mode 100644
index 0000000..f342654
--- /dev/null
+++ b/test/ADMConstraints_Mask/ham_minimum.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-0.0001124590969
+0.2000000000000	-0.0004379400554
+0.3000000000000	-0.0009426106873
diff --git a/test/ADMConstraints_Mask/ham_norm1.xg b/test/ADMConstraints_Mask/ham_norm1.xg
new file mode 100644
index 0000000..d923144
--- /dev/null
+++ b/test/ADMConstraints_Mask/ham_norm1.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0000159379883
+0.2000000000000	0.0000628594942
+0.3000000000000	0.0001383184346
diff --git a/test/ADMConstraints_Mask/ham_norm2.xg b/test/ADMConstraints_Mask/ham_norm2.xg
new file mode 100644
index 0000000..74a3289
--- /dev/null
+++ b/test/ADMConstraints_Mask/ham_norm2.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0000382103057
+0.2000000000000	0.0001490771389
+0.3000000000000	0.0003222790671
diff --git a/test/ADMConstraints_Mask/momx_maximum.xg b/test/ADMConstraints_Mask/momx_maximum.xg
new file mode 100644
index 0000000..e5594a2
--- /dev/null
+++ b/test/ADMConstraints_Mask/momx_maximum.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	0.0055634120450
+0.2000000000000	0.0111123908075
+0.3000000000000	0.0166325230605
diff --git a/test/ADMConstraints_Mask/momx_minimum.xg b/test/ADMConstraints_Mask/momx_minimum.xg
new file mode 100644
index 0000000..dc5df80
--- /dev/null
+++ b/test/ADMConstraints_Mask/momx_minimum.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-0.0055634120450
+0.2000000000000	-0.0111123908075
+0.3000000000000	-0.0166325230605
diff --git a/test/ADMConstraints_Mask/momx_norm1.xg b/test/ADMConstraints_Mask/momx_norm1.xg
new file mode 100644
index 0000000..d9c62fe
--- /dev/null
+++ b/test/ADMConstraints_Mask/momx_norm1.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0000998180019
+0.2000000000000	0.0002004327396
+0.3000000000000	0.0003032309573
diff --git a/test/ADMConstraints_Mask/momx_norm2.xg b/test/ADMConstraints_Mask/momx_norm2.xg
new file mode 100644
index 0000000..ffbb440
--- /dev/null
+++ b/test/ADMConstraints_Mask/momx_norm2.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0003573831141
+0.2000000000000	0.0007153714352
+0.3000000000000	0.0010746503210
diff --git a/test/ADMConstraints_Mask/momy_maximum.xg b/test/ADMConstraints_Mask/momy_maximum.xg
new file mode 100644
index 0000000..fc20965
--- /dev/null
+++ b/test/ADMConstraints_Mask/momy_maximum.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	0.0055634120450
+0.2000000000000	0.0111123908075
+0.3000000000000	0.0166325230605
diff --git a/test/ADMConstraints_Mask/momy_minimum.xg b/test/ADMConstraints_Mask/momy_minimum.xg
new file mode 100644
index 0000000..7b818df
--- /dev/null
+++ b/test/ADMConstraints_Mask/momy_minimum.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-0.0055634120450
+0.2000000000000	-0.0111123908075
+0.3000000000000	-0.0166325230605
diff --git a/test/ADMConstraints_Mask/momy_norm1.xg b/test/ADMConstraints_Mask/momy_norm1.xg
new file mode 100644
index 0000000..734505a
--- /dev/null
+++ b/test/ADMConstraints_Mask/momy_norm1.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0000998180019
+0.2000000000000	0.0002004327396
+0.3000000000000	0.0003032309573
diff --git a/test/ADMConstraints_Mask/momy_norm2.xg b/test/ADMConstraints_Mask/momy_norm2.xg
new file mode 100644
index 0000000..479b003
--- /dev/null
+++ b/test/ADMConstraints_Mask/momy_norm2.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0003573831141
+0.2000000000000	0.0007153714352
+0.3000000000000	0.0010746503210
diff --git a/test/ADMConstraints_Mask/momz_maximum.xg b/test/ADMConstraints_Mask/momz_maximum.xg
new file mode 100644
index 0000000..52bbbf3
--- /dev/null
+++ b/test/ADMConstraints_Mask/momz_maximum.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	0.0055634120450
+0.2000000000000	0.0111123908075
+0.3000000000000	0.0166325230605
diff --git a/test/ADMConstraints_Mask/momz_minimum.xg b/test/ADMConstraints_Mask/momz_minimum.xg
new file mode 100644
index 0000000..51ac7bb
--- /dev/null
+++ b/test/ADMConstraints_Mask/momz_minimum.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-0.0055634120450
+0.2000000000000	-0.0111123908075
+0.3000000000000	-0.0166325230605
diff --git a/test/ADMConstraints_Mask/momz_norm1.xg b/test/ADMConstraints_Mask/momz_norm1.xg
new file mode 100644
index 0000000..4600896
--- /dev/null
+++ b/test/ADMConstraints_Mask/momz_norm1.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0000998180019
+0.2000000000000	0.0002004327396
+0.3000000000000	0.0003032309573
diff --git a/test/ADMConstraints_Mask/momz_norm2.xg b/test/ADMConstraints_Mask/momz_norm2.xg
new file mode 100644
index 0000000..11f584a
--- /dev/null
+++ b/test/ADMConstraints_Mask/momz_norm2.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0003573831141
+0.2000000000000	0.0007153714352
+0.3000000000000	0.0010746503210
diff --git a/test/ADMConstraints_Physical.par b/test/ADMConstraints_Physical.par
new file mode 100644
index 0000000..5c68559
--- /dev/null
+++ b/test/ADMConstraints_Physical.par
@@ -0,0 +1,51 @@
+!DESC "Constraints for Schwarzschild with physical metric"
+
+# $Header$
+#
+# /*@@
+#   @file      test_ADM_1.par
+#   @date      Sunday 24th July
+#   @author    Gabrielle Allen
+#   @desc
+#   ADMConstraints test file
+#   @enddesc
+# @@*/           
+
+# Required thorns
+ActiveThorns = "Boundary Time ADMconstraints ADM CoordGauge pugh pughreduce cartgrid3d ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic"
+
+# GENERAL
+
+driver::global_nx  =  20
+driver::global_ny  =  20
+driver::global_nz  =  20
+
+grid::type         =  "byspacing"
+grid::dxyz         =  0.2
+grid::domain     =  "octant"
+
+cactus::cctk_itlast        =  3
+
+
+# Einstein
+
+ADMBase::initial_data     = "schwarzschild"
+ADMBase::metric_type      = "physical"
+
+ADMBase::evolution_method = "ADM"
+ADMBase::lapse_evolution_method  =  "1+log"
+
+adm::method               =  "stagleap"
+adm::bound                =  "flat"
+
+# Output
+
+IO::out_dir         = "ADMConstraints_Physical"
+IO::out_fileinfo   = "none"
+
+IOBasic::outScalar_every = 1 
+IOBasic::outScalar_vars  = "admconstraints::hamiltonian admconstraints::momentum"
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "admconstraints::ham admbase::gxx"
+
diff --git a/test/ADMConstraints_Physical/ADMConstraints_Physical.par b/test/ADMConstraints_Physical/ADMConstraints_Physical.par
new file mode 100644
index 0000000..d8820ea
--- /dev/null
+++ b/test/ADMConstraints_Physical/ADMConstraints_Physical.par
@@ -0,0 +1,45 @@
+!DESC "Constraints for Schwarzschild with physical metric"
+
+# $Header$
+#
+# /*@@
+#   @file      test_ADM_1.par
+#   @date      Sunday 24th July
+#   @author    Gabrielle Allen
+#   @desc
+#   ADMConstraints test file
+#   @enddesc
+# @@*/           
+
+# Required thorns
+ActiveThorns = "Boundary Time ADMconstraints pugh pughreduce cartgrid3d ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic"
+
+# GENERAL
+
+driver::global_nx  =  20
+driver::global_ny  =  20
+driver::global_nz  =  20
+
+grid::type         =  "byspacing"
+grid::dxyz         =  0.2
+grid::domain     =  "octant"
+
+cactus::cctk_itlast        =  0
+
+
+# Einstein
+
+ADMBase::initial_data     = "schwarzschild"
+ADMBase::metric_type      = "physical"
+
+# Output
+
+IO::out_dir         = "ADMConstraints_Physical"
+IO::out_fileinfo   = "none"
+
+IOBasic::outScalar_every = 1 
+IOBasic::outScalar_vars  = "admconstraints::hamiltonian admconstraints::momentum"
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "admconstraints::ham admbase::gxx"
+
diff --git a/test/ADMConstraints_Physical/ham_maximum.xg b/test/ADMConstraints_Physical/ham_maximum.xg
new file mode 100644
index 0000000..66cdec8
--- /dev/null
+++ b/test/ADMConstraints_Physical/ham_maximum.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	13.3168913178387
+0.1000000000000	17.5306768916953
+0.2000000000000	41.2644137187818
+0.3000000000000	156.0398679535504
diff --git a/test/ADMConstraints_Physical/ham_minimum.xg b/test/ADMConstraints_Physical/ham_minimum.xg
new file mode 100644
index 0000000..53985a0
--- /dev/null
+++ b/test/ADMConstraints_Physical/ham_minimum.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	-3.1663435079891
+0.1000000000000	-3.0475853008326
+0.2000000000000	-3.0625005210252
+0.3000000000000	-4.4414962230179
diff --git a/test/ADMConstraints_Physical/ham_norm1.xg b/test/ADMConstraints_Physical/ham_norm1.xg
new file mode 100644
index 0000000..c3c3ad9
--- /dev/null
+++ b/test/ADMConstraints_Physical/ham_norm1.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	0.1774902308936
+0.1000000000000	0.1859891876737
+0.2000000000000	0.2171187752997
+0.3000000000000	0.3839334253993
diff --git a/test/ADMConstraints_Physical/ham_norm2.xg b/test/ADMConstraints_Physical/ham_norm2.xg
new file mode 100644
index 0000000..7de4efb
--- /dev/null
+++ b/test/ADMConstraints_Physical/ham_norm2.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	0.7570518624213
+0.1000000000000	0.8624322037758
+0.2000000000000	1.6660412222337
+0.3000000000000	6.0614293230497
diff --git a/test/ADMConstraints_Physical/momx_maximum.xg b/test/ADMConstraints_Physical/momx_maximum.xg
new file mode 100644
index 0000000..46c9206
--- /dev/null
+++ b/test/ADMConstraints_Physical/momx_maximum.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	8.8861212674441
+0.2000000000000	18.9391397990672
+0.3000000000000	32.4033169212092
diff --git a/test/ADMConstraints_Physical/momx_minimum.xg b/test/ADMConstraints_Physical/momx_minimum.xg
new file mode 100644
index 0000000..42ba04e
--- /dev/null
+++ b/test/ADMConstraints_Physical/momx_minimum.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-42.3928226636914
+0.2000000000000	-121.2722920912621
+0.3000000000000	-321.7412887542507
diff --git a/test/ADMConstraints_Physical/momx_norm1.xg b/test/ADMConstraints_Physical/momx_norm1.xg
new file mode 100644
index 0000000..5ccc2f0
--- /dev/null
+++ b/test/ADMConstraints_Physical/momx_norm1.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0433446383591
+0.2000000000000	0.1036637106385
+0.3000000000000	0.2413492859555
diff --git a/test/ADMConstraints_Physical/momx_norm2.xg b/test/ADMConstraints_Physical/momx_norm2.xg
new file mode 100644
index 0000000..d289f52
--- /dev/null
+++ b/test/ADMConstraints_Physical/momx_norm2.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.9816315303820
+0.2000000000000	2.7621791337128
+0.3000000000000	7.2651806317338
diff --git a/test/ADMConstraints_Physical/momy_maximum.xg b/test/ADMConstraints_Physical/momy_maximum.xg
new file mode 100644
index 0000000..1298451
--- /dev/null
+++ b/test/ADMConstraints_Physical/momy_maximum.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	8.8861212674441
+0.2000000000000	18.9391397990672
+0.3000000000000	32.4033169212092
diff --git a/test/ADMConstraints_Physical/momy_minimum.xg b/test/ADMConstraints_Physical/momy_minimum.xg
new file mode 100644
index 0000000..5e878ff
--- /dev/null
+++ b/test/ADMConstraints_Physical/momy_minimum.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-42.3928226636914
+0.2000000000000	-121.2722920912621
+0.3000000000000	-321.7412887542507
diff --git a/test/ADMConstraints_Physical/momy_norm1.xg b/test/ADMConstraints_Physical/momy_norm1.xg
new file mode 100644
index 0000000..7099c8f
--- /dev/null
+++ b/test/ADMConstraints_Physical/momy_norm1.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0433446383591
+0.2000000000000	0.1036637106385
+0.3000000000000	0.2413492859555
diff --git a/test/ADMConstraints_Physical/momy_norm2.xg b/test/ADMConstraints_Physical/momy_norm2.xg
new file mode 100644
index 0000000..adb1db6
--- /dev/null
+++ b/test/ADMConstraints_Physical/momy_norm2.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.9816315303820
+0.2000000000000	2.7621791337128
+0.3000000000000	7.2651806317338
diff --git a/test/ADMConstraints_Physical/momz_maximum.xg b/test/ADMConstraints_Physical/momz_maximum.xg
new file mode 100644
index 0000000..4413bcd
--- /dev/null
+++ b/test/ADMConstraints_Physical/momz_maximum.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	8.8861212674441
+0.2000000000000	18.9391397990672
+0.3000000000000	32.4033169212092
diff --git a/test/ADMConstraints_Physical/momz_minimum.xg b/test/ADMConstraints_Physical/momz_minimum.xg
new file mode 100644
index 0000000..ebe3852
--- /dev/null
+++ b/test/ADMConstraints_Physical/momz_minimum.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-42.3928226636914
+0.2000000000000	-121.2722920912622
+0.3000000000000	-321.7412887542508
diff --git a/test/ADMConstraints_Physical/momz_norm1.xg b/test/ADMConstraints_Physical/momz_norm1.xg
new file mode 100644
index 0000000..c22a155
--- /dev/null
+++ b/test/ADMConstraints_Physical/momz_norm1.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0433446383591
+0.2000000000000	0.1036637106385
+0.3000000000000	0.2413492859555
diff --git a/test/ADMConstraints_Physical/momz_norm2.xg b/test/ADMConstraints_Physical/momz_norm2.xg
new file mode 100644
index 0000000..3d8c65d
--- /dev/null
+++ b/test/ADMConstraints_Physical/momz_norm2.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.9816315303820
+0.2000000000000	2.7621791337128
+0.3000000000000	7.2651806317338
diff --git a/test/ADMConstraints_Shift.par b/test/ADMConstraints_Shift.par
new file mode 100644
index 0000000..2a95f5e
--- /dev/null
+++ b/test/ADMConstraints_Shift.par
@@ -0,0 +1,52 @@
+!DESC "Constraints for Schwarzschild with mask and shift activated"
+
+# $Header$
+#
+# /*@@
+#   @file      test_ADM_1.par
+#   @date      Sunday 24th July
+#   @author    Gabrielle Allen
+#   @desc
+#   ADMConstraints test file
+#   @enddesc
+# @@*/           
+
+# Required thorns
+ActiveThorns = "Boundary Time ADMconstraints ADM CoordGauge pugh pughreduce cartgrid3d ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic"
+
+# GENERAL
+
+driver::global_nx  =  20
+driver::global_ny  =  20
+driver::global_nz  =  20
+
+grid::type         =  "byspacing"
+grid::dxyz         =  0.2
+grid::domain     =  "octant"
+
+cactus::cctk_itlast        =  3
+
+
+# Einstein
+
+ADMBase::initial_data     = "schwarzschild"
+ADMBase::metric_type      = "static conformal"
+ADMBase::initial_shift    = "zero"
+
+ADMBase::evolution_method = "ADM"
+ADMBase::lapse_evolution_method  =  "1+log"
+
+adm::method               =  "stagleap"
+adm::bound                =  "flat"
+
+# Output
+
+IO::out_dir         = "ADMConstraints_Shift"
+IO::out_fileinfo   = "none"
+
+IOBasic::outScalar_every = 1 
+IOBasic::outScalar_vars  = "admconstraints::hamiltonian admconstraints::momentum"
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "admconstraints::ham admbase::gxx"
+
diff --git a/test/ADMConstraints_Shift/ADMConstraints_Shift.par b/test/ADMConstraints_Shift/ADMConstraints_Shift.par
new file mode 100644
index 0000000..a1bb161
--- /dev/null
+++ b/test/ADMConstraints_Shift/ADMConstraints_Shift.par
@@ -0,0 +1,46 @@
+!DESC "Constraints for Schwarzschild with mask and shift activated"
+
+# $Header$
+#
+# /*@@
+#   @file      test_ADM_1.par
+#   @date      Sunday 24th July
+#   @author    Gabrielle Allen
+#   @desc
+#   ADMConstraints test file
+#   @enddesc
+# @@*/           
+
+# Required thorns
+ActiveThorns = "Boundary Time ADMconstraints pugh pughreduce cartgrid3d ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic"
+
+# GENERAL
+
+driver::global_nx  =  20
+driver::global_ny  =  20
+driver::global_nz  =  20
+
+grid::type         =  "byspacing"
+grid::dxyz         =  0.2
+grid::domain     =  "octant"
+
+cactus::cctk_itlast        =  0
+
+
+# Einstein
+
+ADMBase::initial_data     = "schwarzschild"
+ADMBase::metric_type      = "static conformal"
+ADMBase::initial_shift    = "zero"
+
+# Output
+
+IO::out_dir         = "ADMConstraints_Shift"
+IO::out_fileinfo   = "none"
+
+IOBasic::outScalar_every = 1 
+IOBasic::outScalar_vars  = "admconstraints::hamiltonian admconstraints::momentum"
+
+IOBasic::outInfo_every = 1
+IOBasic::outInfo_vars = "admconstraints::ham admbase::gxx"
+
diff --git a/test/ADMConstraints_Shift/ham_maximum.xg b/test/ADMConstraints_Shift/ham_maximum.xg
new file mode 100644
index 0000000..ad2b029
--- /dev/null
+++ b/test/ADMConstraints_Shift/ham_maximum.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0002044852710
+0.2000000000000	0.0007982173981
+0.3000000000000	0.0017258133454
diff --git a/test/ADMConstraints_Shift/ham_minimum.xg b/test/ADMConstraints_Shift/ham_minimum.xg
new file mode 100644
index 0000000..f342654
--- /dev/null
+++ b/test/ADMConstraints_Shift/ham_minimum.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-0.0001124590969
+0.2000000000000	-0.0004379400554
+0.3000000000000	-0.0009426106873
diff --git a/test/ADMConstraints_Shift/ham_norm1.xg b/test/ADMConstraints_Shift/ham_norm1.xg
new file mode 100644
index 0000000..d923144
--- /dev/null
+++ b/test/ADMConstraints_Shift/ham_norm1.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0000159379883
+0.2000000000000	0.0000628594942
+0.3000000000000	0.0001383184346
diff --git a/test/ADMConstraints_Shift/ham_norm2.xg b/test/ADMConstraints_Shift/ham_norm2.xg
new file mode 100644
index 0000000..74a3289
--- /dev/null
+++ b/test/ADMConstraints_Shift/ham_norm2.xg
@@ -0,0 +1,5 @@
+"ham v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0000382103057
+0.2000000000000	0.0001490771389
+0.3000000000000	0.0003222790671
diff --git a/test/ADMConstraints_Shift/momx_maximum.xg b/test/ADMConstraints_Shift/momx_maximum.xg
new file mode 100644
index 0000000..e5594a2
--- /dev/null
+++ b/test/ADMConstraints_Shift/momx_maximum.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	0.0055634120450
+0.2000000000000	0.0111123908075
+0.3000000000000	0.0166325230605
diff --git a/test/ADMConstraints_Shift/momx_minimum.xg b/test/ADMConstraints_Shift/momx_minimum.xg
new file mode 100644
index 0000000..dc5df80
--- /dev/null
+++ b/test/ADMConstraints_Shift/momx_minimum.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-0.0055634120450
+0.2000000000000	-0.0111123908075
+0.3000000000000	-0.0166325230605
diff --git a/test/ADMConstraints_Shift/momx_norm1.xg b/test/ADMConstraints_Shift/momx_norm1.xg
new file mode 100644
index 0000000..d9c62fe
--- /dev/null
+++ b/test/ADMConstraints_Shift/momx_norm1.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0000998180019
+0.2000000000000	0.0002004327396
+0.3000000000000	0.0003032309573
diff --git a/test/ADMConstraints_Shift/momx_norm2.xg b/test/ADMConstraints_Shift/momx_norm2.xg
new file mode 100644
index 0000000..ffbb440
--- /dev/null
+++ b/test/ADMConstraints_Shift/momx_norm2.xg
@@ -0,0 +1,5 @@
+"momx v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0003573831141
+0.2000000000000	0.0007153714352
+0.3000000000000	0.0010746503210
diff --git a/test/ADMConstraints_Shift/momy_maximum.xg b/test/ADMConstraints_Shift/momy_maximum.xg
new file mode 100644
index 0000000..fc20965
--- /dev/null
+++ b/test/ADMConstraints_Shift/momy_maximum.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	0.0055634120450
+0.2000000000000	0.0111123908075
+0.3000000000000	0.0166325230605
diff --git a/test/ADMConstraints_Shift/momy_minimum.xg b/test/ADMConstraints_Shift/momy_minimum.xg
new file mode 100644
index 0000000..7b818df
--- /dev/null
+++ b/test/ADMConstraints_Shift/momy_minimum.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-0.0055634120450
+0.2000000000000	-0.0111123908075
+0.3000000000000	-0.0166325230605
diff --git a/test/ADMConstraints_Shift/momy_norm1.xg b/test/ADMConstraints_Shift/momy_norm1.xg
new file mode 100644
index 0000000..734505a
--- /dev/null
+++ b/test/ADMConstraints_Shift/momy_norm1.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0000998180019
+0.2000000000000	0.0002004327396
+0.3000000000000	0.0003032309573
diff --git a/test/ADMConstraints_Shift/momy_norm2.xg b/test/ADMConstraints_Shift/momy_norm2.xg
new file mode 100644
index 0000000..479b003
--- /dev/null
+++ b/test/ADMConstraints_Shift/momy_norm2.xg
@@ -0,0 +1,5 @@
+"momy v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0003573831141
+0.2000000000000	0.0007153714352
+0.3000000000000	0.0010746503210
diff --git a/test/ADMConstraints_Shift/momz_maximum.xg b/test/ADMConstraints_Shift/momz_maximum.xg
new file mode 100644
index 0000000..52bbbf3
--- /dev/null
+++ b/test/ADMConstraints_Shift/momz_maximum.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	0.0055634120450
+0.2000000000000	0.0111123908075
+0.3000000000000	0.0166325230605
diff --git a/test/ADMConstraints_Shift/momz_minimum.xg b/test/ADMConstraints_Shift/momz_minimum.xg
new file mode 100644
index 0000000..51ac7bb
--- /dev/null
+++ b/test/ADMConstraints_Shift/momz_minimum.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	-0.0000000000000
+0.1000000000000	-0.0055634120450
+0.2000000000000	-0.0111123908075
+0.3000000000000	-0.0166325230605
diff --git a/test/ADMConstraints_Shift/momz_norm1.xg b/test/ADMConstraints_Shift/momz_norm1.xg
new file mode 100644
index 0000000..4600896
--- /dev/null
+++ b/test/ADMConstraints_Shift/momz_norm1.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0000998180019
+0.2000000000000	0.0002004327396
+0.3000000000000	0.0003032309573
diff --git a/test/ADMConstraints_Shift/momz_norm2.xg b/test/ADMConstraints_Shift/momz_norm2.xg
new file mode 100644
index 0000000..11f584a
--- /dev/null
+++ b/test/ADMConstraints_Shift/momz_norm2.xg
@@ -0,0 +1,5 @@
+"momz v time
+0.0000000000000	0.0000000000000
+0.1000000000000	0.0003573831141
+0.2000000000000	0.0007153714352
+0.3000000000000	0.0010746503210