Carpet: Add parameter regrid_during_initialisation

Add new parameter "regrid_during_initialisation" that determines
whether the initial regridding should happen during or before setting
up initial data.

darcs-hash:20060622023631-dae7b-80d6152cb0846b97a3b99a58ab012b7dd66c97d4.gz

2 files changed, 12 insertions, 1 deletions

diff --git a/Carpet/Carpet/param.ccl b/Carpet/Carpet/param.ccl
index cb1016fdb..d23c57c7c 100644
--- a/Carpet/Carpet/param.ccl
+++ b/Carpet/Carpet/param.ccl
@@ -374,6 +374,10 @@ BOOLEAN prolongate_initial_data "Prolongate the refined regions during initial d
 {
 } "no"
 
+BOOLEAN regrid_during_initialisation "Regrid while initialising" STEERABLE=recover
+{
+} "yes"
+
 BOOLEAN regrid_during_recovery "Regrid while recovering" STEERABLE=recover
 {
 } "yes"
diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc
index 43896cd95..f36ce0f07 100644
--- a/Carpet/Carpet/src/Initialise.cc
+++ b/Carpet/Carpet/src/Initialise.cc
@@ -96,9 +96,16 @@ namespace Carpet {
     } else {
       // Calculate initial data
 
+      if (not regrid_during_initialisation) {
+        // Regrid once in the beginning
+        initialise_Regrid (cgh, 0);
+      }
       for (int rl=0; rl<reflevels; ++rl) {
         initialise_I (cgh, rl);
-        initialise_Regrid (cgh, rl);
+        if (regrid_during_initialisation) {
+          // Regrid after initialising each level
+          initialise_Regrid (cgh, rl);
+        }
       }
 
       for (int rl=reflevels-1; rl>=0; --rl) {