From 4fd01aecd88bd63bf3f6a79a63657915992a42b6 Mon Sep 17 00:00:00 2001 From: schnetter <> Date: Mon, 11 Mar 2002 12:17:00 +0000 Subject: Added stream input routines for some CarpetLib containers. Added stream input routines for some CarpetLib containers. The regridder now has to explicitly say which boundaries are outer, and which are internal. This will make outer boundaries on fine grid possible, and is also necessary when there are multiple grid patches. Started to add support for arbitrariliy many user-specified refinement regions. Not yet finished. The Carpet driver can now handle multiple grid patches. Added example files for multiple grid patches. They use initial data that does not "fit" the boundary conditions, and they don't use multiple refinement levels so far. Removed old and unused example files in CarpetLib. darcs-hash:20020311121709-07bb3-18594c42bd7a958ee0840d29e158a343208f5711.gz --- .../WaveToyF77/par/wavetoyf77_rad_full_coarse.par | 12 ++++++------ .../WaveToyF77/par/wavetoyf77_rad_full_coarse_rl2.par | 16 +++++++++------- .../WaveToyF77/par/wavetoyf77_rad_full_coarse_rl3.par | 16 +++++++++------- .../WaveToyF77/par/wavetoyf77_zero_ell_coarse.par | 4 ++-- .../WaveToyF77/par/wavetoyf77_zero_ell_coarse_rl2.par | 4 ++-- 5 files changed, 28 insertions(+), 24 deletions(-) (limited to 'CarpetExtra/WaveToyF77') diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par index 9c0093d30..a882a08a8 100644 --- a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par +++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par,v 1.3 2002/01/30 16:07:31 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse.par,v 1.4 2002/03/11 13:17:16 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" @@ -25,13 +25,13 @@ grid::avoid_origin = no IO::outdir = "wavetoyf77_rad_full_coarse" -IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "wavetoy::phi" +IOBasic::outinfo_every = 1 +IOBasic::outinfo_vars = "wavetoy::phi" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "wavetoy::phi" +IOBasic::outScalar_every = 2 +IOBasic::outScalar_vars = "wavetoy::phi" -IOASCII::out1D_every = 1 # 2 +IOASCII::out1D_every = 1 IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" WaveToyF77::bound = radiation diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl2.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl2.par index 61dd57386..301944cc0 100644 --- a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl2.par +++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl2.par @@ -7,11 +7,11 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl2.par,v 1.3 2002/01/30 16:07:31 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl2.par,v 1.4 2002/03/11 13:17:16 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" -Cactus::cctk_itlast = 60 +Cactus::cctk_itlast = 120 Time::dtfac = 0.5 @@ -21,19 +21,21 @@ driver::global_nz = 31 Carpet::max_refinement_levels = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byspacing grid::dxyz = 0.6 grid::avoid_origin = no IO::outdir = "wavetoyf77_rad_full_coarse_rl2" -IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "wavetoy::phi" +IOBasic::outinfo_every = 1 +IOBasic::outinfo_vars = "wavetoy::phi" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "wavetoy::phi" +IOBasic::outScalar_every = 2 +IOBasic::outScalar_vars = "wavetoy::phi" -IOASCII::out1D_every = 1 # 2 +IOASCII::out1D_every = 1 IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" WaveToyF77::bound = radiation diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl3.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl3.par index c30bf6446..7ef9ea780 100644 --- a/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl3.par +++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl3.par @@ -7,11 +7,11 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl3.par,v 1.3 2002/01/30 16:07:31 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_rad_full_coarse_rl3.par,v 1.4 2002/03/11 13:17:16 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" -Cactus::cctk_itlast = 60 +Cactus::cctk_itlast = 240 Time::dtfac = 0.5 @@ -21,19 +21,21 @@ driver::global_nz = 31 Carpet::max_refinement_levels = 3 +CarpetRegrid::refinement_levels = 3 + grid::type = byspacing grid::dxyz = 0.6 grid::avoid_origin = no IO::outdir = "wavetoyf77_rad_full_coarse_rl3" -IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "wavetoy::phi" +IOBasic::outinfo_every = 1 +IOBasic::outinfo_vars = "wavetoy::phi" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "wavetoy::phi" +IOBasic::outScalar_every = 2 +IOBasic::outScalar_vars = "wavetoy::phi" -IOASCII::out1D_every = 1 # 2 +IOASCII::out1D_every = 1 IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" WaveToyF77::bound = radiation diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse.par index 66121b671..aa6fd3ce7 100644 --- a/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse.par +++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse.par,v 1.3 2004/03/23 12:00:37 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse.par,v 1.1 2002/03/11 13:17:17 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" @@ -26,7 +26,7 @@ grid::type = byspacing grid::dxyz = 0.6 grid::avoid_origin = no -IO::out_dir = "wavetoyf77_zero_ell_coarse" +IO::outdir = "wavetoyf77_zero_ell_coarse" IOBasic::outinfo_every = 1 IOBasic::outinfo_vars = "wavetoy::phi" diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse_rl2.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse_rl2.par index bf73eafc9..21871b67b 100644 --- a/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse_rl2.par +++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse_rl2.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse_rl2.par,v 1.3 2004/03/23 12:00:37 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_zero_ell_coarse_rl2.par,v 1.1 2002/03/11 13:17:17 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" @@ -30,7 +30,7 @@ grid::type = byspacing grid::dxyz = 0.6 grid::avoid_origin = no -IO::out_dir = "wavetoyf77_zero_ell_coarse_rl2" +IO::outdir = "wavetoyf77_zero_ell_coarse_rl2" IOBasic::outinfo_every = 1 IOBasic::outinfo_vars = "wavetoy::phi" -- cgit v1.2.3