[cig-commits] commit 2030 by buerg to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 2030

Add r1950.

U   trunk/aspire/include/aspect/postprocess/visualization.h
U   trunk/aspire/source/postprocess/visualization.cc


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2030&peg=2030

Diff:
Modified: trunk/aspire/include/aspect/postprocess/visualization.h
===================================================================
--- trunk/aspire/include/aspect/postprocess/visualization.h	2013-11-21 17:31:33 UTC (rev 2029)
+++ trunk/aspire/include/aspect/postprocess/visualization.h	2013-11-21 18:05:40 UTC (rev 2030)
@@ -435,6 +435,13 @@
         std::vector<std::pair<double,std::string> > times_and_pvtu_names;
 
         /**
+         * A list of list of filenames, sorted by timestep, that correspond
+         * to what has been created as output. This is used to create a master
+         * .visit file for the entire simulation.
+         */
+        std::vector<std::vector<std::string> > output_file_names_by_timestep;
+ 
+        /**
          * A set of data related to XDMF file sections describing the HDF5 heavy data
          * files created. These contain things such as the dimensions and names of data
          * written at all steps during the simulation.

Modified: trunk/aspire/source/postprocess/visualization.cc
===================================================================
--- trunk/aspire/source/postprocess/visualization.cc	2013-11-21 17:31:33 UTC (rev 2029)
+++ trunk/aspire/source/postprocess/visualization.cc	2013-11-21 18:05:40 UTC (rev 2030)
@@ -366,13 +366,22 @@
               std::ofstream pvd_master (pvd_master_filename.c_str());
               data_out.write_pvd_record (pvd_master, times_and_pvtu_names);
 
-              // finally, do the same for Visit via the .visit file
+              // finally, do the same for Visit via the .visit file for this
+              // time step, as well as for all time steps together
               const std::string
               visit_master_filename = (this->get_output_directory() +
                                        solution_file_prefix +
                                        ".visit");
               std::ofstream visit_master (visit_master_filename.c_str());
               data_out.write_visit_record (visit_master, filenames);
+              
+              output_file_names_by_timestep.push_back (filenames);
+              
+#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) > 800
+              std::ofstream global_visit_master ((this->get_output_directory () + "solution.visit").c_str ());
+              
+              data_out.write_visit_record (global_visit_master, output_file_names_by_timestep);
+#endif
             }
         }
       else
@@ -422,13 +431,22 @@
               std::ofstream pvd_master (pvd_master_filename.c_str());
               data_out.write_pvd_record (pvd_master, times_and_pvtu_names);
 
-              // finally, do the same for Visit via the .visit file
+              // finally, do the same for Visit via the .visit file for this
+              // time step, as well as for all time steps together
               const std::string
               visit_master_filename = (this->get_output_directory() +
                                        solution_file_prefix +
                                        ".visit");
               std::ofstream visit_master (visit_master_filename.c_str());
               data_out.write_visit_record (visit_master, filenames);
+              
+              output_file_names_by_timestep.push_back (filenames);
+              
+#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) > 800
+              std::ofstream global_visit_master ((this->get_output_directory () + "solution.visit").c_str ());
+              
+              data_out.write_visit_record (global_visit_master, output_file_names_by_timestep);
+#endif
             }
 
           const std::string *filename
@@ -679,6 +697,7 @@
       ar &next_output_time
       & output_file_number
       & times_and_pvtu_names
+      & output_file_names_by_timestep
       & mesh_changed
       & last_mesh_file_name
       & xdmf_entries