Converting to 'Einstein2'.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Cartoon2D/trunk@56 eec4d7dc-71c2-46d6-addf-10296150bf52

2 files changed, 25 insertions, 26 deletions

diff --git a/test/schw-0050.par b/test/schw-0050.par
index 3c92e68..c4062eb 100644
--- a/test/schw-0050.par
+++ b/test/schw-0050.par
@@ -2,19 +2,20 @@
 # cartoon
 #------------------------------------------------------------------------------
 
-ActiveThorns = " einstein idanalyticbh time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic cartoon2d adm_bssn admconstraints boundary "
+ActiveThorns = " admbase admcoupling admmacros coordgauge spacemask staticconformal idanalyticbh time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic cartoon2d adm_bssn admconstraints boundary "
 
-IOBasic::outScalar_vars = " einstein::metric einstein::curv einstein::lapse einstein::shift einstein::psi adm_bssn::adm_bssn_metric adm_bssn::adm_bssn_curv adm_bssn::adm_bssn_k adm_bssn::adm_bssn_gamma adm_bssn::adm_bssn_phi admconstraints::momy admconstraints::ham "
+IOBasic::outScalar_vars = " admbase::metric admbase::curv admbase::lapse admbase::shift staticconformal::psi adm_bssn::adm_bssn_metric adm_bssn::adm_bssn_curv adm_bssn::adm_bssn_k adm_bssn::adm_bssn_gamma adm_bssn::adm_bssn_phi admconstraints::momy admconstraints::ham "
 
-IOBasic::outInfo_vars = " admconstraints::ham einstein::alp "
+IOBasic::outInfo_vars = " admconstraints::ham admbase::alp "
 
-IOASCII::out1D_vars = " einstein::metric einstein::curv einstein::lapse einstein::shift einstein::psi adm_bssn::adm_bssn_metric adm_bssn::adm_bssn_curv adm_bssn::adm_bssn_k adm_bssn::adm_bssn_gamma adm_bssn::adm_bssn_phi admconstraints::momy admconstraints::ham "
+IOASCII::out1D_vars = " admbase::metric admbase::curv admbase::lapse admbase::shift staticconformal::psi adm_bssn::adm_bssn_metric adm_bssn::adm_bssn_curv adm_bssn::adm_bssn_k adm_bssn::adm_bssn_gamma adm_bssn::adm_bssn_phi admconstraints::momy admconstraints::ham "
 
 #==============================================================================
 # schwarzschild initial data
 #==============================================================================
 
-einstein::initial_data                  = "bl_bh"
+admbase::initial_data                  = "bl_bh"
+admbase::metric_type = "static conformal"
 idanalyticbh::bl_M_1                    = 1.0
 
 #==============================================================================
@@ -57,7 +58,6 @@ grid::avoid_originy 			= "no"
 
 cartoon2d::stencil			= "yes"
 cartoon2d::order			= 3
-#cartoon2d::verbose			= "yes"
 
 adm_bssn::cartoon			= "yes"
 cartoon2d::cartoon_active		= "yes"
@@ -67,12 +67,12 @@ admconstraints::cartoon			= "yes"
 # Standard ADM_BSSN evolution
 #==============================================================================
 
-einstein::evolution_system              = "adm_bssn"
+admbase::evolution_method              = "adm_bssn"
 
 adm_bssn::method                        = "icn"
 adm_bssn::ICN_itnum                     = 3
 adm_bssn::stencil_size                  = 2
-einstein::advection                     = "upwind2"
+adm_bssn::advection                     = "upwind2"
 adm_bssn::bound                         = "newrad"
 boundary::radpower                      = 3
 
@@ -80,22 +80,22 @@ boundary::radpower                      = 3
 # 1+log
 #==============================================================================
 
-einstein::initial_lapse                 = "one"
-einstein::slicing                       = "1+log"
-adm_bssn::lapsesource                   = "modified"
-adm_bssn::harmonic_f                    = 2.0
+admbase::initial_lapse                 = "one"
+admbase::lapse_evolution_method        = "1+log"
+adm_bssn::lapsesource                  = "modified"
+adm_bssn::harmonic_f                   = 2.0
 
 #==============================================================================
 # Gamma2 shift
 #==============================================================================
 
-einstein::initial_shift                 = "zero"
-einstein::shift                         = "gamma2"
+admbase::initial_shift                 = "zero"
+admbase::shift_evolution_method        = "gamma2"
 
 adm_bssn::ShiftGammaCoeff               = 0.75
 adm_bssn::BetaDriver                    = 4.0
-adm_bssn::ShiftAlpPower                 = 1.0
-adm_bssn::ShiftPsiPower                 = 4.0
+adm_bssn::ShiftAlpPower                 = 1
+adm_bssn::ShiftPsiPower                 = 4
 
 #==============================================================================
 # 1D output
@@ -105,6 +105,3 @@ IOBasic::outScalar_every                = 1
 IOASCII::out1D_every                    = 1
 IOBasic::outInfo_every                  = 1
 IO::out_fileinfo   			= "none"
-
-
-
diff --git a/test/test_cartoon_2.par b/test/test_cartoon_2.par
index f4b80f9..34e98de 100644
--- a/test/test_cartoon_2.par
+++ b/test/test_cartoon_2.par
@@ -2,7 +2,7 @@
 # Cartoon2D, using a full grid
 #==============================================================================
 
-ActiveThorns = "cartoon2d idanalyticbh einstein adm_bssn admconstraints ahfinder pughinterp boundary time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic"
+ActiveThorns = "cartoon2d idanalyticbh admbase admcoupling admmacros coordgauge spacemask staticconformal admanalysis adm_bssn admconstraints ahfinder pughinterp boundary time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic"
 
 #------------------------------------------------------------------------------
 # Run parameters for Cartoon
@@ -45,17 +45,18 @@ cactus::cctk_itlast                     = 1
 
 # MODEL 
 
-einstein::initial_data                  = "schwarzschild"
+admbase::initial_data                   = "schwarzschild"
+admbase::metric_type			= "static conformal"
 
 #--- Evolution
-einstein::evolution_system 		= "adm_bssn"
+admbase::evolution_method 		= "adm_bssn"
 adm_bssn::method 			= "icn"
 adm_bssn::bound  			= "flat"
 adm_bssn::cartoon                	= "yes"
 admconstraints::cartoon			= "yes"
 
 #--- gauge
-einstein::slicing                       = "1+log"
+admbase::lapse_evolution_method         = "1+log"
 
 #--- AHFinder.
 
@@ -78,11 +79,12 @@ IO::out_dir                             = "test_cartoon_2"
 IO::out_fileinfo   			= "none"
 
 IOBasic::outScalar_every                = 1
-IOBasic::outScalar_vars                 = "admconstraints::hamiltonian admconstraints::momentum einstein::alp einstein::grr einstein::metric einstein::trace_of_K einstein::betax einstein::betay einstein::betaz adm_bssn::adm_bs_gxx adm_bssn::adm_bs_phi adm_bssn::ADM_BSSN_K adm_bssn::ADM_BSSN_gamma"
+IOBasic::outScalar_vars                 = "admconstraints::hamiltonian admconstraints::momentum admbase::alp admanalysis::grr admbase::metric admanalysis::trK admbase::betax admbase::betay admbase::betaz adm_bssn::adm_bs_gxx adm_bssn::adm_bs_phi adm_bssn::ADM_BSSN_K adm_bssn::ADM_BSSN_gamma"
 
 IOASCII::out1D_every                    = 1
-IOASCII::out1D_vars                     = "admconstraints::hamiltonian admconstraints::momentum einstein::alp einstein::grr einstein::metric einstein::trace_of_K einstein::betax einstein::betay einstein::betaz adm_bssn::adm_bs_gxx adm_bssn::adm_bs_phi adm_bssn::ADM_BSSN_K adm_bssn::ADM_BSSN_gamma"
+IOASCII::out1D_vars                     = "admconstraints::hamiltonian admconstraints::momentum admbase::alp admanalysis::grr admbase::metric admanalysis::trK admbase::betax admbase::betay admbase::betaz adm_bssn::adm_bs_gxx adm_bssn::adm_bs_phi adm_bssn::ADM_BSSN_K adm_bssn::ADM_BSSN_gamma"
 
 IOBasic::outInfo_every                  = 1
-IOBasic::outInfo_vars                   = "einstein::alp adm_bssn::adm_bs_dtalp"
+IOBasic::outInfo_vars                   = "admbase::alp adm_bssn::adm_bs_dtalp"
 #==============================================================================
+