diff options
Diffstat (limited to 'CarpetExtra/SpaceTimeToy')
25 files changed, 149 insertions, 131 deletions
diff --git a/CarpetExtra/SpaceTimeToy/interface.ccl b/CarpetExtra/SpaceTimeToy/interface.ccl index aadf4a350..3d91b639b 100644 --- a/CarpetExtra/SpaceTimeToy/interface.ccl +++ b/CarpetExtra/SpaceTimeToy/interface.ccl @@ -1,8 +1,15 @@ # Interface definition for thorn SpaceTimeToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/interface.ccl,v 1.5 2001/12/07 18:27:09 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/interface.ccl,v 1.6 2003/06/18 18:24:29 schnetter Exp $ implements: spacetimetoy -inherits: hydrotoy boundary grid +inherits: hydrotoy boundary driver grid + + + +CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER IN GH, \ + CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, \ + CCTK_STRING IN group_name, CCTK_STRING IN bc_name) +USES FUNCTION Boundary_SelectGroupForBC diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par index a69d8ea8a..f6cd458a7 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.7 2002/10/24 21:11:05 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic.par,v 1.8 2003/06/18 18:24:29 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReducd CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy HydroToy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -45,10 +45,10 @@ IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" -IOFlexIO::out3D_every = 24 -IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" -IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".vcamr" +#IOFlexIO::out3D_every = 24 +#IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" +#IOFlexIO::out3D_format = IEEE +#IOFlexIO::out3D_extension = ".vcamr" 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 12e017779..dbcabb184 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.9 2002/10/24 21:11:06 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse.par,v 1.10 2003/06/18 18:24:29 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -45,10 +45,10 @@ IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" -IOFlexIO::out3D_every = 12 -IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" -IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".vcamr" +#IOFlexIO::out3D_every = 12 +#IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" +#IOFlexIO::out3D_format = IEEE +#IOFlexIO::out3D_extension = ".vcamr" 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 9fc6be4d7..ed2f6bf8b 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.9 2002/10/24 21:11:06 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl2.par,v 1.10 2003/06/18 18:24:29 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -51,10 +51,10 @@ IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" -IOFlexIO::out3D_every = 24 -IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" -IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".vcamr" +#IOFlexIO::out3D_every = 24 +#IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" +#IOFlexIO::out3D_format = IEEE +#IOFlexIO::out3D_extension = ".vcamr" 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 84a1a725a..30ecdcf97 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.10 2002/10/24 21:11:06 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_coarse_rl3.par,v 1.11 2003/06/18 18:24:29 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -51,10 +51,10 @@ IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" -IOFlexIO::out3D_every = 48 -IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" -IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".vcamr" +#IOFlexIO::out3D_every = 48 +#IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" +#IOFlexIO::out3D_format = IEEE +#IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine.par index 9bd3fb198..4cfe64a4b 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine.par,v 1.2 2004/03/23 12:00:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine.par,v 1.1 2003/06/18 18:24:29 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy HydroToy" diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine_rl2.par index ca19dbbcc..b427b8d6d 100644 --- a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine_rl2.par +++ b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine_rl2.par @@ -7,7 +7,7 @@ # @enddesc # @@*/ # -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine_rl2.par,v 1.2 2004/03/23 12:00:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_fine_rl2.par,v 1.1 2003/06/18 18:24:29 schnetter Exp $ ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" diff --git a/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par b/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par index d256f4a26..dbbf89dd5 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.9 2002/10/24 21:11:06 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl2.par,v 1.10 2003/06/18 18:24:29 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -51,10 +51,10 @@ IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" -IOFlexIO::out3D_every = 48 -IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" -IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".vcamr" +#IOFlexIO::out3D_every = 48 +#IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" +#IOFlexIO::out3D_format = IEEE +#IOFlexIO::out3D_extension = ".vcamr" 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 7805e8cf8..a845e9765 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.8 2002/10/24 21:11:06 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/spacetimetoy_periodic_rl3.par,v 1.9 2003/06/18 18:24:29 schnetter Exp $ -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetIOFlexIO CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes @@ -51,10 +51,10 @@ IOBasic::outScalar_vars = "spacetimetoy::spacetimeevolve" IOASCII::out1D_every = 1 # 2 IOASCII::out1D_vars = "spacetimetoy::spacetimeevolve grid::coordinates" -IOFlexIO::out3D_every = 96 -IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" -IOFlexIO::out3D_format = IEEE -IOFlexIO::out3D_extension = ".vcamr" +#IOFlexIO::out3D_every = 96 +#IOFlexIO::out3D_vars = "spacetimetoy::spacetimeevolve" +#IOFlexIO::out3D_format = IEEE +#IOFlexIO::out3D_extension = ".vcamr" SpaceTimeToy::icn_iterations = 2 SpaceTimeToy::bound = radiation diff --git a/CarpetExtra/SpaceTimeToy/par/st1d.gnu b/CarpetExtra/SpaceTimeToy/par/st1d.gnu index 1c7eee34b..3a11278d9 100644 --- a/CarpetExtra/SpaceTimeToy/par/st1d.gnu +++ b/CarpetExtra/SpaceTimeToy/par/st1d.gnu @@ -1,24 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d.gnu,v 1.2 2003/06/30 17:28:51 schnetter Exp $ - -set grid - -dt=0.05 -f(x)=cos(2*pi*(x+t*dt)) - -t=200 - - -p [0:1] "st1d_1l_0020/phi.xl" i t u 10:13 w l, "st1d_1l_0040/phi.xl" i t u 10:13 w l, "st1d_1l_0080/phi.xl" i t u 10:13 w l, f(x) - -p [0:1] "st1d_1l_0020/phi.xl" i t u 10:($13-f($10)) w l, "st1d_1l_0040/phi.xl" i t u 10:(4*($13-f($10))) w l, "st1d_1l_0080/phi.xl" i t u 10:(16*($13-f($10))) w l - - - -p [0:1] "st1d_2l_0020/phi.xl" i 2*t u 10:13 w l, "st1d_2l_0040/phi.xl" i 2*t u 10:13 w l, "st1d_2l_0080/phi.xl" i 2*t u 10:13 w l, "st1d_2l_0160/phi.xl" i 2*t u 10:13 w l, "st1d_2l_0320/phi.xl" i 2*t u 10:13 w l, f(x) - -p [0:1] "st1d_2l_0020/phi.xl" i 2*t u 10:($13-f($10)) w l, "st1d_2l_0040/phi.xl" i 2*t u 10:(4*($13-f($10))) w l, "st1d_2l_0080/phi.xl" i 2*t u 10:(16*($13-f($10))) w l, "st1d_2l_0160/phi.xl" i 2*t u 10:(64*($13-f($10))) w l, "st1d_2l_0320/phi.xl" i 2*t u 10:(256*($13-f($10))) w l - - +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d.gnu,v 1.1 2003/06/18 18:24:29 schnetter Exp $ set grid diff --git a/CarpetExtra/SpaceTimeToy/par/st1d_1l_0020.par b/CarpetExtra/SpaceTimeToy/par/st1d_1l_0020.par index 96da55975..3102a06ce 100644 --- a/CarpetExtra/SpaceTimeToy/par/st1d_1l_0020.par +++ b/CarpetExtra/SpaceTimeToy/par/st1d_1l_0020.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_1l_0020.par,v 1.2 2004/03/23 12:00:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_1l_0020.par,v 1.1 2003/06/18 18:24:29 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 3200 diff --git a/CarpetExtra/SpaceTimeToy/par/st1d_1l_0040.par b/CarpetExtra/SpaceTimeToy/par/st1d_1l_0040.par index ca8d2fa85..d33fd27fe 100644 --- a/CarpetExtra/SpaceTimeToy/par/st1d_1l_0040.par +++ b/CarpetExtra/SpaceTimeToy/par/st1d_1l_0040.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_1l_0040.par,v 1.2 2004/03/23 12:00:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_1l_0040.par,v 1.1 2003/06/18 18:24:29 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 6400 diff --git a/CarpetExtra/SpaceTimeToy/par/st1d_1l_0080.par b/CarpetExtra/SpaceTimeToy/par/st1d_1l_0080.par index a2535989b..12150c5d5 100644 --- a/CarpetExtra/SpaceTimeToy/par/st1d_1l_0080.par +++ b/CarpetExtra/SpaceTimeToy/par/st1d_1l_0080.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_1l_0080.par,v 1.2 2004/03/23 12:00:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_1l_0080.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 12800 diff --git a/CarpetExtra/SpaceTimeToy/par/st1d_2l_0020.par b/CarpetExtra/SpaceTimeToy/par/st1d_2l_0020.par index 0d4263611..9f5388d92 100644 --- a/CarpetExtra/SpaceTimeToy/par/st1d_2l_0020.par +++ b/CarpetExtra/SpaceTimeToy/par/st1d_2l_0020.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_2l_0020.par,v 1.2 2004/03/23 12:00:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_2l_0020.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 3200 diff --git a/CarpetExtra/SpaceTimeToy/par/st1d_2l_0040.par b/CarpetExtra/SpaceTimeToy/par/st1d_2l_0040.par index 90261f6aa..9c4400c3d 100644 --- a/CarpetExtra/SpaceTimeToy/par/st1d_2l_0040.par +++ b/CarpetExtra/SpaceTimeToy/par/st1d_2l_0040.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_2l_0040.par,v 1.2 2004/03/23 12:00:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_2l_0040.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 6400 diff --git a/CarpetExtra/SpaceTimeToy/par/st1d_2l_0080.par b/CarpetExtra/SpaceTimeToy/par/st1d_2l_0080.par index ab4ff726c..f16a0f9a5 100644 --- a/CarpetExtra/SpaceTimeToy/par/st1d_2l_0080.par +++ b/CarpetExtra/SpaceTimeToy/par/st1d_2l_0080.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_2l_0080.par,v 1.2 2004/03/23 12:00:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_2l_0080.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 12800 diff --git a/CarpetExtra/SpaceTimeToy/par/st1d_2l_0160.par b/CarpetExtra/SpaceTimeToy/par/st1d_2l_0160.par index cb222029e..de72cf54c 100644 --- a/CarpetExtra/SpaceTimeToy/par/st1d_2l_0160.par +++ b/CarpetExtra/SpaceTimeToy/par/st1d_2l_0160.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_2l_0160.par,v 1.2 2004/03/23 12:00:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_2l_0160.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 25600 diff --git a/CarpetExtra/SpaceTimeToy/par/st1d_2l_0320.par b/CarpetExtra/SpaceTimeToy/par/st1d_2l_0320.par index 054046275..7c22efff2 100644 --- a/CarpetExtra/SpaceTimeToy/par/st1d_2l_0320.par +++ b/CarpetExtra/SpaceTimeToy/par/st1d_2l_0320.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_2l_0320.par,v 1.2 2004/03/23 12:00:15 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/par/st1d_2l_0320.par,v 1.1 2003/06/18 18:24:30 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 51200 diff --git a/CarpetExtra/SpaceTimeToy/param.ccl b/CarpetExtra/SpaceTimeToy/param.ccl index 0213a9f61..d129baa51 100644 --- a/CarpetExtra/SpaceTimeToy/param.ccl +++ b/CarpetExtra/SpaceTimeToy/param.ccl @@ -1,5 +1,5 @@ # Parameter definitions for thorn SpaceTimeToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/param.ccl,v 1.3 2001/08/26 13:59:49 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/param.ccl,v 1.4 2003/06/18 18:24:29 schnetter Exp $ shares: hydrotoy @@ -7,14 +7,10 @@ USES BOOLEAN hydrotoy_active private: -KEYWORD bound "Type of boundary condition to use" +STRING bound "Type of boundary condition to use" { - "none" :: "No boundary condition" - "flat" :: "Flat boundary condition" - "radiation" :: "Radiation boundary condition" - "robin" :: "Robin boundary condition" - "zero" :: "Zero boundary condition" -} "zero" + ".*" :: "Must be a registered boundary condition" +} "Static" CCTK_INT icn_iterations "Number of ICN iterations to take after the initial Euler step" { diff --git a/CarpetExtra/SpaceTimeToy/schedule.ccl b/CarpetExtra/SpaceTimeToy/schedule.ccl index 3b1230e77..e39f9a31d 100644 --- a/CarpetExtra/SpaceTimeToy/schedule.ccl +++ b/CarpetExtra/SpaceTimeToy/schedule.ccl @@ -1,5 +1,5 @@ # Schedule definitions for thorn SpaceTimeToy -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/schedule.ccl,v 1.5 2002/04/29 11:28:06 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/schedule.ccl,v 1.6 2003/06/18 18:24:29 schnetter Exp $ STORAGE: spacetimeevolve[3] STORAGE: icn_state @@ -28,16 +28,57 @@ schedule SpaceTimeToy_EulerStep at EVOL \ { LANG: Fortran STORAGE: spacetimetemps hydrotemps - SYNC: spacetimeevolve } "Initial Euler step" - -schedule SpaceTimeToy_ICNStep at EVOL \ + +schedule SpaceTimeToy_Boundaries at EVOL \ + after SpaceTimeToy_EulerStep +{ + LANG: Fortran + SYNC: spacetimeevolve +} "Select boundary conditions after initial Euler step" + +schedule GROUP ApplyBCs at EVOL \ + after SpaceTimeToy_Boundaries +{ +} "Apply boundary conditions after initial Euler step" + + + +schedule GROUP SpaceTimeToy_ICNLoop at EVOL \ after SpaceTimeToy_EulerStep \ after HydroToy_EulerPredictor \ before HydroToy_EulerCorrector \ while SpaceTimeToy::do_iterate { +} "All ICN steps" + +schedule SpaceTimeToy_ICNStep in SpaceTimeToy_ICNLoop +{ LANG: Fortran STORAGE: spacetimetemps hydrotemps - SYNC: spacetimeevolve } "One ICN step" + +schedule SpaceTimeToy_Boundaries in SpaceTimeToy_ICNLoop \ + after SpaceTimeToy_ICNStep +{ + LANG: Fortran + SYNC: spacetimeevolve +} "Select boundary conditions after ICN step" + +schedule GROUP ApplyBCs in SpaceTimeToy_ICNLoop \ + after SpaceTimeToy_Boundaries +{ +} "Apply boundary conditions after ICN step" + + + +schedule SpaceTimeToy_Boundaries in POSTRESTRICT +{ + LANG: Fortran + SYNC: spacetimeevolve +} "Select boundary conditions after restricting" + +schedule GROUP ApplyBCs in POSTRESTRICT \ + after SpaceTimeToy_Boundaries +{ +} "Apply boundary conditions after restricting" diff --git a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 index 304837390..c1f3f4b0b 100644 --- a/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 +++ b/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77 @@ -1,9 +1,10 @@ c -*-Fortran-*- -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.9 2001/08/26 13:59:58 schnetter Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/src/SpaceTimeToy.F77,v 1.10 2003/06/18 18:24:30 schnetter Exp $ -#include "cctk.h" -#include "cctk_Parameters.h" +#include "cctk.h" +#include "cctk_Faces.h" #include "cctk_Arguments.h" +#include "cctk_Parameters.h" @@ -64,9 +65,6 @@ c Copy c Evolve call SpaceTimeToy_Step (CCTK_PASS_FTOF) -c Apply boundaries - call SpaceTimeToy_Boundaries (CCTK_PASS_FTOF) - c Initialise ICN iterations icn_iteration = 0 do_iterate = 1 @@ -138,9 +136,6 @@ c Average c Evolve call SpaceTimeToy_Step (CCTK_PASS_FTOF) -c Apply boundaries - call SpaceTimeToy_Boundaries (CCTK_PASS_FTOF) - c Step ICN iterations icn_iteration = icn_iteration + 1 if (icn_iteration .eq. icn_iterations) then @@ -200,45 +195,44 @@ c Evolve DECLARE_CCTK_FUNCTIONS DECLARE_CCTK_PARAMETERS - CCTK_REAL zero, one - parameter (zero=0, one=1) + character fbound*1000 + CCTK_INT fboundlen - CCTK_REAL finf - parameter (finf=1) - integer npow - parameter (npow=1) + integer options - integer sw(3) + CCTK_INT boundary_width + CCTK_INT options1 + + integer d integer ierr - sw(1) = cctk_nghostzones(1) - sw(2) = cctk_nghostzones(2) - sw(3) = cctk_nghostzones(3) - -c Apply boundary condition - if (CCTK_EQUALS(bound, "flat")) then - call BndFlatGN (ierr, cctkGH, sw, "spacetimetoy::spacetimeevolve") - else if (CCTK_EQUALS(bound, "zero")) then - call BndScalarGN (ierr, cctkGH, sw, zero, - $ "spacetimetoy::spacetimeevolve") - else if (CCTK_EQUALS(bound, "radiation")) then - call BndRadiativeGN (ierr, cctkGH, sw, zero, one, - $ "spacetimetoy::spacetimeevolve", "spacetimetoy::spacetimeevolve") - else if (CCTK_EQUALS(bound, "robin")) then - call BndRobinGN (ierr, cctkGH, sw, finf, npow, - $ "spacetimetoy::spacetimeevolve") - else if (CCTK_EQUALS(bound, "none")) then - ierr = 0 - else - call CCTK_WARN (0, "internal error") - end if - if (ierr .lt. 0) then - call CCTK_WARN (0, "Error while applying boundary condition") + external Boundary_SelectGroupForBC + CCTK_INT Boundary_SelectGroupForBC + + boundary_width = cctk_nghostzones(1) + do d=1,3 + if (cctk_nghostzones(d) .ne. boundary_width) then + call CCTK_WARN (0, "internal error") + end if + end do + + call Util_TableCreateFromString (options, "") + if (options .lt. 0) call CCTK_WARN (0, "internal error") + + call CCTK_FortranString (fboundlen, bound, fbound) + + options1 = options + ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, boundary_width, options1, "spacetimetoy::spacetimeevolve", fbound) + if (ierr .lt. 0) then + call CCTK_WARN (0, "Error while selecting boundary condition") end if + call Util_TableDestroy (ierr, options) + if (ierr .lt. 0) call CCTK_WARN (0, "internal error") + call Cart3dSymGN (ierr, cctkGH, "spacetimetoy::spacetimeevolve") - if (ierr .lt. 0) then + if (ierr .lt. 0) then call CCTK_WARN (0, "Error while applying symmetry condition") end if - + end diff --git a/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse.par index e20b1db74..ad8212fed 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.3 2002/10/24 21:11:06 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/doubletoy_periodic_coarse.par,v 1.4 2003/06/18 18:24:30 schnetter Exp $ !DESC "DoubleToy with periodic boundaries, no refinement" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy IDHydroToy HydroToy" Carpet::poison_new_timelevels = yes Carpet::check_for_poison = yes diff --git a/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse.par b/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse.par index 881a8caeb..2def19864 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.3 2002/10/24 21:11:07 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse.par,v 1.4 2003/06/18 18:24:30 schnetter Exp $ !DESC "SpaceTimeToy with periodic boundaries, no refinement" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes diff --git a/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl2.par b/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl2.par index 1094894d3..bb9308218 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.3 2002/10/24 21:11:07 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl2.par,v 1.4 2003/06/18 18:24:30 schnetter Exp $ !DESC "SpaceTimeToy with periodic boundaries, 1 refinement level" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes diff --git a/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl3.par b/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl3.par index 6f4162589..c84f00c0d 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.3 2002/10/24 21:11:07 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/SpaceTimeToy/test/spacetimetoy_periodic_coarse_rl3.par,v 1.4 2003/06/18 18:24:30 schnetter Exp $ !DESC "WaveToy with periodic boundaries, 2 refinement levels" -ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" +ActiveThorns = "Boundary IOBasic IOUtil Time Cart3d Slab Carpet CarpetIOASCII CarpetLib CarpetReduce CarpetRegrid CarpetSlab IDSpaceTimeToy SpaceTimeToy Hydrotoy" Carpet::poison_new_timelevels = yes #Carpet::check_for_poison = yes |