Merge branch 'master' of carpetgit@carpetcode.dyndns.org:carpet

6 files changed, 35 insertions, 4 deletions

diff --git a/Carpet/Carpet/src/Evolve.cc b/Carpet/Carpet/src/Evolve.cc
index ec3eeb32e..05931fb52 100644
--- a/Carpet/Carpet/src/Evolve.cc
+++ b/Carpet/Carpet/src/Evolve.cc
@@ -57,6 +57,7 @@ namespace Carpet {
     do_taper = use_tapered_grids;
     
     // Main loop
+    BeginTiming (cctkGH);
     static Timer timer ("Evolve");
     timer.start();
     while (not do_terminate (cctkGH)) {
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc
index 62e6c6e43..958a5d058 100644
--- a/Carpet/Carpet/src/Recompose.cc
+++ b/Carpet/Carpet/src/Recompose.cc
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cmath>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
@@ -861,6 +862,12 @@ namespace Carpet {
                 double (num_active_array_points / 1000000),
                 double (num_total_array_points / 1000000),
                 double (num_total_array_points / num_active_array_points * 100 - 100));
+    
+    // After this, we will begin to allocate memory for the grid
+    // structure.  If we run out of memory, ensure that this output
+    // still makes it to disk.
+    fflush (stdout);
+    fflush (stderr);
   }
   
   
diff --git a/Carpet/Carpet/src/Timing.cc b/Carpet/Carpet/src/Timing.cc
index f767f1ea5..6c4102733 100644
--- a/Carpet/Carpet/src/Timing.cc
+++ b/Carpet/Carpet/src/Timing.cc
@@ -136,9 +136,6 @@ namespace Carpet {
   {
     DECLARE_CCTK_ARGUMENTS;
     
-    initial_walltime = get_walltime();
-    initial_phystime = cctkGH->cctk_time;
-    
     * physical_time_per_hour = 0.0;
     
     * time_total         = 0.0;
@@ -171,6 +168,19 @@ namespace Carpet {
   
   
   
+  // Begin timing (to be called after initialisation, just before the
+  // main evolution begins)
+  void
+  BeginTiming (cGH const * const cctkGH)
+  {
+    DECLARE_CCTK_ARGUMENTS;
+    
+    initial_walltime = get_walltime();
+    initial_phystime = cctkGH->cctk_time;
+  }
+  
+  
+  
   // Take a step on the current refinement and multigrid level (to be
   // called when EVOL is scheduled)
   void
diff --git a/Carpet/Carpet/src/functions.hh b/Carpet/Carpet/src/functions.hh
index 0d1e9104b..d8b508441 100644
--- a/Carpet/Carpet/src/functions.hh
+++ b/Carpet/Carpet/src/functions.hh
@@ -177,6 +177,7 @@ namespace Carpet {
   
   // Timing statistics functions
   void InitTimingStats (cGH const * cctkGH);
+  void BeginTiming (cGH const * cctkGH);
   void StepTiming (cGH const * cctkGH);
   void BeginTimingIO (cGH const * cctkGH);
   void EndTimingIO (cGH const * cctkGH,
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index 155c637f4..6aa68e537 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -428,7 +428,9 @@ namespace CarpetIOASCII {
       
       // Check for storage
       if (not CCTK_QueryGroupStorageI (cctkGH, group)) {
-        CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,
+        // This may be okay if storage is e.g. scheduled only in the
+        // analysis bin
+        CCTK_VWarn (4, __LINE__, __FILE__, CCTK_THORNSTRING,
                     "Cannot output variable '%s' because it has no storage",
                     varname);
         return 0;
diff --git a/Carpet/CarpetWeb/publications.html b/Carpet/CarpetWeb/publications.html
index fc8ef78e9..4cc367634 100644
--- a/Carpet/CarpetWeb/publications.html
+++ b/Carpet/CarpetWeb/publications.html
@@ -808,6 +808,16 @@ triangulations using finite element methods,</i><br />
 </li>
 
 <li>
+  <!-- 2008-06-13 -->
+  <p>XiRel: Standard Benchmarks for Numerical Relativity Codes Using
+    Cactus and Carpet,<br />
+    <i>Jian Tao, Gabrielle Allen, Ian Hinder, Erik Schnetter, Yosef
+      Zlochower,</i><br />
+    <a href="http://www.cct.lsu.edu/CCT-TR/CCT-TR-2008-5">Technical
+      Report CCT-TR-2008-5, Louisiana State University (2008)</a>.</p>
+</li>
+
+<li>
   <p>Comparisons of eccentric binary black hole simulations with
     post-Newtonian models,<br />
     <i>Ian Hinder, Frank Herrmann, Pablo Lagona, Deirdre Shoemaker,</i><br />