aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2008-03-19 11:13:13 -0500
committerErik Schnetter <schnetter@cct.lsu.edu>2008-03-19 11:13:13 -0500
commit1dd96e20cb7a87d294c5298b46f01dff97b0da53 (patch)
tree05e28febbcbfa168c32477a69673e6b1d06234cc
parentfaf0a8bb532d7ca3eacc6c7973b7bf01ff8fb452 (diff)
Carpet: Schedule postinitial bin before recursive initialisation
Schedule the postinitial bin before the recursive initialisation. This is necessary because e.g. the conversion from ADM to BSSN variables is performed in this bin, and this needs to occur before the recursive initialisation so that the refinement boundaries of the BSSN variables are initialised correctly.
-rw-r--r--Carpet/Carpet/src/Initialise.cc4
-rw-r--r--Carpet/doc/scheduling.tex15
2 files changed, 11 insertions, 8 deletions
diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc
index 6f3f53900..1b81dec11 100644
--- a/Carpet/Carpet/src/Initialise.cc
+++ b/Carpet/Carpet/src/Initialise.cc
@@ -337,6 +337,7 @@ namespace Carpet {
// Set up the initial data
ScheduleTraverse (where, "CCTK_INITIAL", cctkGH);
+ ScheduleTraverse (where, "CCTK_POSTINITIAL", cctkGH);
if (init_fill_timelevels) {
assert (tl==0);
@@ -357,7 +358,6 @@ namespace Carpet {
} LEAVE_LEVEL_MODE;
} END_MGLEVEL_LOOP;
-
} // for rl
timer.stop();
@@ -406,7 +406,6 @@ namespace Carpet {
ScheduleTraverse (where, "CCTK_POSTRESTRICTINITIAL", cctkGH);
}
- ScheduleTraverse (where, "CCTK_POSTINITIAL", cctkGH);
ScheduleTraverse (where, "CCTK_POSTSTEP", cctkGH);
PoisonCheck (cctkGH, alltimes);
@@ -677,7 +676,6 @@ namespace Carpet {
} LEAVE_LEVEL_MODE;
} END_MGLEVEL_LOOP;
-
} // for rl
do_global_mode = old_do_global_mode;
diff --git a/Carpet/doc/scheduling.tex b/Carpet/doc/scheduling.tex
index e148fbfea..5d298c0e3 100644
--- a/Carpet/doc/scheduling.tex
+++ b/Carpet/doc/scheduling.tex
@@ -639,20 +639,25 @@ PARAMCHECK
\fbox{\begin{minipage}[t]{\textwidth}
Recover? (yes/no)
\\
+\fbox{\begin{minipage}[t]{0.47\textwidth}
+PREREGRIDINITIAL\\
+Regrid\\
+POSTREGRIDINITIAL
+\end{minipage}}
+\fbox{\begin{minipage}[t]{0.47\textwidth}
+Recover grid structure
+\end{minipage}}\\
\fbox{\begin{minipage}[t]{0.1\textwidth}
initial\\
loop
\end{minipage}
\fbox{\begin{minipage}[t]{0.345\textwidth}
-PREREGRIDINITIAL\\
-Regrid\\
-POSTREGRIDINITIAL\\
BASEGRID\\
INITIAL\\
+POSTINITIAL\\
$\longrightarrow$ Recurse\\
Restrict\\
POSTRESTRICTINITIAL\\
-POSTINITIAL\\
POSTSTEP
\end{minipage}}}
\fbox{\begin{minipage}[t]{0.1\textwidth}
@@ -784,6 +789,7 @@ SHUTDOWN
\begin{minipage}[c]{0.6\textwidth}
BASEGRID\\
INITIAL
+ POSTINITIAL\\
\end{minipage}
}
}
@@ -846,7 +852,6 @@ SHUTDOWN
\fbox{
\begin{minipage}[c]{0.49\textwidth}
POSTRESTRICTINITIAL\\
- POSTINITIAL\\
POSTSTEP
\end{minipage}
}