From c2cd724c82c0db1fa6f71c57998138b731d23034 Mon Sep 17 00:00:00 2001 From: schnetter Date: Wed, 16 Jan 2008 15:03:40 +0000 Subject: Remove outdated parameter files. Update current parameter files. Deactivated AHFinder since something doesn't seem to work with its output. git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Cartoon2D/trunk@100 eec4d7dc-71c2-46d6-addf-10296150bf52 --- test/schw-0050.par | 9 ++-- test/schw-0050MoL.par | 117 --------------------------------------------- test/test_cartoon_2.par | 49 ++++++++++--------- test/test_cartoon_2MoL.par | 99 -------------------------------------- test/test_cartoon_3.par | 55 +++++++++++---------- test/test_cartoon_3MoL.par | 98 ------------------------------------- 6 files changed, 62 insertions(+), 365 deletions(-) delete mode 100644 test/schw-0050MoL.par delete mode 100644 test/test_cartoon_2MoL.par delete mode 100644 test/test_cartoon_3MoL.par diff --git a/test/schw-0050.par b/test/schw-0050.par index c4062eb..8689feb 100644 --- a/test/schw-0050.par +++ b/test/schw-0050.par @@ -1,8 +1,8 @@ #------------------------------------------------------------------------------ -# cartoon +# cartoon, using BSSN_MoL #------------------------------------------------------------------------------ -ActiveThorns = " admbase admcoupling admmacros coordgauge spacemask staticconformal 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 bssn_mol mol admconstraints boundary nanchecker" 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 " @@ -22,7 +22,7 @@ idanalyticbh::bl_M_1 = 1.0 #generic machine outputdir #============================================================================== -IO::out_dir="schw-0050" +IO::out_dir="schw-0050MoL" #============================================================================== # Cartoon grid @@ -69,7 +69,8 @@ admconstraints::cartoon = "yes" admbase::evolution_method = "adm_bssn" -adm_bssn::method = "icn" +methodoflines::ode_method = "icn" + adm_bssn::ICN_itnum = 3 adm_bssn::stencil_size = 2 adm_bssn::advection = "upwind2" diff --git a/test/schw-0050MoL.par b/test/schw-0050MoL.par deleted file mode 100644 index df3b3a8..0000000 --- a/test/schw-0050MoL.par +++ /dev/null @@ -1,117 +0,0 @@ -# Note: The output directory for this test is identical to that of -# schw-0050.par, so to activate this test simply symlink -# schw-0050.parMoL to this directory, i.e. -# -# ln -s schw-0050 schw-0050MoL -# -# (assuming your file system allows symlinks. Otherwise a simple copy -# will work as well.) - -#------------------------------------------------------------------------------ -# cartoon, using BSSN_MoL -#------------------------------------------------------------------------------ - -ActiveThorns = "admbase admcoupling admmacros coordgauge spacemask staticconformal idanalyticbh time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic cartoon2d bssn_mol mol admconstraints boundary nanchecker" - -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 admbase::alp " - -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 -#============================================================================== - -admbase::initial_data = "bl_bh" -admbase::metric_type = "static conformal" -idanalyticbh::bl_M_1 = 1.0 - -#============================================================================== -#generic machine outputdir -#============================================================================== - -IO::out_dir="schw-0050MoL" - -#============================================================================== -# Cartoon grid -#============================================================================== - -driver::global_nx = 51 -driver::global_ny = 5 -driver::global_nz = 51 - -grid::type = "byrange" - -grid::xmin = -0.15 -grid::xmax = 4.85 - -grid::ymin = -0.2 -grid::ymax = 0.2 - -grid::zmin = -4.85 -grid::zmax = 4.85 - -time::dtfac = 0.25 - -grid::domain = "bitant" -grid::bitant_plane = "xy" - -driver::ghost_size_x = 2 -driver::ghost_size_y = 2 -driver::ghost_size_z = 2 - -cactus::cctk_itlast = 10 - -grid::avoid_originy = "no" - -cartoon2d::stencil = "yes" -cartoon2d::order = 3 - -adm_bssn::cartoon = "yes" -cartoon2d::cartoon_active = "yes" -admconstraints::cartoon = "yes" - -#============================================================================== -# Standard ADM_BSSN evolution -#============================================================================== - -admbase::evolution_method = "adm_bssn" - -methodoflines::ode_method = "icn" - -adm_bssn::ICN_itnum = 3 -adm_bssn::stencil_size = 2 -adm_bssn::advection = "upwind2" -adm_bssn::bound = "newrad" -boundary::radpower = 3 - -#============================================================================== -# 1+log -#============================================================================== - -admbase::initial_lapse = "one" -admbase::lapse_evolution_method = "1+log" -adm_bssn::lapsesource = "modified" -adm_bssn::harmonic_f = 2.0 - -#============================================================================== -# Gamma2 shift -#============================================================================== - -admbase::initial_shift = "zero" -admbase::shift_evolution_method = "gamma2" - -adm_bssn::ShiftGammaCoeff = 0.75 -adm_bssn::BetaDriver = 4.0 -adm_bssn::ShiftAlpPower = 1 -adm_bssn::ShiftPsiPower = 4 - -#============================================================================== -# 1D output -#============================================================================== - -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 34e98de..c0c4e87 100644 --- a/test/test_cartoon_2.par +++ b/test/test_cartoon_2.par @@ -1,8 +1,9 @@ #============================================================================== -# Cartoon2D, using a full grid +# Cartoon2D, using a full grid, and BSSN_MoL #============================================================================== -ActiveThorns = "cartoon2d idanalyticbh admbase admcoupling admmacros coordgauge spacemask staticconformal admanalysis adm_bssn admconstraints ahfinder pughinterp boundary time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic" +ActiveThorns = "cartoon2d idanalyticbh admbase admcoupling admmacros coordgauge spacemask staticconformal admanalysis bssn_mol mol nanchecker admconstraints pughinterp boundary time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic localinterp localreduce coordbase initbase symbase" +## ahfinder #------------------------------------------------------------------------------ # Run parameters for Cartoon @@ -13,7 +14,6 @@ cartoon2d::cartoon_active = "yes" cartoon2d::verbose = "yes" cartoon2d::stencil = "yes" cartoon2d::order = 3 -cartoon2d::allow_grid_resize = "yes" # This is for 2 processors, you have to # change manually by processor numbers. @@ -25,9 +25,9 @@ cartoon2d::allow_grid_resize = "yes" # Grid -driver::global_nx = 16 -driver::global_ny = 3 -driver::global_nz = 32 +driver::global_nx = 19 +driver::global_ny = 5 +driver::global_nz = 34 driver::ghost_size_x = 2 driver::ghost_size_y = 2 @@ -35,9 +35,14 @@ driver::ghost_size_z = 2 grid::avoid_originy = "no" -grid::type = "byspacing" +grid::type = "byrange" grid::domain = "full" -grid::dxyz = 0.2 +grid::xmin = -0.3 +grid::xmax = +3.3 +grid::ymin = -0.4 +grid::ymax = +0.4 +grid::zmin = -3.3 +grid::zmax = +3.3 time::dtfac = 0.25 @@ -50,7 +55,7 @@ admbase::metric_type = "static conformal" #--- Evolution admbase::evolution_method = "adm_bssn" -adm_bssn::method = "icn" +methodoflines::ode_method = "icn" adm_bssn::bound = "flat" adm_bssn::cartoon = "yes" admconstraints::cartoon = "yes" @@ -58,19 +63,19 @@ admconstraints::cartoon = "yes" #--- gauge admbase::lapse_evolution_method = "1+log" -#--- AHFinder. - -ahfinder::ahf_active = "yes" -ahfinder::ahf_cartoon = "yes" - -ahfinder::ahf_phi = "no" -ahfinder::ahf_octant = "high" - -ahfinder::ahf_lmax = 0 - -# Interpolation. - -ahfinder::interpolation_order = 1 +## #--- AHFinder. +## +## ahfinder::ahf_active = "yes" +## ahfinder::ahf_cartoon = "yes" +## +## ahfinder::ahf_phi = "no" +## ahfinder::ahf_octant = "high" +## +## ahfinder::ahf_lmax = 0 +## +## # Interpolation. +## +## ahfinder::interpolation_order = 1 #------------------------------------------------------------------------------ # Output diff --git a/test/test_cartoon_2MoL.par b/test/test_cartoon_2MoL.par deleted file mode 100644 index d655d1f..0000000 --- a/test/test_cartoon_2MoL.par +++ /dev/null @@ -1,99 +0,0 @@ -# Note: The output directory for this test is identical to that of -# test_cartoon2.par, so to activate this test simply symlink -# test_cartoon2MoL to this directory, i.e. -# -# ln -s test_cartoon2 test_cartoon2MoL -# -# (assuming your file system allows symlinks. Otherwise a simple copy -# will work as well.) - -#============================================================================== -# Cartoon2D, using a full grid, and BSSN_MoL -#============================================================================== - -ActiveThorns = "cartoon2d idanalyticbh admbase admcoupling admmacros coordgauge spacemask staticconformal admanalysis bssn_mol mol nanchecker admconstraints ahfinder pughinterp boundary time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic localinterp" - -#------------------------------------------------------------------------------ -# Run parameters for Cartoon -#------------------------------------------------------------------------------ - -# Cartoon -cartoon2d::cartoon_active = "yes" -cartoon2d::verbose = "yes" -cartoon2d::stencil = "yes" -cartoon2d::order = 3 -cartoon2d::allow_grid_resize = "yes" - -# This is for 2 processors, you have to -# change manually by processor numbers. - -#driver::processor_topology = "manual" -#driver::processor_topology_3d_x = 1 -#driver::processor_topology_3d_y = 1 -#driver::processor_topology_3d_z = 2 - -# Grid - -driver::global_nx = 16 -driver::global_ny = 3 -driver::global_nz = 32 - -driver::ghost_size_x = 2 -driver::ghost_size_y = 2 -driver::ghost_size_z = 2 - -grid::avoid_originy = "no" - -grid::type = "byspacing" -grid::domain = "full" -grid::dxyz = 0.2 - -time::dtfac = 0.25 - -cactus::cctk_itlast = 1 - -# MODEL - -admbase::initial_data = "schwarzschild" -admbase::metric_type = "static conformal" - -#--- Evolution -admbase::evolution_method = "adm_bssn" -methodoflines::ode_method = "icn" -adm_bssn::bound = "flat" -adm_bssn::cartoon = "yes" -admconstraints::cartoon = "yes" - -#--- gauge -admbase::lapse_evolution_method = "1+log" - -#--- AHFinder. - -ahfinder::ahf_active = "yes" -ahfinder::ahf_cartoon = "yes" - -ahfinder::ahf_phi = "no" -ahfinder::ahf_octant = "high" - -ahfinder::ahf_lmax = 0 - -# Interpolation. - -ahfinder::interpolation_order = 1 - -#------------------------------------------------------------------------------ -# Output -#------------------------------------------------------------------------------ -IO::out_dir = "test_cartoon_2MoL" -IO::out_fileinfo = "none" - -IOBasic::outScalar_every = 1 -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 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 = "admbase::alp adm_bssn::adm_bs_dtalp" -#============================================================================== - diff --git a/test/test_cartoon_3.par b/test/test_cartoon_3.par index 8c85b6f..435cf54 100644 --- a/test/test_cartoon_3.par +++ b/test/test_cartoon_3.par @@ -1,8 +1,9 @@ #============================================================================== -# Cartoon2D, using a full grid +# Cartoon2D, using bitant mode, and BSSN_MoL #============================================================================== -ActiveThorns = "admanalysis cartoon2d ADMcoupling ADMMacros Coordgauge spacemask staticconformal idanalyticbh admbase adm_bssn admconstraints ahfinder pughinterp boundary time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic localinterp" +ActiveThorns = "cartoon2d idanalyticbh admbase admcoupling admmacros coordgauge spacemask staticconformal admanalysis bssn_mol mol nanchecker admconstraints pughinterp boundary time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic localinterp localreduce coordbase initbase symbase" +## ahfinder #------------------------------------------------------------------------------ # Run parameters for Cartoon @@ -13,7 +14,6 @@ cartoon2d::cartoon_active = "yes" cartoon2d::verbose = "yes" cartoon2d::stencil = "yes" cartoon2d::order = 3 -cartoon2d::allow_grid_resize = "yes" # This is for 2 processors, you have to # change manually by processor numbers. @@ -25,9 +25,9 @@ cartoon2d::allow_grid_resize = "yes" # Grid -driver::global_nx = 16 -driver::global_ny = 3 -driver::global_nz = 32 +driver::global_nx = 19 +driver::global_ny = 5 +driver::global_nz = 19 driver::ghost_size_x = 2 driver::ghost_size_y = 2 @@ -35,9 +35,14 @@ driver::ghost_size_z = 2 grid::avoid_originy = "no" -grid::type = "byspacing" -grid::domain = "full" -grid::dxyz = 0.2 +grid::type = "byrange" +grid::domain = "bitant" +grid::xmin = -0.3 +grid::xmax = +3.3 +grid::ymin = -0.4 +grid::ymax = +0.4 +grid::zmin = -0.3 +grid::zmax = +3.3 time::dtfac = 0.25 @@ -45,12 +50,12 @@ cactus::cctk_itlast = 1 # MODEL -admbase::metric_type = "static conformal" -admbase::initial_data = "schwarzschild" +admbase::initial_data = "schwarzschild" +admbase::metric_type = "static conformal" #--- Evolution admbase::evolution_method = "adm_bssn" -adm_bssn::method = "icn" +methodoflines::ode_method = "icn" adm_bssn::bound = "flat" adm_bssn::cartoon = "yes" admconstraints::cartoon = "yes" @@ -58,19 +63,19 @@ admconstraints::cartoon = "yes" #--- gauge admbase::lapse_evolution_method = "1+log" -#--- AHFinder. - -ahfinder::ahf_active = "yes" -ahfinder::ahf_cartoon = "yes" - -ahfinder::ahf_phi = "no" -ahfinder::ahf_octant = "high" - -ahfinder::ahf_lmax = 0 - -# Interpolation. - -ahfinder::interpolation_order = 1 +## #--- AHFinder. +## +## ahfinder::ahf_active = "yes" +## ahfinder::ahf_cartoon = "yes" +## +## ahfinder::ahf_phi = "no" +## ahfinder::ahf_octant = "high" +## +## ahfinder::ahf_lmax = 0 +## +## # Interpolation. +## +## ahfinder::interpolation_order = 1 #------------------------------------------------------------------------------ # Output diff --git a/test/test_cartoon_3MoL.par b/test/test_cartoon_3MoL.par deleted file mode 100644 index feaae84..0000000 --- a/test/test_cartoon_3MoL.par +++ /dev/null @@ -1,98 +0,0 @@ -# Note: The output directory for this test is identical to that of -# test_cartoon3.par, so to activate this test simply symlink -# test_cartoon3MoL to this directory, i.e. -# -# ln -s test_cartoon3 test_cartoon3MoL -# -# (assuming your file system allows symlinks. Otherwise a simple copy -# will work as well.) - -#============================================================================== -# Cartoon2D, using a full grid, and BSSN_MoL -#============================================================================== - -ActiveThorns = "admanalysis cartoon2d ADMcoupling ADMMacros Coordgauge spacemask staticconformal idanalyticbh admbase bssn_mol mol nanchecker admconstraints ahfinder pughinterp boundary time pugh pughreduce pughslab cartgrid3d ioascii ioutil iobasic localinterp" - -#------------------------------------------------------------------------------ -# Run parameters for Cartoon -#------------------------------------------------------------------------------ - -# Cartoon -cartoon2d::cartoon_active = "yes" -cartoon2d::verbose = "yes" -cartoon2d::stencil = "yes" -cartoon2d::order = 3 -cartoon2d::allow_grid_resize = "yes" - -# This is for 2 processors, you have to -# change manually by processor numbers. - -#driver::processor_topology = "manual" -#driver::processor_topology_3d_x = 1 -#driver::processor_topology_3d_y = 1 -#driver::processor_topology_3d_z = 2 - -# Grid - -driver::global_nx = 16 -driver::global_ny = 3 -driver::global_nz = 32 - -driver::ghost_size_x = 2 -driver::ghost_size_y = 2 -driver::ghost_size_z = 2 - -grid::avoid_originy = "no" - -grid::type = "byspacing" -grid::domain = "full" -grid::dxyz = 0.2 - -time::dtfac = 0.25 - -cactus::cctk_itlast = 1 - -# MODEL - -admbase::metric_type = "static conformal" -admbase::initial_data = "schwarzschild" - -#--- Evolution -admbase::evolution_method = "adm_bssn" -methodoflines::ode_method = "icn" -adm_bssn::bound = "flat" -adm_bssn::cartoon = "yes" -admconstraints::cartoon = "yes" - -#--- gauge -admbase::lapse_evolution_method = "1+log" - -#--- AHFinder. - -ahfinder::ahf_active = "yes" -ahfinder::ahf_cartoon = "yes" - -ahfinder::ahf_phi = "no" -ahfinder::ahf_octant = "high" - -ahfinder::ahf_lmax = 0 - -# Interpolation. - -ahfinder::interpolation_order = 1 - -#------------------------------------------------------------------------------ -# Output -#------------------------------------------------------------------------------ -IO::out_dir = "test_cartoon_3MoL" -IO::out_fileinfo = "none" - -IOBasic::outScalar_every = 1 -IOBasic::outScalar_vars = "admconstraints::hamiltonian admconstraints::momentum admbase::alp admanalysis::grr admbase::metric admanalysis::trace_of_K 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 admbase::alp admanalysis::grr admbase::metric admanalysis::trace_of_K 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 = "admbase::alp adm_bssn::adm_bs_dtalp" -#============================================================================== -- cgit v1.2.3