From 27a0b6427b09483bbb2dd8e7c11f8a7b131b098e Mon Sep 17 00:00:00 2001
From: schnetter <>
Date: Fri, 21 May 2004 16:14:00 +0000
Subject: Fix bug in smart_outer_boundaries.

Fix bug in smart_outer_boundaries.
Expect to be called after time level cycling.

darcs-hash:20040521161428-07bb3-5acc46116415324d7fe0aaf947677aeae2fce2d9.gz
---
 Carpet/CarpetRegrid/interface.ccl               | 2 +-
 Carpet/CarpetRegrid/src/manualcoordinatelist.cc | 4 ++--
 Carpet/CarpetRegrid/src/regrid.cc               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Carpet/CarpetRegrid')

diff --git a/Carpet/CarpetRegrid/interface.ccl b/Carpet/CarpetRegrid/interface.ccl
index 3d42d1d26..169a8a6d8 100644
--- a/Carpet/CarpetRegrid/interface.ccl
+++ b/Carpet/CarpetRegrid/interface.ccl
@@ -1,5 +1,5 @@
 # Interface definition for thorn CarpetRegrid
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/interface.ccl,v 1.12 2004/05/10 13:56:25 hawke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/interface.ccl,v 1.13 2004/05/21 18:14:28 schnetter Exp $
 
 IMPLEMENTS: CarpetRegrid
 
diff --git a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
index 3f8200f2e..90868ed8a 100644
--- a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
+++ b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
@@ -12,7 +12,7 @@
 #include "regrid.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualcoordinatelist.cc,v 1.5 2004/05/13 13:18:35 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualcoordinatelist.cc,v 1.6 2004/05/21 18:14:28 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetRegrid_manualcoordinatelist_cc);
 }
 
@@ -80,7 +80,7 @@ namespace CarpetRegrid {
         newobss.at(rl).resize(newbbss.at(rl).size());
         for (size_t c=0; c<newobss.at(rl).size(); ++c) {
           for (int d=0; d<dim; ++d) {
-            rvect spacing = base_spacing / ipow(reffact, rl+1);
+            rvect const spacing = base_spacing / ipow(reffact, rl+1);
             ierr = ConvertFromPhysicalBoundary
               (dim, &physical_min[0], &physical_max[0],
                &interior_min[0], &interior_max[0],
diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc
index 716d88c10..6a52fe08f 100644
--- a/Carpet/CarpetRegrid/src/regrid.cc
+++ b/Carpet/CarpetRegrid/src/regrid.cc
@@ -13,7 +13,7 @@
 #include "regrid.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.40 2004/04/19 18:48:07 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.41 2004/05/21 18:14:28 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetRegrid_regrid_cc);
 }
 
@@ -55,7 +55,7 @@ namespace CarpetRegrid {
 
     // Return if we want to regrid regularly, but not at this time
     if (regrid_every > 0 && cctkGH->cctk_iteration != 0
-	&& cctkGH->cctk_iteration % regrid_every != 0) {
+	&& (cctkGH->cctk_iteration-1) % regrid_every != 0) {
       return 0;
     }
     
-- 
cgit v1.2.3