diff options
author | schnetter <> | 2004-04-28 13:45:00 +0000 |
---|---|---|
committer | schnetter <> | 2004-04-28 13:45:00 +0000 |
commit | 8af232de44a333375a77e81fbbcc0fb96d9ea293 (patch) | |
tree | 4792cd2d7e6de77e9e1f556c7bad2e97731916da /Carpet/CarpetRegrid | |
parent | 26865c20d26f2e1ab586fbc43b720187ae923847 (diff) |
Do not allow smart_outer_boundaries to be set unless it is supported.
darcs-hash:20040428134525-07bb3-c7449414a69ffafce226689cfb83e65845d49bd6.gz
Diffstat (limited to 'Carpet/CarpetRegrid')
-rw-r--r-- | Carpet/CarpetRegrid/src/automatic.cc | 6 | ||||
-rw-r--r-- | Carpet/CarpetRegrid/src/centre.cc | 4 | ||||
-rw-r--r-- | Carpet/CarpetRegrid/src/manualcoordinates.cc | 4 | ||||
-rw-r--r-- | Carpet/CarpetRegrid/src/manualgridpoints.cc | 4 | ||||
-rw-r--r-- | Carpet/CarpetRegrid/src/moving.cc | 4 |
5 files changed, 16 insertions, 6 deletions
diff --git a/Carpet/CarpetRegrid/src/automatic.cc b/Carpet/CarpetRegrid/src/automatic.cc index dd8572842..511c40ed4 100644 --- a/Carpet/CarpetRegrid/src/automatic.cc +++ b/Carpet/CarpetRegrid/src/automatic.cc @@ -16,7 +16,7 @@ #include "regrid.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/automatic.cc,v 1.3 2004/04/24 07:40:16 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/automatic.cc,v 1.4 2004/04/28 15:45:25 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetRegrid_automatic_cc); } @@ -58,7 +58,9 @@ namespace CarpetRegrid { const gf<CCTK_REAL,dim>& errorgf = (*dynamic_cast<const gf<CCTK_REAL,dim>*> (arrdata.at(gi).at(Carpet::map).data.at(vi-v1))); - + + assert (! smart_outer_boundaries); + vector<ibbox> bbs; gh<dim>::cbnds obs; Automatic_OneLevel diff --git a/Carpet/CarpetRegrid/src/centre.cc b/Carpet/CarpetRegrid/src/centre.cc index be101c73c..7599324ea 100644 --- a/Carpet/CarpetRegrid/src/centre.cc +++ b/Carpet/CarpetRegrid/src/centre.cc @@ -9,7 +9,7 @@ #include "regrid.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/centre.cc,v 1.3 2004/04/22 11:58:37 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/centre.cc,v 1.4 2004/04/28 15:45:25 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetRegrid_centre_cc); } @@ -48,6 +48,8 @@ namespace CarpetRegrid { ivect rlb = hh.baseextent.lower(); ivect rub = hh.baseextent.upper(); + assert (! smart_outer_boundaries); + for (size_t rl=1; rl<bbsss.size(); ++rl) { // save old values diff --git a/Carpet/CarpetRegrid/src/manualcoordinates.cc b/Carpet/CarpetRegrid/src/manualcoordinates.cc index 3ebb40d7d..91018cf95 100644 --- a/Carpet/CarpetRegrid/src/manualcoordinates.cc +++ b/Carpet/CarpetRegrid/src/manualcoordinates.cc @@ -11,7 +11,7 @@ #include "regrid.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualcoordinates.cc,v 1.4 2004/04/22 11:58:42 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualcoordinates.cc,v 1.5 2004/04/28 15:45:25 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetRegrid_manualcoordinates_cc); } @@ -54,6 +54,8 @@ namespace CarpetRegrid { lower.at(2) = rvect (l3xmin, l3ymin, l3zmin); upper.at(2) = rvect (l3xmax, l3ymax, l3zmax); + assert (! smart_outer_boundaries); + for (size_t rl=1; rl<bbsss.size(); ++rl) { bbvect const ob (false); diff --git a/Carpet/CarpetRegrid/src/manualgridpoints.cc b/Carpet/CarpetRegrid/src/manualgridpoints.cc index a5f631935..ae6d22177 100644 --- a/Carpet/CarpetRegrid/src/manualgridpoints.cc +++ b/Carpet/CarpetRegrid/src/manualgridpoints.cc @@ -11,7 +11,7 @@ #include "regrid.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualgridpoints.cc,v 1.3 2004/04/22 11:58:42 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualgridpoints.cc,v 1.4 2004/04/28 15:45:25 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetRegrid_manualgridpoints_cc); } @@ -54,6 +54,8 @@ namespace CarpetRegrid { ilower.at(2) = ivect (l3ixmin, l3iymin, l3izmin); iupper.at(2) = ivect (l3ixmax, l3iymax, l3izmax); + assert (! smart_outer_boundaries); + for (size_t rl=1; rl<bbsss.size(); ++rl) { bbvect const ob (false); diff --git a/Carpet/CarpetRegrid/src/moving.cc b/Carpet/CarpetRegrid/src/moving.cc index cfcb6496c..9c071288a 100644 --- a/Carpet/CarpetRegrid/src/moving.cc +++ b/Carpet/CarpetRegrid/src/moving.cc @@ -9,7 +9,7 @@ #include "regrid.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/moving.cc,v 1.3 2004/04/18 13:29:43 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/moving.cc,v 1.4 2004/04/28 15:45:25 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetRegrid_moving_cc); } @@ -49,6 +49,8 @@ namespace CarpetRegrid { ivect rlb = hh.baseextent.lower(); ivect rub = hh.baseextent.upper(); + assert (! smart_outer_boundaries); + for (size_t rl=1; rl<bbsss.size(); ++rl) { // save old values |