Merge pull request #6099 from bangerth/archive

Ensure oarchives die quickly.

source/postprocess/core_statistics.cc

@@ -200,9 +200,15 @@ namespace aspect
     template <int dim>
     void CoreStatistics<dim>::save (std::map<std::string, std::string> &status_strings) const
     {
+      // Serialize into a stringstream. Put the following into a code
+      // block of its own to ensure the destruction of the 'oa'
+      // archive triggers a flush() on the stringstream so we can
+      // query the completed string below.
       std::ostringstream os;
-      aspect::oarchive oa (os);
-      oa << (*this);
+      {
+        aspect::oarchive oa (os);
+        oa << (*this);
+      }
 
       status_strings["CoreStatistics"] = os.str();
     }

source/postprocess/depth_average.cc

@@ -449,9 +449,15 @@ namespace aspect
     void
     DepthAverage<dim>::save (std::map<std::string, std::string> &status_strings) const
     {
+      // Serialize into a stringstream. Put the following into a code
+      // block of its own to ensure the destruction of the 'oa'
+      // archive triggers a flush() on the stringstream so we can
+      // query the completed string below.
       std::ostringstream os;
-      aspect::oarchive oa (os);
-      oa << (*this);
+      {
+        aspect::oarchive oa (os);
+        oa << (*this);
+      }
 
       status_strings["DepthAverage"] = os.str();
     }

source/postprocess/gravity_point_values.cc

@@ -793,9 +793,15 @@ namespace aspect
     void
     GravityPointValues<dim>::save (std::map<std::string, std::string> &status_strings) const
     {
+      // Serialize into a stringstream. Put the following into a code
+      // block of its own to ensure the destruction of the 'oa'
+      // archive triggers a flush() on the stringstream so we can
+      // query the completed string below.
       std::ostringstream os;
-      aspect::oarchive oa (os);
-      oa << (*this);
+      {
+        aspect::oarchive oa (os);
+        oa << (*this);
+      }
 
       status_strings["GravityPointValues"] = os.str();
     }

source/postprocess/particles.cc

@@ -611,11 +611,18 @@ namespace aspect
             {
               particles_output_base_name += "-" + Utilities::int_to_string(particle_manager+1);
             }
+
+          // Serialize into a stringstream. Put the following into a code
+          // block of its own to ensure the destruction of the 'oa'
+          // archive triggers a flush() on the stringstream so we can
+          // query the completed string below.
           std::ostringstream os;
-          aspect::oarchive oa (os);
+          {
+            aspect::oarchive oa (os);
 
-          this->get_particle_manager(particle_manager).save(os);
-          oa << (*this);
+            this->get_particle_manager(particle_manager).save(os);
+            oa << (*this);
+          }
 
           status_strings[particles_output_base_name] = os.str();
         }

source/postprocess/point_values.cc

@@ -288,9 +288,15 @@ namespace aspect
     void
     PointValues<dim>::save (std::map<std::string, std::string> &status_strings) const
     {
+      // Serialize into a stringstream. Put the following into a code
+      // block of its own to ensure the destruction of the 'oa'
+      // archive triggers a flush() on the stringstream so we can
+      // query the completed string below.
       std::ostringstream os;
-      aspect::oarchive oa (os);
-      oa << (*this);
+      {
+        aspect::oarchive oa (os);
+        oa << (*this);
+      }
 
       status_strings["PointValues"] = os.str();
     }

source/postprocess/sea_level.cc

@@ -565,8 +565,15 @@ namespace aspect
     SeaLevel<dim>::save (std::map<std::string, std::string> &status_strings) const
     {
       std::ostringstream os;
-      aspect::oarchive oa (os);
-      oa << (*this);
+
+      // Serialize into a stringstream. Put the following into a code
+      // block of its own to ensure the destruction of the 'oa'
+      // archive triggers a flush() on the stringstream so we can
+      // query the completed string below.
+      {
+        aspect::oarchive oa (os);
+        oa << (*this);
+      }
 
       status_strings["SeaLevel"] = os.str();
     }

source/postprocess/stokes_residual.cc

@@ -141,9 +141,15 @@ namespace aspect
     void
     StokesResidual<dim>::save (std::map<std::string, std::string> &status_strings) const
     {
+      // Serialize into a stringstream. Put the following into a code
+      // block of its own to ensure the destruction of the 'oa'
+      // archive triggers a flush() on the stringstream so we can
+      // query the completed string below.
       std::ostringstream os;
-      aspect::oarchive oa (os);
-      oa << (*this);
+      {
+        aspect::oarchive oa (os);
+        oa << (*this);
+      }
 
       status_strings["StokesResidual"] = os.str();
     }

source/postprocess/visualization.cc

@@ -1501,9 +1501,15 @@ namespace aspect
     void
     Visualization<dim>::save (std::map<std::string, std::string> &status_strings) const
     {
+      // Serialize into a stringstream. Put the following into a code
+      // block of its own to ensure the destruction of the 'oa'
+      // archive triggers a flush() on the stringstream so we can
+      // query the completed string below.
       std::ostringstream os;
-      aspect::oarchive oa (os);
-      oa << (*this);
+      {
+        aspect::oarchive oa (os);
+        oa << (*this);
+      }
 
       status_strings["Visualization"] = os.str();
 

source/simulator/checkpoint_restart.cc

@@ -326,10 +326,15 @@ namespace aspect
     {
       std::ostringstream oss;
 
-      // serialize into a stringstream
-      aspect::oarchive oa (oss);
-      save_critical_parameters (this->parameters, oa);
-      oa << (*this);
+      // Serialize into a stringstream. Put the following into a code
+      // block of its own to ensure the destruction of the 'oa'
+      // archive triggers a flush() on the stringstream so we can
+      // query its properties below.
+      {
+        aspect::oarchive oa (oss);
+        save_critical_parameters (this->parameters, oa);
+        oa << (*this);
+      }
 
       // compress with zlib and write to file on the root processor
 #ifdef DEAL_II_WITH_ZLIB