CarpetRegrid: Construct "multigrid boxes" only once, not once per level

Construct "multigrid boxes" only once, not once per refinement level.
This should have no effect except avoid unnecessary computation.

darcs-hash:20060329173904-dae7b-0a05a59a3e8dd43a0f8f03bf0f0e9296cc036ee1.gz

6 files changed, 18 insertions, 18 deletions

diff --git a/Carpet/CarpetRegrid/src/centre.cc b/Carpet/CarpetRegrid/src/centre.cc
index b9a3f918e..26871b576 100644
--- a/Carpet/CarpetRegrid/src/centre.cc
+++ b/Carpet/CarpetRegrid/src/centre.cc
@@ -79,11 +79,11 @@ namespace CarpetRegrid {
       obss.at(rl) = obs;
       pss.at(rl) = ps;
       
-      // make multigrid aware
-      MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
-      
     } // for rl
     
+    // make multigrid aware
+    MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
+    
     return 1;
   }
   
diff --git a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
index 12a5b6409..d98dc4ac0 100644
--- a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
+++ b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
@@ -257,11 +257,11 @@ namespace CarpetRegrid {
       obss.at(rl) = obs;
       pss.at(rl) = ps;
       
-      // make multigrid aware
-      MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
-      
     } // for rl
     
+    // make multigrid aware
+    MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
+    
     return 1;
   }
   
diff --git a/Carpet/CarpetRegrid/src/manualcoordinates.cc b/Carpet/CarpetRegrid/src/manualcoordinates.cc
index f5f84c7b3..0207119e9 100644
--- a/Carpet/CarpetRegrid/src/manualcoordinates.cc
+++ b/Carpet/CarpetRegrid/src/manualcoordinates.cc
@@ -71,11 +71,11 @@ namespace CarpetRegrid {
       obss.at(rl) = obs;
       pss.at(rl) = ps;
       
-      // make multigrid aware
-      MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
-      
     } // for rl
     
+    // make multigrid aware
+    MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
+    
     return 1;
   }
   
diff --git a/Carpet/CarpetRegrid/src/manualgridpointlist.cc b/Carpet/CarpetRegrid/src/manualgridpointlist.cc
index b279551cb..6425345f1 100644
--- a/Carpet/CarpetRegrid/src/manualgridpointlist.cc
+++ b/Carpet/CarpetRegrid/src/manualgridpointlist.cc
@@ -109,11 +109,11 @@ namespace CarpetRegrid {
       obss.at(rl) = obs;
       pss.at(rl) = ps;
       
-      // make multigrid aware
-      MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
-      
     } // for rl
     
+    // make multigrid aware
+    MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
+    
     return 1;
   }
   
diff --git a/Carpet/CarpetRegrid/src/manualgridpoints.cc b/Carpet/CarpetRegrid/src/manualgridpoints.cc
index 5028d2064..6e783adc2 100644
--- a/Carpet/CarpetRegrid/src/manualgridpoints.cc
+++ b/Carpet/CarpetRegrid/src/manualgridpoints.cc
@@ -72,11 +72,11 @@ namespace CarpetRegrid {
       obss.at(rl) = obs;
       pss.at(rl) = ps;
       
-      // make multigrid aware
-      MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
-      
     } // for rl
     
+    // make multigrid aware
+    MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
+    
     return 1;
   }
   
diff --git a/Carpet/CarpetRegrid/src/moving.cc b/Carpet/CarpetRegrid/src/moving.cc
index 44a5c2a16..03c596d71 100644
--- a/Carpet/CarpetRegrid/src/moving.cc
+++ b/Carpet/CarpetRegrid/src/moving.cc
@@ -69,11 +69,11 @@ namespace CarpetRegrid {
       obss.at(rl) = obs;
       pss.at(rl) = ps;
       
-      // make multigrid aware
-      MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
-      
     } // for rl
     
+    // make multigrid aware
+    MakeMultigridBoxes (cctkGH, bbss, obss, bbsss);
+    
     return 1;
   }