From 57eaa7849a138658c97655edaab19028b47febc9 Mon Sep 17 00:00:00 2001 From: schnetter <> Date: Sun, 20 Jul 2003 19:03:00 +0000 Subject: Fix the casing of the postrestrict group to PostRestrict. Update all Fix the casing of the postrestrict group to PostRestrict. Update all schedule.ccl files accordingly. Introduce a Carpet parameter buffer_width. This parameter specifies a region within refined grids that is also boundary-prolongated. Introduce a function CarpetEnableProlongation to dis- and re-enable boundary prolongation. darcs-hash:20030720190343-07bb3-0c5db5cebe769c0d4b3237f11a089aab9da94b1a.gz --- CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par | 4 ++-- CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par | 4 ++-- CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par | 4 ++-- CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par | 4 ++-- CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par | 4 ++-- CarpetExtra/WaveToyMoL/schedule.ccl | 6 +++--- CarpetExtra/WaveToyMoL/src/calcrhs.F77 | 23 ++++++----------------- 7 files changed, 19 insertions(+), 30 deletions(-) (limited to 'CarpetExtra/WaveToyMoL') diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par index fc8dfd4ce..9bb72f8d4 100644 --- a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par +++ b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par,v 1.2 2003/06/18 20:08:29 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0020.par,v 1.3 2003/07/20 21:03:43 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 3200 @@ -32,7 +32,7 @@ Carpet::init_each_timelevel = yes CarpetRegrid::refinement_levels = 2 CarpetRegrid::refined_regions = manual-gridpoint-list -CarpetRegrid::gridpoints = "[[ ([28,4,4]:[68,12,12]:[2,2,2]) ]]" +CarpetRegrid::gridpoints = "[[ ([30,4,4]:[66,12,12]:[2,2,2]) ]]" CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]" diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par index ecfe0eb62..fd1a0773a 100644 --- a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par +++ b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par,v 1.2 2003/06/18 20:08:29 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0040.par,v 1.3 2003/07/20 21:03:43 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 6400 @@ -32,7 +32,7 @@ Carpet::init_each_timelevel = yes CarpetRegrid::refinement_levels = 2 CarpetRegrid::refined_regions = manual-gridpoint-list -CarpetRegrid::gridpoints = "[[ ([48,4,4]:[128,12,12]:[2,2,2]) ]]" +CarpetRegrid::gridpoints = "[[ ([50,4,4]:[126,12,12]:[2,2,2]) ]]" CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]" diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par index 588336e06..8ba9cdbe7 100644 --- a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par +++ b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par,v 1.2 2003/06/18 20:08:29 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0080.par,v 1.3 2003/07/20 21:03:43 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 12800 @@ -32,7 +32,7 @@ Carpet::init_each_timelevel = yes CarpetRegrid::refinement_levels = 2 CarpetRegrid::refined_regions = manual-gridpoint-list -CarpetRegrid::gridpoints = "[[ ([88,4,4]:[248,12,12]:[2,2,2]) ]]" +CarpetRegrid::gridpoints = "[[ ([90,4,4]:[246,12,12]:[2,2,2]) ]]" CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]" diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par index d7b4ba7ff..3313c9399 100644 --- a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par +++ b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par,v 1.2 2003/06/18 20:08:29 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0160.par,v 1.3 2003/07/20 21:03:43 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 25600 @@ -32,7 +32,7 @@ Carpet::init_each_timelevel = yes CarpetRegrid::refinement_levels = 2 CarpetRegrid::refined_regions = manual-gridpoint-list -CarpetRegrid::gridpoints = "[[ ([168,4,4]:[488,12,12]:[2,2,2]) ]]" +CarpetRegrid::gridpoints = "[[ ([170,4,4]:[486,12,12]:[2,2,2]) ]]" CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]" diff --git a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par index 509569064..275deef78 100644 --- a/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par +++ b/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par,v 1.2 2003/06/18 20:08:29 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/par/sw1d_2l_0320.par,v 1.3 2003/07/20 21:03:43 schnetter Exp $ Cactus::cctk_initial_time = 0 Cactus::cctk_itlast = 51200 @@ -32,7 +32,7 @@ Carpet::init_each_timelevel = yes CarpetRegrid::refinement_levels = 2 CarpetRegrid::refined_regions = manual-gridpoint-list -CarpetRegrid::gridpoints = "[[ ([328,4,4]:[968,12,12]:[2,2,2]) ]]" +CarpetRegrid::gridpoints = "[[ ([330,4,4]:[966,12,12]:[2,2,2]) ]]" CarpetRegrid::outerbounds = "[[ [[0,0],[1,1],[1,1]] ]]" diff --git a/CarpetExtra/WaveToyMoL/schedule.ccl b/CarpetExtra/WaveToyMoL/schedule.ccl index 92eae59c1..5404f562c 100644 --- a/CarpetExtra/WaveToyMoL/schedule.ccl +++ b/CarpetExtra/WaveToyMoL/schedule.ccl @@ -1,5 +1,5 @@ # Schedule definitions for thorn WaveToyMoL -# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/schedule.ccl,v 1.1 2003/06/18 18:24:30 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/schedule.ccl,v 1.2 2003/07/20 21:03:43 schnetter Exp $ STORAGE: scalarevolve[3] STORAGE: scalarevolvedot @@ -42,12 +42,12 @@ SCHEDULE GROUP ApplyBCs IN MoL_PostStep AFTER WaveToyMoL_Boundaries -SCHEDULE WaveToyMoL_Boundaries IN postrestrict +SCHEDULE WaveToyMoL_Boundaries IN PostRestrict { LANG: Fortran SYNC: scalarevolve } "Select boundary conditions after restricting" -SCHEDULE GROUP ApplyBCs IN postrestrict AFTER WaveToyMoL_Boundaries +SCHEDULE GROUP ApplyBCs IN PostRestrict AFTER WaveToyMoL_Boundaries { } "Apply boundary conditions after restricting" diff --git a/CarpetExtra/WaveToyMoL/src/calcrhs.F77 b/CarpetExtra/WaveToyMoL/src/calcrhs.F77 index 777979b81..2c684eaec 100644 --- a/CarpetExtra/WaveToyMoL/src/calcrhs.F77 +++ b/CarpetExtra/WaveToyMoL/src/calcrhs.F77 @@ -1,4 +1,4 @@ -c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/calcrhs.F77,v 1.1 2003/06/18 18:24:31 schnetter Exp $ +c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/calcrhs.F77,v 1.2 2003/07/20 21:03:44 schnetter Exp $ #include "cctk.h" #include "cctk_Arguments.h" @@ -9,26 +9,15 @@ c $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/WaveToyMoL/src/calcrhs DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_FUNCTIONS DECLARE_CCTK_PARAMETERS - CCTK_REAL dx(3) - integer bndwidth(3) + CCTK_INT bndwidth + parameter (bndwidth = 1) integer imin(3), imax(3) + CCTK_REAL dx(3) integer i, j, k integer d - integer ierr - do d=1,3 - bndwidth(d) = 1 - end do do d=1,3 - 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 + imin(d) = 1+bndwidth + imax(d) = cctk_lsh(d)-bndwidth end do do d=1,3 dx(d) = CCTK_DELTA_SPACE(3) -- cgit v1.2.3