aboutsummaryrefslogtreecommitdiff
path: root/CarpetExtra/WaveToyMoL
diff options
context:
space:
mode:
Diffstat (limited to 'CarpetExtra/WaveToyMoL')
-rw-r--r--CarpetExtra/WaveToyMoL/interface.ccl15
-rw-r--r--CarpetExtra/WaveToyMoL/par/sw1d.gnu24
-rw-r--r--CarpetExtra/WaveToyMoL/par/sw1d_1l_0020.par30
-rw-r--r--CarpetExtra/WaveToyMoL/par/sw1d_1l_0040.par32
-rw-r--r--CarpetExtra/WaveToyMoL/par/sw1d_1l_0080.par32
-rw-r--r--CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par34
-rw-r--r--CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par38
-rw-r--r--CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par34
-rw-r--r--CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par34
-rw-r--r--CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par34
-rw-r--r--CarpetExtra/WaveToyMoL/param.ccl6
-rw-r--r--CarpetExtra/WaveToyMoL/schedule.ccl40
-rw-r--r--CarpetExtra/WaveToyMoL/src/boundaries.F778
-rw-r--r--CarpetExtra/WaveToyMoL/src/calcrhs.F7724
-rw-r--r--CarpetExtra/WaveToyMoL/src/initsymbound.F775
-rw-r--r--CarpetExtra/WaveToyMoL/src/make.code.defn4
-rw-r--r--CarpetExtra/WaveToyMoL/src/registervars.F775
-rw-r--r--CarpetExtra/WaveToyMoL/src/startup.F773
18 files changed, 183 insertions, 219 deletions
diff --git a/CarpetExtra/WaveToyMoL/interface.ccl b/CarpetExtra/WaveToyMoL/interface.ccl
index 65e4cb5a0..4cf1fea82 100644
--- a/CarpetExtra/WaveToyMoL/interface.ccl
+++ b/CarpetExtra/WaveToyMoL/interface.ccl
@@ -1,24 +1,24 @@
# Interface definition for thorn WaveToyMoL
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/interface.ccl,v 1.4 2004/05/21 17:43:57 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/interface.ccl,v 1.1 2003/06/18 18:24:30 schnetter Exp $
IMPLEMENTS: WaveToyMoL
-INHERITS: grid
+INHERITS: boundary grid MethodOfLines
-CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST IN GH, \
+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)
-REQUIRES FUNCTION Boundary_SelectGroupForBC
+USES FUNCTION Boundary_SelectGroupForBC
CCTK_INT FUNCTION MoLRegisterEvolvedGroup(CCTK_INT IN EvolvedIndex, \
CCTK_INT IN RHSIndex)
-REQUIRES FUNCTION MoLRegisterEvolvedGroup
+USES FUNCTION MoLRegisterEvolvedGroup
@@ -35,8 +35,3 @@ CCTK_REAL scalarevolvedot TYPE=gf
{
phidot psidot
} "Time derivative of the scalar field"
-
-CCTK_REAL scalarevolveerrorestimate TYPE=gf
-{
- error
-} "Error estimate"
diff --git a/CarpetExtra/WaveToyMoL/par/sw1d.gnu b/CarpetExtra/WaveToyMoL/par/sw1d.gnu
index 834756543..ab708d483 100644
--- a/CarpetExtra/WaveToyMoL/par/sw1d.gnu
+++ b/CarpetExtra/WaveToyMoL/par/sw1d.gnu
@@ -1,26 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d.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] "sw1d_1l_0020/phi.xl" i t u 10:13 w l, "sw1d_1l_0040/phi.xl" i t u 10:13 w l, "sw1d_1l_0080/phi.xl" i t u 10:13 w l, f(x)
-
-p [0:1] "sw1d_1l_0020/phi.xl" i t u 10:($13-f($10)) w l, "sw1d_1l_0040/phi.xl" i t u 10:(4*($13-f($10))) w l, "sw1d_1l_0080/phi.xl" i t u 10:(16*($13-f($10))) w l
-
-
-
-p [0:1] "sw1d_2l_0020/phi.xl" i 2*t u 10:13 w l, "sw1d_2l_0040/phi.xl" i 2*t u 10:13 w l, "sw1d_2l_0080/phi.xl" i 2*t u 10:13 w l, "sw1d_2l_0160/phi.xl" i 2*t u 10:13 w l, "sw1d_2l_0320/phi.xl" i 2*t u 10:13 w l, f(x)
-
-p [0:1] "sw1d_2l_0020/phi.xl" i 2*t u 10:($13-f($10)) w l, "sw1d_2l_0040/phi.xl" i 2*t u 10:(4*($13-f($10))) w l, "sw1d_2l_0080/phi.xl" i 2*t u 10:(16*($13-f($10))) w l, "sw1d_2l_0160/phi.xl" i 2*t u 10:(64*($13-f($10))) w l, "sw1d_2l_0320/phi.xl" i 2*t u 10:(256*($13-f($10))) w l
-
-
-
-
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d.gnu,v 1.1 2003/06/18 18:24:31 schnetter Exp $
set grid
diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_1l_0020.par b/CarpetExtra/WaveToyMoL/par/sw1d_1l_0020.par
index 7cd2fb167..3fcee519c 100644
--- a/CarpetExtra/WaveToyMoL/par/sw1d_1l_0020.par
+++ b/CarpetExtra/WaveToyMoL/par/sw1d_1l_0020.par
@@ -1,15 +1,23 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_1l_0020.par,v 1.4 2004/07/07 16:15:31 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_1l_0020.par,v 1.1 2003/06/18 18:24:31 schnetter Exp $
Cactus::cctk_initial_time = 0
Cactus::cctk_itlast = 3200
-ActiveThorns = "IOUtil Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
+ActiveThorns = "LocalInterp NaNChecker Slab"
+
+NaNChecker::check_every = 32
+NaNChecker::check_vars = "all"
+NaNChecker::action_if_found = terminate
+
+
+
+ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
driver::global_nx = 24
-driver::global_ny = 5
-driver::global_nz = 5
+driver::global_ny = 7
+driver::global_nz = 7
driver::ghost_size = 2
#Carpet::verbose = yes
@@ -24,20 +32,12 @@ Carpet::init_each_timelevel = yes
CarpetRegrid::refinement_levels = 1
CarpetRegrid::refined_regions = manual-gridpoint-list
-CarpetRegrid::gridpoints = "[[ ([28,4,4]:[68,12,12]:[2,2,2]) ]]"
+CarpetRegrid::gridpoints = "[[ ([28,6,6]:[68,16,16]:[2,2,2]) ]]"
CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]"
-ActiveThorns = "LocalInterp NaNChecker Slab"
-
-NaNChecker::check_every = 16
-NaNChecker::check_vars = "all"
-NaNChecker::action_if_found = terminate
-
-
-
-ActiveThorns = "Boundary CoordBase SymBase CartGrid3D Periodic"
+ActiveThorns = "Boundary CartGrid3D Periodic"
grid::domain = full
grid::type = byrange
@@ -77,7 +77,7 @@ IDScalarWaveMoL::wave_number[0] = 1.0
-ActiveThorns = "IOBasic CarpetIOASCII"
+ActiveThorns = "IOUtil IOBasic CarpetIOASCII"
IO::out_dir = "sw1d_1l_0020"
diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_1l_0040.par b/CarpetExtra/WaveToyMoL/par/sw1d_1l_0040.par
index 9c9f93248..aa73052ce 100644
--- a/CarpetExtra/WaveToyMoL/par/sw1d_1l_0040.par
+++ b/CarpetExtra/WaveToyMoL/par/sw1d_1l_0040.par
@@ -1,11 +1,19 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_1l_0040.par,v 1.4 2004/07/07 16:15:31 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_1l_0040.par,v 1.1 2003/06/18 18:24:31 schnetter Exp $
Cactus::cctk_initial_time = 0
Cactus::cctk_itlast = 6400
-ActiveThorns = "IOUtil Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
+ActiveThorns = "LocalInterp NaNChecker Slab"
+
+NaNChecker::check_every = 64
+NaNChecker::check_vars = "all"
+NaNChecker::action_if_found = terminate
+
+
+
+ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
driver::global_nx = 44
driver::global_ny = 5
@@ -29,15 +37,7 @@ CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]"
-ActiveThorns = "LocalInterp NaNChecker Slab"
-
-NaNChecker::check_every = 32
-NaNChecker::check_vars = "all"
-NaNChecker::action_if_found = terminate
-
-
-
-ActiveThorns = "Boundary CoordBase SymBase CartGrid3D Periodic"
+ActiveThorns = "Boundary CartGrid3D Periodic"
grid::domain = full
grid::type = byrange
@@ -77,23 +77,23 @@ IDScalarWaveMoL::wave_number[0] = 1.0
-ActiveThorns = "IOBasic CarpetIOASCII"
+ActiveThorns = "IOUtil IOBasic CarpetIOASCII"
IO::out_dir = "sw1d_1l_0040"
-IOBasic::outInfo_every = 32
+IOBasic::outInfo_every = 64
IOBasic::outInfo_vars = "WaveToyMoL::phi IDScalarWaveMoL::phierror"
-IOBasic::outScalar_every = 32
+IOBasic::outScalar_every = 64
IOBasic::outScalar_reductions = "minimum maximum norm1 norm2 norm_inf"
IOBasic::outScalar_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
#IOASCII::output_all_timelevels = yes
-IOASCII::out1D_every = 32
+IOASCII::out1D_every = 64
IO::out_yline_x = 0.5
IO::out_zline_x = 0.5
IOASCII::out1D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
-#IOASCII::out3D_every = 32
+#IOASCII::out3D_every = 64
#IOASCII::out3D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_1l_0080.par b/CarpetExtra/WaveToyMoL/par/sw1d_1l_0080.par
index c8a040c7c..62164e592 100644
--- a/CarpetExtra/WaveToyMoL/par/sw1d_1l_0080.par
+++ b/CarpetExtra/WaveToyMoL/par/sw1d_1l_0080.par
@@ -1,11 +1,19 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_1l_0080.par,v 1.4 2004/07/07 16:15:31 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_1l_0080.par,v 1.1 2003/06/18 18:24:31 schnetter Exp $
Cactus::cctk_initial_time = 0
Cactus::cctk_itlast = 12800
-ActiveThorns = "IOUtil Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
+ActiveThorns = "LocalInterp NaNChecker Slab"
+
+NaNChecker::check_every = 128
+NaNChecker::check_vars = "all"
+NaNChecker::action_if_found = terminate
+
+
+
+ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
driver::global_nx = 84
driver::global_ny = 5
@@ -29,15 +37,7 @@ CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]"
-ActiveThorns = "LocalInterp NaNChecker Slab"
-
-NaNChecker::check_every = 64
-NaNChecker::check_vars = "all"
-NaNChecker::action_if_found = terminate
-
-
-
-ActiveThorns = "Boundary CoordBase SymBase CartGrid3D Periodic"
+ActiveThorns = "Boundary CartGrid3D Periodic"
grid::domain = full
grid::type = byrange
@@ -77,23 +77,23 @@ IDScalarWaveMoL::wave_number[0] = 1.0
-ActiveThorns = "IOBasic CarpetIOASCII"
+ActiveThorns = "IOUtil IOBasic CarpetIOASCII"
IO::out_dir = "sw1d_1l_0080"
-IOBasic::outInfo_every = 64
+IOBasic::outInfo_every = 128
IOBasic::outInfo_vars = "WaveToyMoL::phi IDScalarWaveMoL::phierror"
-IOBasic::outScalar_every = 64
+IOBasic::outScalar_every = 128
IOBasic::outScalar_reductions = "minimum maximum norm1 norm2 norm_inf"
IOBasic::outScalar_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
#IOASCII::output_all_timelevels = yes
-IOASCII::out1D_every = 64
+IOASCII::out1D_every = 128
IO::out_yline_x = 0.5
IO::out_zline_x = 0.5
IOASCII::out1D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
-#IOASCII::out3D_every = 64
+#IOASCII::out3D_every = 128
#IOASCII::out3D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par
index 13f2de3ee..def16c101 100644
--- a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par
+++ b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par
@@ -1,11 +1,19 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par,v 1.5 2004/07/07 16:15:31 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par,v 1.1 2003/06/18 18:24:31 schnetter Exp $
Cactus::cctk_initial_time = 0
Cactus::cctk_itlast = 3200
-ActiveThorns = "IOUtil Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
+ActiveThorns = "LocalInterp NaNChecker Slab"
+
+NaNChecker::check_every = 32
+NaNChecker::check_vars = "all"
+NaNChecker::action_if_found = terminate
+
+
+
+ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
driver::global_nx = 24
driver::global_ny = 5
@@ -24,20 +32,12 @@ Carpet::init_each_timelevel = yes
CarpetRegrid::refinement_levels = 2
CarpetRegrid::refined_regions = manual-gridpoint-list
-CarpetRegrid::gridpoints = "[[ ([30,4,4]:[66,12,12]:[2,2,2]) ]]"
+CarpetRegrid::gridpoints = "[[ ([28,4,4]:[68,12,12]:[2,2,2]) ]]"
CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]"
-ActiveThorns = "LocalInterp NaNChecker Slab"
-
-NaNChecker::check_every = 16
-NaNChecker::check_vars = "all"
-NaNChecker::action_if_found = terminate
-
-
-
-ActiveThorns = "Boundary CoordBase SymBase CartGrid3D Periodic"
+ActiveThorns = "Boundary CartGrid3D Periodic"
grid::domain = full
grid::type = byrange
@@ -77,23 +77,23 @@ IDScalarWaveMoL::wave_number[0] = 1.0
-ActiveThorns = "IOBasic CarpetIOASCII"
+ActiveThorns = "IOUtil IOBasic CarpetIOASCII"
IO::out_dir = "sw1d_2l_0020"
-IOBasic::outInfo_every = 16
+IOBasic::outInfo_every = 32
IOBasic::outInfo_vars = "WaveToyMoL::phi IDScalarWaveMoL::phierror"
-IOBasic::outScalar_every = 16
+IOBasic::outScalar_every = 32
IOBasic::outScalar_reductions = "minimum maximum norm1 norm2 norm_inf"
IOBasic::outScalar_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
#IOASCII::output_all_timelevels = yes
-IOASCII::out1D_every = 16
+IOASCII::out1D_every = 32
IO::out_yline_x = 0.5
IO::out_zline_x = 0.5
IOASCII::out1D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
-#IOASCII::out3D_every = 16
+#IOASCII::out3D_every = 32
#IOASCII::out3D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par
index 5f215164d..ddd962a72 100644
--- a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par
+++ b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par
@@ -1,11 +1,19 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par,v 1.6 2004/07/07 16:15:31 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par,v 1.1 2003/06/18 18:24:31 schnetter Exp $
Cactus::cctk_initial_time = 0
Cactus::cctk_itlast = 6400
-ActiveThorns = "IOUtil Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
+ActiveThorns = "LocalInterp NaNChecker Slab"
+
+NaNChecker::check_every = 64
+NaNChecker::check_vars = "all"
+NaNChecker::action_if_found = terminate
+
+
+
+ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
driver::global_nx = 44
driver::global_ny = 5
@@ -24,21 +32,11 @@ Carpet::init_each_timelevel = yes
CarpetRegrid::refinement_levels = 2
CarpetRegrid::refined_regions = manual-gridpoint-list
-CarpetRegrid::gridpoints = "[[ ([50,4,4]:[126,12,12]:[2,2,2]) ]]"
+CarpetRegrid::gridpoints = "[[ ([48,4,4]:[128,12,12]:[2,2,2]) ]]"
CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]"
-ActiveThorns = "CoordBase LocalInterp Slab SymBase"
-
-ActiveThorns = "NaNChecker"
-
-NaNChecker::check_every = 32
-NaNChecker::check_vars = "all"
-NaNChecker::action_if_found = terminate
-
-
-
ActiveThorns = "Boundary CartGrid3D Periodic"
grid::domain = full
@@ -72,28 +70,30 @@ IDScalarWaveMoL::wave_number[0] = 1.0
#ActiveThorns = "Dissipation"
-
+#
+#Dissipation::epsdis = 0.1
+#Dissipation::timelevel = "n+1"
#Dissipation::vars = "WaveToyMoL::scalarevolve"
-ActiveThorns = "IOBasic CarpetIOASCII"
+ActiveThorns = "IOUtil IOBasic CarpetIOASCII"
IO::out_dir = "sw1d_2l_0040"
-IOBasic::outInfo_every = 32
+IOBasic::outInfo_every = 64
IOBasic::outInfo_vars = "WaveToyMoL::phi IDScalarWaveMoL::phierror"
-IOBasic::outScalar_every = 32
+IOBasic::outScalar_every = 64
IOBasic::outScalar_reductions = "minimum maximum norm1 norm2 norm_inf"
IOBasic::outScalar_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
#IOASCII::output_all_timelevels = yes
-IOASCII::out1D_every = 32
+IOASCII::out1D_every = 64
IO::out_yline_x = 0.5
IO::out_zline_x = 0.5
IOASCII::out1D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
-#IOASCII::out3D_every = 32
+#IOASCII::out3D_every = 64
#IOASCII::out3D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par
index 5bfcdf1cc..a5ea971e1 100644
--- a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par
+++ b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par
@@ -1,11 +1,19 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par,v 1.5 2004/07/07 16:15:31 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par,v 1.1 2003/06/18 18:24:31 schnetter Exp $
Cactus::cctk_initial_time = 0
Cactus::cctk_itlast = 12800
-ActiveThorns = "IOUtil Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
+ActiveThorns = "LocalInterp NaNChecker Slab"
+
+NaNChecker::check_every = 128
+NaNChecker::check_vars = "all"
+NaNChecker::action_if_found = terminate
+
+
+
+ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
driver::global_nx = 84
driver::global_ny = 5
@@ -24,20 +32,12 @@ Carpet::init_each_timelevel = yes
CarpetRegrid::refinement_levels = 2
CarpetRegrid::refined_regions = manual-gridpoint-list
-CarpetRegrid::gridpoints = "[[ ([90,4,4]:[246,12,12]:[2,2,2]) ]]"
+CarpetRegrid::gridpoints = "[[ ([88,4,4]:[248,12,12]:[2,2,2]) ]]"
CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]"
-ActiveThorns = "LocalInterp NaNChecker Slab"
-
-NaNChecker::check_every = 64
-NaNChecker::check_vars = "all"
-NaNChecker::action_if_found = terminate
-
-
-
-ActiveThorns = "Boundary CoordBase SymBase CartGrid3D Periodic"
+ActiveThorns = "Boundary CartGrid3D Periodic"
grid::domain = full
grid::type = byrange
@@ -77,23 +77,23 @@ IDScalarWaveMoL::wave_number[0] = 1.0
-ActiveThorns = "IOBasic CarpetIOASCII"
+ActiveThorns = "IOUtil IOBasic CarpetIOASCII"
IO::out_dir = "sw1d_2l_0080"
-IOBasic::outInfo_every = 64
+IOBasic::outInfo_every = 128
IOBasic::outInfo_vars = "WaveToyMoL::phi IDScalarWaveMoL::phierror"
-IOBasic::outScalar_every = 64
+IOBasic::outScalar_every = 128
IOBasic::outScalar_reductions = "minimum maximum norm1 norm2 norm_inf"
IOBasic::outScalar_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
#IOASCII::output_all_timelevels = yes
-IOASCII::out1D_every = 64
+IOASCII::out1D_every = 128
IO::out_yline_x = 0.5
IO::out_zline_x = 0.5
IOASCII::out1D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
-#IOASCII::out3D_every = 64
+#IOASCII::out3D_every = 128
#IOASCII::out3D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par
index c47ead004..3ce5d2885 100644
--- a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par
+++ b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par
@@ -1,11 +1,19 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par,v 1.5 2004/07/07 16:15:31 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par,v 1.1 2003/06/18 18:24:31 schnetter Exp $
Cactus::cctk_initial_time = 0
Cactus::cctk_itlast = 25600
-ActiveThorns = "IOUtil Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
+ActiveThorns = "LocalInterp NaNChecker Slab"
+
+NaNChecker::check_every = 256
+NaNChecker::check_vars = "all"
+NaNChecker::action_if_found = terminate
+
+
+
+ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
driver::global_nx = 164
driver::global_ny = 5
@@ -24,20 +32,12 @@ Carpet::init_each_timelevel = yes
CarpetRegrid::refinement_levels = 2
CarpetRegrid::refined_regions = manual-gridpoint-list
-CarpetRegrid::gridpoints = "[[ ([170,4,4]:[486,12,12]:[2,2,2]) ]]"
+CarpetRegrid::gridpoints = "[[ ([168,4,4]:[488,12,12]:[2,2,2]) ]]"
CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]"
-ActiveThorns = "LocalInterp NaNChecker Slab"
-
-NaNChecker::check_every = 128
-NaNChecker::check_vars = "all"
-NaNChecker::action_if_found = terminate
-
-
-
-ActiveThorns = "Boundary CoordBase SymBase CartGrid3D Periodic"
+ActiveThorns = "Boundary CartGrid3D Periodic"
grid::domain = full
grid::type = byrange
@@ -77,23 +77,23 @@ IDScalarWaveMoL::wave_number[0] = 1.0
-ActiveThorns = "IOBasic CarpetIOASCII"
+ActiveThorns = "IOUtil IOBasic CarpetIOASCII"
IO::out_dir = "sw1d_2l_0160"
-IOBasic::outInfo_every = 128
+IOBasic::outInfo_every = 256
IOBasic::outInfo_vars = "WaveToyMoL::phi IDScalarWaveMoL::phierror"
-IOBasic::outScalar_every = 128
+IOBasic::outScalar_every = 256
IOBasic::outScalar_reductions = "minimum maximum norm1 norm2 norm_inf"
IOBasic::outScalar_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
#IOASCII::output_all_timelevels = yes
-IOASCII::out1D_every = 128
+IOASCII::out1D_every = 256
IO::out_yline_x = 0.5
IO::out_zline_x = 0.5
IOASCII::out1D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
-#IOASCII::out3D_every = 128
+#IOASCII::out3D_every = 256
#IOASCII::out3D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par
index 4836c42b9..fefe6be21 100644
--- a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par
+++ b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par
@@ -1,11 +1,19 @@
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par,v 1.5 2004/07/07 16:15:31 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par,v 1.1 2003/06/18 18:24:31 schnetter Exp $
Cactus::cctk_initial_time = 0
Cactus::cctk_itlast = 51200
-ActiveThorns = "IOUtil Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
+ActiveThorns = "LocalInterp NaNChecker Slab"
+
+NaNChecker::check_every = 512
+NaNChecker::check_vars = "all"
+NaNChecker::action_if_found = terminate
+
+
+
+ActiveThorns = "Carpet CarpetLib CarpetRegrid CarpetInterp CarpetReduce CarpetSlab"
driver::global_nx = 324
driver::global_ny = 5
@@ -24,20 +32,12 @@ Carpet::init_each_timelevel = yes
CarpetRegrid::refinement_levels = 2
CarpetRegrid::refined_regions = manual-gridpoint-list
-CarpetRegrid::gridpoints = "[[ ([330,4,4]:[966,12,12]:[2,2,2]) ]]"
+CarpetRegrid::gridpoints = "[[ ([328,4,4]:[968,12,12]:[2,2,2]) ]]"
CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]"
-ActiveThorns = "LocalInterp NaNChecker Slab"
-
-NaNChecker::check_every = 256
-NaNChecker::check_vars = "all"
-NaNChecker::action_if_found = terminate
-
-
-
-ActiveThorns = "Boundary CoordBase SymBase CartGrid3D Periodic"
+ActiveThorns = "Boundary CartGrid3D Periodic"
grid::domain = full
grid::type = byrange
@@ -77,23 +77,23 @@ IDScalarWaveMoL::wave_number[0] = 1.0
-ActiveThorns = "IOBasic CarpetIOASCII"
+ActiveThorns = "IOUtil IOBasic CarpetIOASCII"
IO::out_dir = "sw1d_2l_0320"
-IOBasic::outInfo_every = 256
+IOBasic::outInfo_every = 512
IOBasic::outInfo_vars = "WaveToyMoL::phi IDScalarWaveMoL::phierror"
-IOBasic::outScalar_every = 256
+IOBasic::outScalar_every = 512
IOBasic::outScalar_reductions = "minimum maximum norm1 norm2 norm_inf"
IOBasic::outScalar_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
#IOASCII::output_all_timelevels = yes
-IOASCII::out1D_every = 256
+IOASCII::out1D_every = 512
IO::out_yline_x = 0.5
IO::out_zline_x = 0.5
IOASCII::out1D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
-#IOASCII::out3D_every = 256
+#IOASCII::out3D_every = 512
#IOASCII::out3D_vars = "WaveToyMoL::scalarevolve IDScalarWaveMoL::scalarevolveerror"
diff --git a/CarpetExtra/WaveToyMoL/param.ccl b/CarpetExtra/WaveToyMoL/param.ccl
index 37879c4d8..f4c10772a 100644
--- a/CarpetExtra/WaveToyMoL/param.ccl
+++ b/CarpetExtra/WaveToyMoL/param.ccl
@@ -1,5 +1,5 @@
# Parameter definitions for thorn WaveToyMoL
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/param.ccl,v 1.2 2004/04/07 17:08:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/param.ccl,v 1.1 2003/06/18 18:24:30 schnetter Exp $
SHARES: MethodOfLines
@@ -18,7 +18,3 @@ STRING bound "Type of boundary condition to use"
{
.* :: "must be a registered boundary condition"
} "None"
-
-BOOLEAN estimate_error "Estimate the truncation error"
-{
-} "no"
diff --git a/CarpetExtra/WaveToyMoL/schedule.ccl b/CarpetExtra/WaveToyMoL/schedule.ccl
index ffce79084..92eae59c1 100644
--- a/CarpetExtra/WaveToyMoL/schedule.ccl
+++ b/CarpetExtra/WaveToyMoL/schedule.ccl
@@ -1,31 +1,26 @@
# Schedule definitions for thorn WaveToyMoL
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/schedule.ccl,v 1.5 2004/04/07 17:08:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/schedule.ccl,v 1.1 2003/06/18 18:24:30 schnetter Exp $
STORAGE: scalarevolve[3]
STORAGE: scalarevolvedot
-if (estimate_error) {
- STORAGE: scalarevolveerrorestimate
-}
-
SCHEDULE WaveToyMol_Startup AT startup
{
LANG: Fortran
- OPTIONS: meta
} "Register banner"
SCHEDULE WaveToyMoL_InitSymBound AT basegrid
{
LANG: Fortran
- OPTIONS: meta
+ OPTIONS: global
} "Schedule symmetries"
SCHEDULE WaveToyMoL_RegisterVars IN MoL_Register
{
LANG: Fortran
- OPTIONS: meta
+ OPTIONS: global
} "Register variables for MoL"
@@ -38,7 +33,6 @@ SCHEDULE WaveToyMoL_CalcRHS IN MoL_CalcRHS
SCHEDULE WaveToyMoL_Boundaries IN MoL_PostStep
{
LANG: Fortran
- OPTIONS: level
SYNC: scalarevolve
} "Select boundary conditions in MoL"
@@ -48,22 +42,12 @@ SCHEDULE GROUP ApplyBCs IN MoL_PostStep AFTER WaveToyMoL_Boundaries
-if (estimate_error) {
-
- SCHEDULE WaveToyMoL_EstimateError AT poststep
- {
- LANG: Fortran
- } "Estimate the truncation error"
-
- SCHEDULE WaveToyMoL_EstimateErrorBoundaries AT poststep AFTER WaveToyMoL_EstimateError
- {
- LANG: Fortran
- OPTIONS: level
- SYNC: scalarevolveerrorestimate
- } "Select boundary conditions for the truncation error"
-
- SCHEDULE GROUP ApplyBCs AT poststep AFTER WaveToyMoL_EstimateError
- {
- } "Apply boundary conditions"
-
-}
+SCHEDULE WaveToyMoL_Boundaries IN postrestrict
+{
+ LANG: Fortran
+ SYNC: scalarevolve
+} "Select boundary conditions after restricting"
+
+SCHEDULE GROUP ApplyBCs IN postrestrict AFTER WaveToyMoL_Boundaries
+{
+} "Apply boundary conditions after restricting"
diff --git a/CarpetExtra/WaveToyMoL/src/boundaries.F77 b/CarpetExtra/WaveToyMoL/src/boundaries.F77
index 6b86f6383..64ad28fca 100644
--- a/CarpetExtra/WaveToyMoL/src/boundaries.F77
+++ b/CarpetExtra/WaveToyMoL/src/boundaries.F77
@@ -1,8 +1,8 @@
-c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/boundaries.F77,v 1.3 2004/04/07 17:08:21 schnetter Exp $
+c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/boundaries.F77,v 1.1 2003/06/18 18:24:31 schnetter Exp $
#include "cctk.h"
#include "cctk_Arguments.h"
-#include "cctk_Functions.h"
+#include "cctk_Faces.h"
#include "cctk_Parameters.h"
subroutine WaveToyMoL_Boundaries (CCTK_ARGUMENTS)
@@ -10,6 +10,8 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/boundar
DECLARE_CCTK_ARGUMENTS
DECLARE_CCTK_FUNCTIONS
DECLARE_CCTK_PARAMETERS
+ external Boundary_SelectGroupForBC
+ CCTK_INT Boundary_SelectGroupForBC
CCTK_INT bndwidth
parameter (bndwidth = 1)
character fbound*100
@@ -20,4 +22,6 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/boundar
ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, bndwidth, -1,
$ "WaveToyMoL::scalarevolve", fbound);
if (ierr.ne.0) call CCTK_WARN (0, "internal error")
+ call CartSymGN (ierr, cctkGH, "WaveToyMoL::scalarevolve")
+ if (ierr.ne.0) call CCTK_WARN (0, "internal error")
end
diff --git a/CarpetExtra/WaveToyMoL/src/calcrhs.F77 b/CarpetExtra/WaveToyMoL/src/calcrhs.F77
index b3df37eb2..777979b81 100644
--- a/CarpetExtra/WaveToyMoL/src/calcrhs.F77
+++ b/CarpetExtra/WaveToyMoL/src/calcrhs.F77
@@ -1,8 +1,7 @@
-c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/calcrhs.F77,v 1.3 2003/10/27 15:31:41 schnetter Exp $
+c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/calcrhs.F77,v 1.1 2003/06/18 18:24:31 schnetter Exp $
#include "cctk.h"
#include "cctk_Arguments.h"
-#include "cctk_Functions.h"
#include "cctk_Parameters.h"
subroutine WaveToyMoL_CalcRHS (CCTK_ARGUMENTS)
@@ -10,15 +9,26 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/calcrhs
DECLARE_CCTK_ARGUMENTS
DECLARE_CCTK_FUNCTIONS
DECLARE_CCTK_PARAMETERS
- CCTK_INT bndwidth
- parameter (bndwidth = 1)
- integer imin(3), imax(3)
CCTK_REAL dx(3)
+ integer bndwidth(3)
+ integer imin(3), imax(3)
integer i, j, k
integer d
+ integer ierr
+ do d=1,3
+ bndwidth(d) = 1
+ end do
do d=1,3
- imin(d) = 1+bndwidth
- imax(d) = cctk_lsh(d)-bndwidth
+ if (cctk_bbox(2*d).ne.0) then
+ imin(d) = 1+bndwidth(d)
+ else
+ imin(d) = 1+cctk_nghostzones(d)
+ end if
+ if (cctk_bbox(2*d+1).ne.0) then
+ imax(d) = cctk_lsh(d)-bndwidth(d)
+ else
+ imax(d) = cctk_lsh(d)-cctk_nghostzones(d)
+ end if
end do
do d=1,3
dx(d) = CCTK_DELTA_SPACE(3)
diff --git a/CarpetExtra/WaveToyMoL/src/initsymbound.F77 b/CarpetExtra/WaveToyMoL/src/initsymbound.F77
index 554eb16f0..af12a8009 100644
--- a/CarpetExtra/WaveToyMoL/src/initsymbound.F77
+++ b/CarpetExtra/WaveToyMoL/src/initsymbound.F77
@@ -1,8 +1,7 @@
-c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/initsymbound.F77,v 1.3 2004/04/07 17:08:21 schnetter Exp $
+c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/initsymbound.F77,v 1.1 2003/06/18 18:24:31 schnetter Exp $
#include "cctk.h"
#include "cctk_Arguments.h"
-#include "cctk_Functions.h"
#include "cctk_Parameters.h"
subroutine WaveToyMoL_InitSymBound (CCTK_ARGUMENTS)
@@ -20,6 +19,4 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/initsym
if (ierr.ne.0) call CCTK_WARN (0, "internal error")
call SetCartSymVN (ierr, cctkGH, sym, "WaveToyMoL::phidot")
if (ierr.ne.0) call CCTK_WARN (0, "internal error")
- call SetCartSymVN (ierr, cctkGH, sym, "WaveToyMoL::error")
- if (ierr.ne.0) call CCTK_WARN (0, "internal error")
end
diff --git a/CarpetExtra/WaveToyMoL/src/make.code.defn b/CarpetExtra/WaveToyMoL/src/make.code.defn
index 59782e596..969543b4a 100644
--- a/CarpetExtra/WaveToyMoL/src/make.code.defn
+++ b/CarpetExtra/WaveToyMoL/src/make.code.defn
@@ -1,8 +1,8 @@
# Main make.code.defn file for thorn WaveToyMoL
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/make.code.defn,v 1.2 2004/04/07 17:08:21 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/make.code.defn,v 1.1 2003/06/18 18:24:31 schnetter Exp $
# Source files in this directory
-SRCS = boundaries.F77 calcrhs.F77 estimateerror.F77 initsymbound.F77 registervars.F77 startup.F77
+SRCS = boundaries.F77 calcrhs.F77 initsymbound.F77 registervars.F77 startup.F77
# Subdirectories containing source files
SUBDIRS =
diff --git a/CarpetExtra/WaveToyMoL/src/registervars.F77 b/CarpetExtra/WaveToyMoL/src/registervars.F77
index 51710f60a..df31c718a 100644
--- a/CarpetExtra/WaveToyMoL/src/registervars.F77
+++ b/CarpetExtra/WaveToyMoL/src/registervars.F77
@@ -1,8 +1,7 @@
-c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/registervars.F77,v 1.2 2003/10/27 15:31:41 schnetter Exp $
+c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/registervars.F77,v 1.1 2003/06/18 18:24:31 schnetter Exp $
#include "cctk.h"
#include "cctk_Arguments.h"
-#include "cctk_Functions.h"
#include "cctk_Parameters.h"
subroutine WaveToyMoL_RegisterVars (CCTK_ARGUMENTS)
@@ -10,6 +9,8 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/registe
DECLARE_CCTK_ARGUMENTS
DECLARE_CCTK_FUNCTIONS
DECLARE_CCTK_PARAMETERS
+ external MoLRegisterEvolvedGroup
+ CCTK_INT MoLRegisterEvolvedGroup
integer group, groupdot
integer ierr
call CCTK_GroupIndex(group, "wavetoymol::scalarevolve")
diff --git a/CarpetExtra/WaveToyMoL/src/startup.F77 b/CarpetExtra/WaveToyMoL/src/startup.F77
index 703d0d922..82d75c57e 100644
--- a/CarpetExtra/WaveToyMoL/src/startup.F77
+++ b/CarpetExtra/WaveToyMoL/src/startup.F77
@@ -1,7 +1,6 @@
-c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/startup.F77,v 1.2 2003/10/27 15:31:41 schnetter Exp $
+c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/startup.F77,v 1.1 2003/06/18 18:24:31 schnetter Exp $
#include "cctk.h"
-#include "cctk_Functions.h"
#include "cctk_Parameters.h"
subroutine WaveToyMoL_Startup