From 5931a0055ef7580a152b00d8936509b6facd9153 Mon Sep 17 00:00:00 2001 From: schnetter <> Date: Fri, 14 Dec 2001 16:59:00 +0000 Subject: Added new thorns CarpetReduce and CarpetRegrid to parameter files. darcs-hash:20011214165954-07bb3-e68f15a15027098cd26981663394a4365aee510d.gz --- CarpetExtra/HydroToy/par/hydrotoy_periodic.par | 11 +- .../HydroToy/par/hydrotoy_periodic_coarse.par | 11 +- .../HydroToy/par/hydrotoy_periodic_coarse_rl2.par | 13 +- .../HydroToy/par/hydrotoy_periodic_coarse_rl3.par | 13 +- CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par | 13 +- CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par | 13 +- .../HydroToy/test/hydrotoy_periodic_coarse.par | 10 +- .../HydroToy/test/hydrotoy_periodic_coarse_rl2.par | 12 +- .../HydroToy/test/hydrotoy_periodic_coarse_rl3.par | 12 +- CarpetExtra/IDHydroToy/src/InitialData.F77 | 162 ++++++++++++++------- CarpetExtra/IDScalarWave/schedule.ccl | 3 +- CarpetExtra/IDScalarWave/src/CheckParameters.F77 | 3 +- CarpetExtra/IDScalarWave/src/InitialData.F77 | 65 ++++++--- CarpetExtra/IDSpaceTimeToy/src/InitialData.F77 | 92 ++++++++---- .../SpaceTimeToy/par/doubletoy_periodic.par | 11 +- .../SpaceTimeToy/par/doubletoy_periodic_coarse.par | 11 +- .../par/doubletoy_periodic_coarse_rl2.par | 13 +- .../par/doubletoy_periodic_coarse_rl3.par | 13 +- .../SpaceTimeToy/par/doubletoy_periodic_rl2.par | 13 +- .../SpaceTimeToy/par/doubletoy_periodic_rl3.par | 13 +- .../SpaceTimeToy/par/spacetimetoy_periodic.par | 11 +- .../par/spacetimetoy_periodic_coarse.par | 11 +- .../par/spacetimetoy_periodic_coarse_rl2.par | 13 +- .../par/spacetimetoy_periodic_coarse_rl3.par | 13 +- .../SpaceTimeToy/par/spacetimetoy_periodic_rl2.par | 13 +- .../SpaceTimeToy/par/spacetimetoy_periodic_rl3.par | 13 +- .../test/doubletoy_periodic_coarse.par | 10 +- .../test/doubletoy_periodic_coarse_rl2.par | 12 +- .../test/doubletoy_periodic_coarse_rl3.par | 12 +- .../test/spacetimetoy_periodic_coarse.par | 10 +- .../test/spacetimetoy_periodic_coarse_rl2.par | 12 +- .../test/spacetimetoy_periodic_coarse_rl3.par | 12 +- .../WaveToyF77/par/wavetoyf77_periodic_coarse.par | 11 +- .../par/wavetoyf77_periodic_coarse_rl2.par | 13 +- .../par/wavetoyf77_periodic_coarse_rl3.par | 13 +- .../WaveToyF77/test/wavetoyf77_periodic_coarse.par | 10 +- .../test/wavetoyf77_periodic_coarse_rl2.par | 12 +- .../test/wavetoyf77_periodic_coarse_rl3.par | 12 +- 38 files changed, 454 insertions(+), 266 deletions(-) (limited to 'CarpetExtra') diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic.par index ac96d3e85..20d133da1 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic.par,v 1.5 2001/12/14 17:59:57 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -37,10 +37,10 @@ grid::mode = periodic IO::outdir = "hydrotoy_periodic" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" @@ -48,6 +48,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par index a047c4908..2211b0e37 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par,v 1.3 2001/04/23 08:10:18 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse.par,v 1.4 2001/12/14 17:59:57 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -37,10 +37,10 @@ grid::mode = periodic IO::outdir = "hydrotoy_periodic_coarse" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" @@ -48,6 +48,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 12 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par index 7f08bca65..b9aae769a 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl2.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "hydrotoy_periodic_coarse_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par index 5f9cf7790..72cde35ee 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_coarse_rl3.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 3 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "hydrotoy_periodic_coarse_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par index 5b1fe7f03..252547e5e 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl2.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduc CarpetRegrid CarpetSlab IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.1 grid::ymin = -6.9 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "hydrotoy_periodic_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par index d1fd53bbb..4363da750 100644 --- a/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par +++ b/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par,v 1.4 2001/04/23 08:10:18 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/par/hydrotoy_periodic_rl3.par,v 1.5 2001/12/14 17:59:58 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.1 grid::ymin = -6.9 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "hydrotoy_periodic_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" IOFlexIO::out3D_every = 96 IOFlexIO::out3D_vars = "hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" HydroToy::bound = radiation diff --git a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par index 874668850..896b0953e 100644 --- a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par +++ b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par,v 1.1 2001/12/03 17:26:30 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse.par,v 1.2 2001/12/14 17:59:59 schnetter Exp $ !DESC "HydroToy with periodic boundaries, no refinement" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -30,10 +30,10 @@ grid::mode = periodic IO::outdir = "hydrotoy_periodic_coarse" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" diff --git a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par index 80a8b9500..614d35b13 100644 --- a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par +++ b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par,v 1.1 2001/12/03 17:26:30 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl2.par,v 1.2 2001/12/14 17:59:59 schnetter Exp $ !DESC "HydroToy with periodic boundaries, 1 refinement level" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -22,6 +22,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -34,10 +36,10 @@ grid::mode = periodic IO::outdir = "hydrotoy_periodic_coarse_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" diff --git a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par index 6cab609e0..48ebcfe02 100644 --- a/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par +++ b/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par,v 1.1 2001/12/03 17:26:31 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/HydroToy/test/hydrotoy_periodic_coarse_rl3.par,v 1.2 2001/12/14 17:59:59 schnetter Exp $ !DESC "WaveToy with periodic boundaries, 2 refinement levels" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -22,6 +22,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 3 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -34,10 +36,10 @@ grid::mode = periodic IO::outdir = "hydrotoy_periodic_coarse_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "hydrotoy::hydroevolve grid::coordinates" diff --git a/CarpetExtra/IDHydroToy/src/InitialData.F77 b/CarpetExtra/IDHydroToy/src/InitialData.F77 index 92bcf0e2a..1bf7b9d47 100644 --- a/CarpetExtra/IDHydroToy/src/InitialData.F77 +++ b/CarpetExtra/IDHydroToy/src/InitialData.F77 @@ -1,5 +1,5 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/InitialData.F77,v 1.3 2001/03/26 02:28:50 eschnett Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/InitialData.F77,v 1.4 2001/12/14 18:00:00 schnetter Exp $ #include "cctk.h" #include "cctk_Parameters.h" @@ -16,6 +16,7 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/Initial CCTK_REAL pi CCTK_REAL omega CCTK_REAL dt + CCTK_REAL x,y,z, r integer i,j,k CCTK_REAL vr @@ -35,20 +36,28 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/Initial do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) + x = cart3d_x(i,j,k) + y = cart3d_y(i,j,k) + z = cart3d_z(i,j,k) + u(i,j,k) = amplitude - $ * cos((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) - $ + kz*cart3d_z(i,j,k) + omega*cctk_time) * pi) + $ * cos((kx*x + ky*y + kz*z + omega*cctk_time) * pi) vx(i,j,k) = u(i,j,k) * kx / omega vy(i,j,k) = u(i,j,k) * ky / omega vz(i,j,k) = u(i,j,k) * kz / omega u_p(i,j,k) = amplitude - $ * cos((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) - $ + kz*cart3d_z(i,j,k) + omega*(cctk_time-dt)) * pi) + $ * cos((kx*x + ky*y + kz*z + omega*(cctk_time-dt)) * pi) vx_p(i,j,k) = u_p(i,j,k) * kx / omega vy_p(i,j,k) = u_p(i,j,k) * ky / omega vz_p(i,j,k) = u_p(i,j,k) * kz / omega + u_p_p(i,j,k) = amplitude + $ * cos((kx*x + ky*y + kz*z + omega*(cctk_time-2*dt)) * pi) + vx_p_p(i,j,k) = u_p_p(i,j,k) * kx / omega + vy_p_p(i,j,k) = u_p_p(i,j,k) * ky / omega + vz_p_p(i,j,k) = u_p_p(i,j,k) * kz / omega + end do end do end do @@ -59,27 +68,45 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDHydroToy/src/Initial do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - u(i,j,k) = amplitude / spher3d_r(i,j,k) - $ * exp(- (spher3d_r(i,j,k) - radius + cctk_time)**2 / sigma**2) + x = cart3d_x(i,j,k) + y = cart3d_y(i,j,k) + z = cart3d_z(i,j,k) + r = spher3d_r(i,j,k) + + u(i,j,k) = amplitude + $ * exp(- (r - radius)**2 / sigma**2) + + vr = - 2*amplitude * (r - radius) / sigma**2 + $ * exp(- (r - radius)**2 / sigma**2) + vx(i,j,k) = vr * x/r + vy(i,j,k) = vr * y/r + vz(i,j,k) = vr * z/r + + u_p(i,j,k) = amplitude/2 * (r - dt) / r + $ * exp(- (r - radius - dt)**2 / sigma**2) + $ + amplitude/2 * (r + dt) / r + $ * exp(- (r - radius + dt)**2 / sigma**2) - vr = -0.5d0 * amplitude - $ * (sqrt(pi) * sigma * erf((cctk_time - spher3d_r(i,j,k) + radius) / sigma) - $ + 2*exp(-(cctk_time - spher3d_r(i,j,k) + radius)**2 / sigma**2) * spher3d_r(i,j,k)) - $ / spher3d_r(i,j,k)**2 - vx(i,j,k) = vr * cart3d_x(i,j,k)/spher3d_r(i,j,k) - vy(i,j,k) = vr * cart3d_y(i,j,k)/spher3d_r(i,j,k) - vz(i,j,k) = vr * cart3d_z(i,j,k)/spher3d_r(i,j,k) + vr = - amplitude/2 * (-dt / r**2 + (r - dt) * (r - radius - dt) / (r * sigma**2)) + $ * exp(- (r - radius - dt)**2 / sigma**2) + $ - amplitude/2 * ( dt / r**2 + (r + dt) * (r - radius + dt) / (r * sigma**2)) + $ * exp(- (r - radius - dt)**2 / sigma**2) + vx_p(i,j,k) = vr * x/r + vy_p(i,j,k) = vr * y/r + vz_p(i,j,k) = vr * z/r - u_p(i,j,k) = amplitude / spher3d_r(i,j,k) - $ * exp(- (spher3d_r(i,j,k) - radius + (cctk_time-dt))**2 / sigma**2) + u_p_p(i,j,k) = amplitude/2 * (r - 2*dt) / r + $ * exp(- (r - radius - 2*dt)**2 / sigma**2) + $ + amplitude/2 * (r + 2*dt) / r + $ * exp(- (r - radius + 2*dt)**2 / sigma**2) - vr = -0.5d0 * amplitude - $ * (sqrt(pi) * sigma * erf((cctk_time - spher3d_r(i,j,k) + radius) / sigma) - $ + 2*exp(-((cctk_time-dt) - spher3d_r(i,j,k) + radius)**2 / sigma**2) * spher3d_r(i,j,k)) - $ / spher3d_r(i,j,k)**2 - vx_p(i,j,k) = vr * cart3d_x(i,j,k)/spher3d_r(i,j,k) - vy_p(i,j,k) = vr * cart3d_y(i,j,k)/spher3d_r(i,j,k) - vz_p(i,j,k) = vr * cart3d_z(i,j,k)/spher3d_r(i,j,k) + vr = - amplitude/2 * (-2*dt / r**2 + (r - 2*dt) * (r - radius - 2*dt) / (r * sigma**2)) + $ * exp(- (r - radius - 2*dt)**2 / sigma**2) + $ - amplitude/2 * ( 2*dt / r**2 + (r + 2*dt) * (r - radius + 2*dt) / (r * sigma**2)) + $ * exp(- (r - radius - 2*dt)**2 / sigma**2) + vx_p_p(i,j,k) = vr * x/r + vy_p_p(i,j,k) = vr * y/r + vz_p_p(i,j,k) = vr * z/r end do end do @@ -93,52 +120,80 @@ c Use kx,ky,kz as number of modes in each direction. do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) + x = cart3d_x(i,j,k) + y = cart3d_y(i,j,k) + z = cart3d_z(i,j,k) + u(i,j,k) = amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) $ * cos(omega * cctk_time * pi) vx(i,j,k) = amplitude - $ * cos(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) + $ * cos(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) $ * sin(omega * cctk_time * pi) $ * kx / omega vy(i,j,k) = amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * cos(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * cos(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) $ * sin(omega * cctk_time * pi) $ * ky / omega vz(i,j,k) = amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * cos(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * cos(kz * (z - 0.5d0) * pi) $ * sin(omega * cctk_time * pi) $ * kz / omega u_p(i,j,k) = amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) - $ * cos(omega * (cctk_time-dt) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * cos(omega * (cctk_time - dt) * pi) vx_p(i,j,k) = amplitude - $ * cos(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) - $ * sin(omega * (cctk_time-dt) * pi) + $ * cos(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * sin(omega * (cctk_time - dt) * pi) $ * kx / omega vy_p(i,j,k) = amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * cos(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) - $ * sin(omega * (cctk_time-dt) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * cos(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * sin(omega * (cctk_time - dt) * pi) $ * ky / omega vz_p(i,j,k) = amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * cos(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) - $ * sin(omega * (cctk_time-dt) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * cos(kz * (z - 0.5d0) * pi) + $ * sin(omega * (cctk_time - dt) * pi) + $ * kz / omega + + u_p_p(i,j,k) = amplitude + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * cos(omega * (cctk_time - 2*dt) * pi) + vx_p_p(i,j,k) = amplitude + $ * cos(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * sin(omega * (cctk_time - 2*dt) * pi) + $ * kx / omega + vy_p_p(i,j,k) = amplitude + $ * sin(kx * (x - 0.5d0) * pi) + $ * cos(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * sin(omega * (cctk_time - 2*dt) * pi) + $ * ky / omega + vz_p_p(i,j,k) = amplitude + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * cos(kz * (z - 0.5d0) * pi) + $ * sin(omega * (cctk_time - 2*dt) * pi) $ * kz / omega end do @@ -161,6 +216,11 @@ c Use kx,ky,kz as number of modes in each direction. vy_p(i,j,k) = 0 vz_p(i,j,k) = 0 + u_p_p(i,j,k) = 0 + vx_p_p(i,j,k) = 0 + vy_p_p(i,j,k) = 0 + vz_p_p(i,j,k) = 0 + end do end do end do diff --git a/CarpetExtra/IDScalarWave/schedule.ccl b/CarpetExtra/IDScalarWave/schedule.ccl index d4736d90b..cc46e3ece 100644 --- a/CarpetExtra/IDScalarWave/schedule.ccl +++ b/CarpetExtra/IDScalarWave/schedule.ccl @@ -1,5 +1,5 @@ # Schedule definitions for thorn IDScalarWave -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/schedule.ccl,v 1.2 2001/03/13 17:40:38 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/schedule.ccl,v 1.3 2001/12/14 18:00:00 schnetter Exp $ schedule IDScalarWave_CheckParameters at PARAMCHECK { @@ -11,4 +11,3 @@ schedule IDScalarWave_InitialData as WaveToy_InitialData at INITIAL STORAGE: wavetoy::scalarevolve LANG: Fortran } "Initial data for 3D wave equation" - diff --git a/CarpetExtra/IDScalarWave/src/CheckParameters.F77 b/CarpetExtra/IDScalarWave/src/CheckParameters.F77 index 521ab0be7..cf55fd742 100644 --- a/CarpetExtra/IDScalarWave/src/CheckParameters.F77 +++ b/CarpetExtra/IDScalarWave/src/CheckParameters.F77 @@ -1,4 +1,5 @@ -c -*-Fortran-*- +c -*-Fortran-*- +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/src/CheckParameters.F77,v 1.3 2001/12/14 18:00:01 schnetter Exp $ /*@@ @file CheckParameters.F77 diff --git a/CarpetExtra/IDScalarWave/src/InitialData.F77 b/CarpetExtra/IDScalarWave/src/InitialData.F77 index 294764873..739c6d2d2 100644 --- a/CarpetExtra/IDScalarWave/src/InitialData.F77 +++ b/CarpetExtra/IDScalarWave/src/InitialData.F77 @@ -1,9 +1,10 @@ c -*-Fortran-*- +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDScalarWave/src/InitialData.F77,v 1.8 2001/12/14 18:00:01 schnetter Exp $ /*@@ @file InitialData.F77 @date - @author Tom Goodale + @author Tom Goodale, Erik Schnetter @desc Initial data for the 3D Wave Equation @enddesc @@ -17,7 +18,7 @@ c -*-Fortran-*- /*@@ @routine IDScalarWave_InitialData @date - @author Tom Goodale + @author Tom Goodale, Erik Schnetter @desc Set up initial data for the wave equation @enddesc @@ -39,6 +40,7 @@ c -*-Fortran-*- INTEGER i,j,k CCTK_REAL dt,omega, pi + CCTK_REAL x,y,z, r c call CCTK_INFO ("IDScalarWave_InitialData") @@ -54,12 +56,18 @@ c call CCTK_INFO ("IDScalarWave_InitialData") do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) + x = cart3d_x(i,j,k) + y = cart3d_y(i,j,k) + z = cart3d_z(i,j,k) + phi(i,j,k) = amplitude - $ * cos((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) - $ + kz*cart3d_z(i,j,k) + omega*cctk_time) * pi) + $ * cos((kx*x + ky*y + kz*z + omega*cctk_time) * pi) + phi_p(i,j,k) = amplitude - $ * cos((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) - $ + kz*cart3d_z(i,j,k) + omega*(cctk_time - dt)) * pi) + $ * cos((kx*x + ky*y + kz*z + omega*(cctk_time - dt)) * pi) + + phi_p_p(i,j,k) = amplitude + $ * cos((kx*x + ky*y + kz*z + omega*(cctk_time - 2*dt)) * pi) end do end do @@ -71,10 +79,20 @@ c call CCTK_INFO ("IDScalarWave_InitialData") do j=1, cctk_lsh(2) do i=1, cctk_lsh(1) + r = spher3d_r(i,j,k) + phi(i,j,k) = amplitude - $ * exp(- (spher3d_r(i,j,k) - radius)**2 / sigma**2) - phi_p(i,j,k) = amplitude - $ * exp(- (spher3d_r(i,j,k) - radius - dt)**2 / sigma**2) + $ * exp(- (r - radius)**2 / sigma**2) + + phi_p(i,j,k) = amplitude/2 * (r - dt) / r + $ * exp(- (r - radius - dt)**2 / sigma**2) + $ + amplitude/2 * (r + dt) / r + $ * exp(- (r - radius + dt)**2 / sigma**2) + + phi_p_p(i,j,k) = amplitude/2 * (r - 2*dt) / r + $ * exp(- (r - radius - 2*dt)**2 / sigma**2) + $ + amplitude/2 * (r + 2*dt) / r + $ * exp(- (r - radius + 2*dt)**2 / sigma**2) end do end do @@ -88,17 +106,27 @@ c Use kx,ky,kz as number of modes in each direction. do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) + x = cart3d_x(i,j,k) + y = cart3d_y(i,j,k) + z = cart3d_z(i,j,k) + phi(i,j,k) = amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) $ * cos(omega * cctk_time * pi) phi_p(i,j,k) = amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) - $ * cos(omega * (cctk_time-dt) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * cos(omega * (cctk_time - dt) * pi) + + phi_p_p(i,j,k) = amplitude + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * cos(omega * (cctk_time - 2*dt) * pi) end do end do @@ -110,8 +138,9 @@ c Use kx,ky,kz as number of modes in each direction. do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - phi(i,j,k) = 0.0d0 - phi_p(i,j,k) = 0.0d0 + phi(i,j,k) = 0.0d0 + phi_p(i,j,k) = 0.0d0 + phi_p_p(i,j,k) = 0.0d0 end do end do diff --git a/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77 b/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77 index 4fe16680d..69b1e710f 100644 --- a/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77 +++ b/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77 @@ -1,5 +1,5 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77,v 1.5 2001/08/26 13:59:47 schnetter Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/InitialData.F77,v 1.6 2001/12/14 18:00:02 schnetter Exp $ #include "cctk.h" #include "cctk_Parameters.h" @@ -16,6 +16,7 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/Ini CCTK_REAL pi CCTK_REAL omega CCTK_REAL dt + CCTK_REAL x,y,z, r integer i,j,k pi = 4*atan(1.d0) @@ -30,20 +31,26 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/Ini do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) + x = cart3d_x(i,j,k) + y = cart3d_y(i,j,k) + z = cart3d_z(i,j,k) + phi(i,j,k) = amplitude - $ * cos((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) - $ + kz*cart3d_z(i,j,k) + omega*cctk_time) * pi) + $ * cos((kx*x + ky*y + kz*z + omega*cctk_time) * pi) psi(i,j,k) = - amplitude - $ * sin((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) - $ + kz*cart3d_z(i,j,k) + omega*cctk_time) * pi) + $ * sin((kx*x + ky*y + kz*z + omega*cctk_time) * pi) $ * pi * omega phi_p(i,j,k) = amplitude - $ * cos((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) - $ + kz*cart3d_z(i,j,k) + omega*(cctk_time-dt)) * pi) + $ * cos((kx*x + ky*y + kz*z + omega*(cctk_time - dt)) * pi) psi_p(i,j,k) = - amplitude - $ * sin((kx*cart3d_x(i,j,k) + ky*cart3d_y(i,j,k) - $ + kz*cart3d_z(i,j,k) + omega*(cctk_time-dt)) * pi) + $ * sin((kx*x + ky*y + kz*z + omega*(cctk_time - dt)) * pi) + $ * pi * omega + + phi_p_p(i,j,k) = amplitude + $ * cos((kx*x + ky*y + kz*z + omega*(cctk_time - 2*dt)) * pi) + psi_p_p(i,j,k) = - amplitude + $ * sin((kx*x + ky*y + kz*z + omega*(cctk_time - 2*dt)) * pi) $ * pi * omega end do @@ -56,15 +63,22 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/IDSpaceTimeToy/src/Ini do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) - phi(i,j,k) = amplitude / spher3d_r(i,j,k) - $ * exp(- (spher3d_r(i,j,k) - radius - cctk_time)**2 / sigma**2) + r = spher3d_r(i,j,k) + + phi(i,j,k) = amplitude / r + $ * exp(- (r - radius - cctk_time)**2 / sigma**2) psi(i,j,k) = phi(i,j,k) - $ * 2 * (spher3d_r(i,j,k) - radius - cctk_time) / sigma**2 + $ * 2 * (r - radius - cctk_time) / sigma**2 - phi_p(i,j,k) = amplitude / spher3d_r(i,j,k) - $ * exp(- (spher3d_r(i,j,k) - radius - (cctk_time-dt))**2 / sigma**2) + phi_p(i,j,k) = amplitude / r + $ * exp(- (r - radius - (cctk_time - dt))**2 / sigma**2) psi_p(i,j,k) = phi(i,j,k) - $ * 2 * (spher3d_r(i,j,k) - radius - (cctk_time-dt)) / sigma**2 + $ * 2 * (r - radius - (cctk_time - dt)) / sigma**2 + + phi_p_p(i,j,k) = amplitude / r + $ * exp(- (r - radius - (cctk_time - 2*dt))**2 / sigma**2) + psi_p_p(i,j,k) = phi(i,j,k) + $ * 2 * (r - radius - (cctk_time - 2*dt)) / sigma**2 end do end do @@ -78,28 +92,44 @@ c Use kx,ky,kz as number of modes in each direction. do j=1,cctk_lsh(2) do i=1,cctk_lsh(1) + x = cart3d_x(i,j,k) + y = cart3d_y(i,j,k) + z = cart3d_z(i,j,k) + phi(i,j,k) = amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) $ * cos(omega * cctk_time * pi) psi(i,j,k) = - amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) $ * sin(omega * cctk_time * pi) $ * omega * pi phi_p(i,j,k) = amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) - $ * cos(omega * (cctk_time-dt) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * cos(omega * (cctk_time - dt) * pi) psi_p(i,j,k) = - amplitude - $ * sin(kx * (cart3d_x(i,j,k) - 0.5d0) * pi) - $ * sin(ky * (cart3d_y(i,j,k) - 0.5d0) * pi) - $ * sin(kz * (cart3d_z(i,j,k) - 0.5d0) * pi) - $ * sin(omega * (cctk_time-dt) * pi) + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * sin(omega * (cctk_time - dt) * pi) + $ * omega * pi + + phi_p_p(i,j,k) = amplitude + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * cos(omega * (cctk_time - 2*dt) * pi) + psi_p_p(i,j,k) = - amplitude + $ * sin(kx * (x - 0.5d0) * pi) + $ * sin(ky * (y - 0.5d0) * pi) + $ * sin(kz * (z - 0.5d0) * pi) + $ * sin(omega * (cctk_time - 2*dt) * pi) $ * omega * pi end do @@ -118,6 +148,9 @@ c Use kx,ky,kz as number of modes in each direction. phi_p(i,j,k) = 0 psi_p(i,j,k) = 0 + phi_p_p(i,j,k) = 0 + psi_p_p(i,j,k) = 0 + end do end do end do @@ -132,6 +165,7 @@ c Use kx,ky,kz as number of modes in each direction. psi(i,j,k) = psi(i,j,k) - u(i,j,k) psi_p(i,j,k) = psi_p(i,j,k) - u_p(i,j,k) + psi_p_p(i,j,k) = psi_p_p(i,j,k) - u_p_p(i,j,k) end do end do diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par index 2c22914c6..387b4a7f6 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par,v 1.3 2001/04/23 08:10:20 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic.par,v 1.4 2001/12/14 18:00:02 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -37,10 +37,10 @@ grid::mode = periodic IO::outdir = "doubletoy_periodic" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates" @@ -48,6 +48,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par index b4a2b41a4..a33ae1913 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par,v 1.3 2001/04/23 08:10:20 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse.par,v 1.4 2001/12/14 18:00:03 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -37,10 +37,10 @@ grid::mode = periodic IO::outdir = "doubletoy_periodic_coarse" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates" @@ -48,6 +48,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 12 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par index 549747e1f..590dd1313 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par,v 1.4 2001/04/23 08:10:20 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl2.par,v 1.5 2001/12/14 18:00:03 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "doubletoy_periodic_coarse_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par index 5b529f7d2..cf5e0259d 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par,v 1.4 2001/04/23 08:10:20 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_coarse_rl3.par,v 1.5 2001/12/14 18:00:03 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 3 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "doubletoy_periodic_coarse_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par index cd0233846..6e47ad888 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par,v 1.4 2001/04/23 08:10:20 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl2.par,v 1.5 2001/12/14 18:00:03 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.1 grid::ymin = -6.9 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "doubletoy_periodic_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par index fcb06b511..d660ef8d3 100644 --- a/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par +++ b/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par,v 1.4 2001/04/23 08:10:20 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/doubletoy_periodic_rl3.par,v 1.5 2001/12/14 18:00:04 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 3 + grid::type = byrange grid::xmin = -5.1 grid::ymin = -6.9 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "doubletoy_periodic_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid IOFlexIO::out3D_every = 96 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par index 0bcc7a94e..b97015267 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par,v 1.4 2001/08/26 13:59:52 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par,v 1.5 2001/12/14 18:00:04 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReducd CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy HydroToy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -37,10 +37,10 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" @@ -48,6 +48,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par index b55dcbd75..226ff5480 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par,v 1.6 2001/08/26 13:59:53 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par,v 1.7 2001/12/14 18:00:04 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -37,10 +37,10 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_coarse" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" @@ -48,6 +48,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 12 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par index 45be9dba9..981dd8f11 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par,v 1.6 2001/08/26 13:59:54 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par,v 1.7 2001/12/14 18:00:04 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_coarse_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par index 5a15f3e71..32da59011 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par,v 1.7 2001/08/26 13:59:54 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par,v 1.8 2001/12/14 18:00:04 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 3 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_coarse_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par index 1114944af..c3c0135c8 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par,v 1.6 2001/08/26 13:59:55 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par,v 1.7 2001/12/14 18:00:04 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.1 grid::ymin = -6.9 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par index 8ccee9f95..630346ca2 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par,v 1.5 2001/08/26 13:59:56 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par,v 1.6 2001/12/14 18:00:04 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 3 + grid::type = byrange grid::xmin = -5.1 grid::ymin = -6.9 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" IOFlexIO::out3D_every = 96 IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse.par index f490ca031..12bd0ed42 100644 --- a/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse.par +++ b/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse.par,v 1.1 2001/12/03 17:38:41 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse.par,v 1.2 2001/12/14 18:00:05 schnetter Exp $ !DESC "DoubleToy with periodic boundaries, no refinement" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -30,10 +30,10 @@ grid::mode = periodic IO::outdir = "doubletoy_periodic_coarse" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates" diff --git a/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl2.par index fc08aed70..f40182b54 100644 --- a/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl2.par +++ b/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl2.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl2.par,v 1.1 2001/12/03 17:38:42 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl2.par,v 1.2 2001/12/14 18:00:05 schnetter Exp $ !DESC "DoubleToy with periodic boundaries, 1 refinement level" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -22,6 +22,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -34,10 +36,10 @@ grid::mode = periodic IO::outdir = "doubletoy_periodic_coarse_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates" diff --git a/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl3.par index 3765140d2..17546b766 100644 --- a/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl3.par +++ b/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl3.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl3.par,v 1.1 2001/12/03 17:38:42 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse_rl3.par,v 1.2 2001/12/14 18:00:05 schnetter Exp $ !DESC "DoubleToy with periodic boundaries, 2 refinement levels" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -22,6 +22,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -34,10 +36,10 @@ grid::mode = periodic IO::outdir = "doubletoy_periodic_coarse_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve hydrotoy::hydroevolve grid::coordinates" diff --git a/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse.par index 5a59ae836..988b4ba24 100644 --- a/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse.par +++ b/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse.par,v 1.1 2001/12/03 17:38:43 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse.par,v 1.2 2001/12/14 18:00:05 schnetter Exp $ !DESC "SpaceTimeToy with periodic boundaries, no refinement" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -30,10 +30,10 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_coarse" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" diff --git a/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl2.par index 490e8d4b3..65cd3a145 100644 --- a/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl2.par +++ b/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl2.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl2.par,v 1.1 2001/12/03 17:38:43 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl2.par,v 1.2 2001/12/14 18:00:06 schnetter Exp $ !DESC "SpaceTimeToy with periodic boundaries, 1 refinement level" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -22,6 +22,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -34,10 +36,10 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_coarse_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" diff --git a/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl3.par index f4c4d4ce1..65e787a27 100644 --- a/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl3.par +++ b/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl3.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl3.par,v 1.1 2001/12/03 17:38:44 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl3.par,v 1.2 2001/12/14 18:00:06 schnetter Exp $ !DESC "WaveToy with periodic boundaries, 2 refinement levels" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -22,6 +22,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -34,10 +36,10 @@ grid::mode = periodic IO::outdir = "spacetimetoy_periodic_coarse_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outinfo_vars = "spacetimetoy::spacetimeevolve" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par index be0cb3621..2dc0e8ef8 100644 --- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par +++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par,v 1.6 2001/03/30 00:50:49 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse.par,v 1.7 2001/12/14 18:00:07 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -37,10 +37,10 @@ grid::mode = periodic IO::outdir = "wavetoyf77_periodic_coarse" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "wavetoy::phi" +IOBasic::outinfo_vars = "wavetoy::phi" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "wavetoy::phi" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "wavetoy::phi" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" @@ -48,6 +48,7 @@ IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" IOFlexIO::out3D_every = 12 IOFlexIO::out3D_vars = "wavetoy::phi" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" WaveToyF77::bound = radiation diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par index 2f2f9181c..6a28f956b 100644 --- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par +++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par,v 1.9 2001/03/30 00:50:49 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl2.par,v 1.10 2001/12/14 18:00:07 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "wavetoyf77_periodic_coarse_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "wavetoy::phi" +IOBasic::outinfo_vars = "wavetoy::phi" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "wavetoy::phi" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "wavetoy::phi" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" IOFlexIO::out3D_every = 24 IOFlexIO::out3D_vars = "wavetoy::phi" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" WaveToyF77::bound = radiation diff --git a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par index 6d5d978f9..5e11bea6d 100644 --- a/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par +++ b/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par @@ -7,9 +7,9 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par,v 1.8 2001/03/30 00:50:49 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/par/wavetoyf77_periodic_coarse_rl3.par,v 1.9 2001/12/14 18:00:07 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetSlab IDScalarWave WaveToyF77" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -29,6 +29,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 3 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -41,10 +43,10 @@ grid::mode = periodic IO::outdir = "wavetoyf77_periodic_coarse_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "wavetoy::phi" +IOBasic::outinfo_vars = "wavetoy::phi" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "wavetoy::phi" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "wavetoy::phi" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" @@ -52,6 +54,7 @@ IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" IOFlexIO::out3D_every = 48 IOFlexIO::out3D_vars = "wavetoy::phi" IOFlexIO::out3D_format = IEEE +IOFlexIO::out3D_extension = ".amr" WaveToyF77::bound = radiation diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par index fd559492c..5860eb508 100644 --- a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par +++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par,v 1.3 2001/12/03 17:22:09 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse.par,v 1.4 2001/12/14 18:00:08 schnetter Exp $ !DESC "WaveToy with periodic boundaries, no refinement" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -30,10 +30,10 @@ grid::mode = periodic IO::outdir = "wavetoyf77_periodic_coarse" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "wavetoy::phi" +IOBasic::outinfo_vars = "wavetoy::phi" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "wavetoy::phi" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "wavetoy::phi" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par index 32a33264d..11589634f 100644 --- a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par +++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par,v 1.3 2001/12/03 17:22:09 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl2.par,v 1.4 2001/12/14 18:00:08 schnetter Exp $ !DESC "WaveToy with periodic boundaries, 1 refinement level" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -22,6 +22,8 @@ Carpet::max_refinement_levels = 2 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -34,10 +36,10 @@ grid::mode = periodic IO::outdir = "wavetoyf77_periodic_coarse_rl2" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "wavetoy::phi" +IOBasic::outinfo_vars = "wavetoy::phi" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "wavetoy::phi" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "wavetoy::phi" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" diff --git a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par index abc941b69..cb248f61f 100644 --- a/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par +++ b/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par,v 1.3 2001/12/03 17:22:09 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyF77/test/wavetoyf77_periodic_coarse_rl3.par,v 1.4 2001/12/14 18:00:08 schnetter Exp $ !DESC "WaveToy with periodic boundaries, 2 refinement levels" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetSlab IDScalarWave WaveToyF77" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDScalarWave WaveToyF77" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes @@ -22,6 +22,8 @@ Carpet::max_refinement_levels = 3 Carpet::prolongation_order_space= 3 Carpet::prolongation_order_time = 2 +CarpetRegrid::refinement_levels = 2 + grid::type = byrange grid::xmin = -5.4 grid::ymin = -7.2 @@ -34,10 +36,10 @@ grid::mode = periodic IO::outdir = "wavetoyf77_periodic_coarse_rl3" IOBasic::outinfo_every = 1 # 10 -#IOBasic::outinfo_vars = "wavetoy::phi" +IOBasic::outinfo_vars = "wavetoy::phi" -#IOBasic::outScalar_every = 2 -#IOBasic::outScalar_vars = "wavetoy::phi" +IOBasic::outScalar_every = 1 # 2 +IOBasic::outScalar_vars = "wavetoy::phi" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "wavetoy::phi grid::coordinates" -- cgit v1.2.3