diff --git a/include/aspect/particle/output/ascii.h b/include/aspect/particle/output/ascii.h index b494881427b..25fe9f09631 100644 --- a/include/aspect/particle/output/ascii.h +++ b/include/aspect/particle/output/ascii.h @@ -101,6 +101,24 @@ namespace aspect void load (std::istringstream &is); + /** + * Returns a constructed filename. + */ + const std::string + get_file_name(); + + /** + * Get the absolute path where the specified particle output will be generated. + */ + const std::string + get_particle_output_location(); + + /** + * Get the current file index. + */ + const std::string + get_file_index(); + private: /** * Internal index of file output number. diff --git a/include/aspect/particle/output/hdf5.h b/include/aspect/particle/output/hdf5.h index 5dd9c97d7a9..410bbc7965a 100644 --- a/include/aspect/particle/output/hdf5.h +++ b/include/aspect/particle/output/hdf5.h @@ -104,6 +104,24 @@ namespace aspect void load (std::istringstream &is); + /** + * Returns a constructed filename. + */ + const std::string + get_file_name(); + + /** + * Get the absolute path where the specified particle output will be generated. + */ + const std::string + get_particle_output_location(); + + /** + * Get the current file index. + */ + const std::string + get_file_index(); + private: /** * Internal index of file output number. diff --git a/include/aspect/particle/output/interface.h b/include/aspect/particle/output/interface.h index 2b10f5acc74..322526668c3 100644 --- a/include/aspect/particle/output/interface.h +++ b/include/aspect/particle/output/interface.h @@ -85,6 +85,27 @@ namespace aspect const Property::ParticlePropertyInformation &property_information, const double current_time) = 0; + /** + * Returns the particle file name taking into account the file index as well as the mpi proccess. + */ + virtual + const std::string + get_file_name(); + + /** + * Get the absolute path where the specified particle output will be generated. + */ + virtual + const std::string + get_particle_output_location(); + + /** + * Get the current file index. + */ + virtual + const std::string + get_file_index(); + /** * Read or write the data of this object for serialization */ @@ -163,7 +184,7 @@ namespace aspect */ template Interface * - create_particle_output (ParameterHandler &prm); + create_particle_output (const std::string &name); /** * Declare the runtime parameters of the registered particle outputs. @@ -174,6 +195,14 @@ namespace aspect void declare_parameters (ParameterHandler &prm); + /** + * Return a list of names of all implemented output format models, + * separated by '|' so that it can be used in an object of type + * Patterns::Selection. + */ + template + std::string get_names (); + /** * Given a class name, a name, and a description for the parameter file * for a particle output, register it with the functions that @@ -181,6 +210,7 @@ namespace aspect * * @ingroup ParticleOutputs */ + #define ASPECT_REGISTER_PARTICLE_OUTPUT(classname, name, description) \ template class classname<2>; \ template class classname<3>; \ diff --git a/include/aspect/particle/output/vtu.h b/include/aspect/particle/output/vtu.h index aba6775feba..3844ab4625e 100644 --- a/include/aspect/particle/output/vtu.h +++ b/include/aspect/particle/output/vtu.h @@ -100,6 +100,24 @@ namespace aspect void load (std::istringstream &is); + /** + * Returns a constructed filename. + */ + const std::string + get_file_name(); + + /** + * Get the absolute path where the specified particle output will be generated. + */ + const std::string + get_particle_output_location(); + + /** + * Get the current file index. + */ + const std::string + get_file_index(); + private: /** * Internal index of file output number. diff --git a/include/aspect/particle/world.h b/include/aspect/particle/world.h index 1169eea933e..3ef463b4f76 100644 --- a/include/aspect/particle/world.h +++ b/include/aspect/particle/world.h @@ -287,7 +287,7 @@ namespace aspect /** * Pointer to an output object */ - std_cxx11::unique_ptr > output; + std::vector > > output; /** * Set of particles currently in the local domain, organized by diff --git a/source/particle/output/ascii.cc b/source/particle/output/ascii.cc index 3a4684aee2a..f716ebd5690 100644 --- a/source/particle/output/ascii.cc +++ b/source/particle/output/ascii.cc @@ -48,16 +48,8 @@ namespace aspect const Property::ParticlePropertyInformation &property_information, const double /*time*/) { - const std::string output_file_prefix = - this->get_output_directory() - + "particles/" - + "particle-" - + Utilities::int_to_string (file_index, 5); - const std::string full_filename = - output_file_prefix - + "." - + Utilities::int_to_string(Utilities::MPI::this_mpi_process(this->get_mpi_communicator()), 4) - + ".txt"; + const std::string full_filename = get_particle_output_location() + + get_file_name(); std::ofstream output (full_filename.c_str()); @@ -108,7 +100,7 @@ namespace aspect file_index++; - return output_file_prefix; + return "txt"; } template @@ -135,6 +127,32 @@ namespace aspect aspect::iarchive ia (is); ia >> (*this); } + + template + const std::string + ASCIIOutput::get_file_name () + { + return "particles-" + + get_file_index() + + "." + + Utilities::int_to_string(Utilities::MPI::this_mpi_process(this->get_mpi_communicator()), 4) + + ".txt"; + } + + template + const std::string + ASCIIOutput::get_particle_output_location () + { + return this->get_output_directory() + + "particles/"; + } + + template + const std::string + ASCIIOutput::get_file_index () + { + return Utilities::int_to_string(file_index, 5); + } } } } diff --git a/source/particle/output/hdf5.cc b/source/particle/output/hdf5.cc index 3f0690edfad..e294c918554 100644 --- a/source/particle/output/hdf5.cc +++ b/source/particle/output/hdf5.cc @@ -78,12 +78,8 @@ namespace aspect { #ifdef DEAL_II_WITH_HDF5 // Create the filename - const std::string output_file_prefix = "particles-" + Utilities::int_to_string (file_index, 5); - const std::string output_path_prefix = - this->get_output_directory() - + "particles/" - + output_file_prefix; - const std::string h5_filename = output_path_prefix+".h5"; + const std::string h5_filename = get_particle_output_location() + + get_file_name(); // Create the hdf5 output size information types::particle_index n_local_particles = particles.size(); @@ -258,10 +254,8 @@ namespace aspect // Record and output XDMF info on root process if (Utilities::MPI::this_mpi_process(this->get_mpi_communicator()) == 0) { - const std::string local_h5_filename = - "particles/" - + output_file_prefix - + ".h5"; + const std::string local_h5_filename = "particles/" + + get_file_name(); XDMFEntry entry(local_h5_filename, current_time, n_global_particles, 0, 3); DataOut data_out; const std::string xdmf_filename = (this->get_output_directory() + "particles.xdmf"); @@ -288,7 +282,7 @@ namespace aspect file_index++; - return output_path_prefix; + return "h5"; #else (void) property_information; (void) particles; @@ -323,6 +317,30 @@ namespace aspect aspect::iarchive ia (is); ia >> (*this); } + + template + const std::string + HDF5Output::get_file_name () + { + return "particles-" + + get_file_index() + + ".h5"; + } + + template + const std::string + HDF5Output::get_particle_output_location() + { + return this->get_output_directory() + + "particles/"; + } + + template + const std::string + HDF5Output::get_file_index() + { + return Utilities::int_to_string (file_index, 5); + } } } } diff --git a/source/particle/output/interface.cc b/source/particle/output/interface.cc index 4a46b560c96..58e9fc33432 100644 --- a/source/particle/output/interface.cc +++ b/source/particle/output/interface.cc @@ -18,6 +18,8 @@ . */ + + #include @@ -61,6 +63,29 @@ namespace aspect Interface::load (std::istringstream &) {} + template + const std::string + Interface::get_file_name() + { + // To prevent warning statement during compilation + return ""; + } + + template + const std::string + Interface::get_particle_output_location() + { + // To prevent warning statement during compilation + return ""; + } + + template + const std::string + Interface::get_file_index() + { + // To prevent warning statement during compilation + return ""; + } // -------------------------------- Deal with registering models and automating // -------------------------------- their setup and selection at run time @@ -92,27 +117,22 @@ namespace aspect template Interface * - create_particle_output (ParameterHandler &prm) + create_particle_output (const std::string &name) { - std::string name; - prm.enter_subsection ("Postprocess"); - { - prm.enter_subsection ("Particles"); - { - name = prm.get ("Data output format"); - } - prm.leave_subsection (); - } - prm.leave_subsection (); - if (name != "none") - return std_cxx1x::get(registered_plugins).create_plugin (name, - "Particle::Output name"); - else - return NULL; - } + Interface *output + = std_cxx1x::get(registered_plugins).create_plugin (name, + "Particle::Output name"); + return output; + } + template + std::string + get_names() + { + return std_cxx11::get(registered_plugins).get_pattern_of_names (); + } template void @@ -127,11 +147,12 @@ namespace aspect = std_cxx1x::get(registered_plugins).get_pattern_of_names (); prm.declare_entry ("Data output format", "vtu", - Patterns::Selection (pattern_of_names + "|none"), + Patterns::List (Patterns::Selection(pattern_of_names + "|none")), "File format to output raw particle data in. " + "Multiple formats can be specified sperated by a comma (,)" "If you select 'none' no output will be " "written." - "Select one of the following models:\n\n" + "Select one or multiple of the following models:\n\n" + std_cxx1x::get(registered_plugins).get_description_string()); } @@ -181,7 +202,7 @@ namespace aspect \ template \ Interface * \ - create_particle_output (ParameterHandler &prm); + create_particle_output (const std::string &name); ASPECT_INSTANTIATE(INSTANTIATE) } diff --git a/source/particle/output/vtu.cc b/source/particle/output/vtu.cc index dffce2727dd..3d14369bb04 100644 --- a/source/particle/output/vtu.cc +++ b/source/particle/output/vtu.cc @@ -50,17 +50,8 @@ namespace aspect const double current_time) { const std::string output_file_prefix = "particles-" + Utilities::int_to_string (file_index, 5); - const std::string output_path_prefix = this->get_output_directory() - + "particles/" - + output_file_prefix; - - const std::string filename = (output_file_prefix + - "." + - Utilities::int_to_string(Utilities::MPI::this_mpi_process(this->get_mpi_communicator()), 4) + - ".vtu"); - const std::string full_filename = this->get_output_directory() - + "particles/" - + filename; + const std::string full_filename = get_particle_output_location() + + get_file_name(); std::ofstream output (full_filename.c_str()); AssertThrow (output, ExcIO()); @@ -183,8 +174,7 @@ namespace aspect if (Utilities::MPI::this_mpi_process(this->get_mpi_communicator()) == 0) { const std::string pvtu_filename = (output_file_prefix + ".pvtu"); - const std::string full_pvtu_filename = this->get_output_directory() - + "particles/" + const std::string full_pvtu_filename = get_particle_output_location() + pvtu_filename; std::ofstream pvtu_output (full_pvtu_filename.c_str()); @@ -250,7 +240,7 @@ namespace aspect } file_index++; - return output_path_prefix; + return "vtu"; } template @@ -279,6 +269,32 @@ namespace aspect aspect::iarchive ia (is); ia >> (*this); } + + template + const std::string + VTUOutput::get_file_name() + { + return "particles-" + + get_file_index() + + "." + + Utilities::int_to_string(Utilities::MPI::this_mpi_process(this->get_mpi_communicator()), 4) + + ".vtu"; + } + + template + const std::string + VTUOutput::get_particle_output_location() + { + return this->get_output_directory() + + "particles/"; + } + + template + const std::string + VTUOutput::get_file_index() + { + return Utilities::int_to_string (file_index, 5); + } } } } diff --git a/source/particle/world.cc b/source/particle/world.cc index 4b6c51d6f7a..ac0356d7eff 100644 --- a/source/particle/world.cc +++ b/source/particle/world.cc @@ -158,7 +158,7 @@ namespace aspect { // If we do not write output // return early with the number of particles that were advected - if (!output) + if (output.empty()) return ""; TimerOutput::Scope timer_section(this->get_computing_timer(), "Particles: Output"); @@ -166,11 +166,28 @@ namespace aspect this->get_time() / year_in_seconds : this->get_time()); - const std::string filename = output->output_particle_data(particles, - property_manager->get_data_info(), - output_time); + std::vector output_suffixes; - return filename; + const std::string output_directory = output[0].get()->get_particle_output_location(); + const std::string file_index = output[0].get()->get_file_index(); + + for ( typename std::vector > >::const_iterator itr= output.begin(); itr != output.end(); itr++) + { + output_suffixes.push_back((itr->get()->output_particle_data(particles, + property_manager->get_data_info(), + output_time))); + } + + std::string output_formats; + for ( std::vector::const_iterator itr = output_suffixes.begin(); itr != output_suffixes.end(); itr++) + output_formats += *itr + ","; + // Remove tailing comma. + output_formats = output_formats.substr(0, output_formats.size()-1); + + if (output_suffixes.size() > 1) + return output_directory + "particles-" + file_index + ".{" + output_formats + "}"; + else + return output_directory + "particles-" + file_index + "." + output_formats; } template @@ -1517,7 +1534,9 @@ namespace aspect { aspect::oarchive oa (os); oa << (*this); - output->save(os); + + for ( typename std::vector > >::const_iterator itr= output.begin(); itr != output.end(); itr++) + itr->get()->save(os); } template @@ -1526,7 +1545,9 @@ namespace aspect { aspect::iarchive ia (is); ia >> (*this); - output->load(is); + + for ( typename std::vector > >::const_iterator itr= output.begin(); itr != output.end(); itr++) + itr->get()->load(is); } template @@ -1611,6 +1632,10 @@ namespace aspect const double CFL_number = prm.get_double ("CFL number"); const unsigned int n_processes = Utilities::MPI::n_mpi_processes(this->get_mpi_communicator()); + // The variable will contain the user specified output formats that + // the particle data will be outputted as. + std::vector output_format_names; + AssertThrow((n_processes == 1) || (CFL_number <= 1.0), ExcMessage("The current particle algorithm does not work in " "parallel if the CFL number is larger than 1.0, because " @@ -1666,6 +1691,7 @@ namespace aspect "are listed in the corresponding manual subsection.")); } + output_format_names = Utilities::split_string_list(prm.get ("Data output format")); } prm.leave_subsection (); } @@ -1680,18 +1706,32 @@ namespace aspect generator->parse_parameters(prm); generator->initialize(); - // Create an output object depending on what the parameters specify - output.reset(Output::create_particle_output - (prm)); - - // We allow to not generate any output plugin, in which case output is - // a null pointer. Only initialize output if it was created. - if (output) + // Remove duplicate output formats specified in the parameter file. + auto last = std::unique(output_format_names.begin(), output_format_names.end()); + output_format_names.erase(last, output_format_names.end()); + + // Create an output object depending on what the parameters specify so long as none has not been specified. + // If none and more than one other format is specified, then we ignore none. + AssertThrow ((std::find (output_format_names.begin(), + output_format_names.end(), + "none") == output_format_names.end()) + || + (output_format_names.size() == 1), + ExcMessage ("If you specify 'none' for the output format for parameter \"Data output format\"," + "then this needs to be the only value given.")); + + if (output_format_names.size() != 1 || output_format_names[0] != "none") + for (std::vector::const_iterator itr = output_format_names.begin(); + itr != output_format_names.end(); itr++) + output.push_back(std_cxx11::shared_ptr> + (Output::create_particle_output(*itr))); + + for ( typename std::vector > >::iterator itr = output.begin(); itr != output.end(); itr++) { - if (SimulatorAccess *sim = dynamic_cast*>(output.get())) - sim->initialize_simulator (this->get_simulator()); - output->parse_parameters(prm); - output->initialize(); + if (SimulatorAccess *sim = dynamic_cast *>(itr->get())) + sim->initialize_simulator(this->get_simulator()); + itr->get()->parse_parameters(prm); + itr->get()->initialize(); } // Create an integrator object depending on the specified parameter diff --git a/source/postprocess/particles.cc b/source/postprocess/particles.cc index 46f1266ce6c..48854032753 100644 --- a/source/postprocess/particles.cc +++ b/source/postprocess/particles.cc @@ -102,24 +102,21 @@ namespace aspect return std::make_pair("Number of advected particles:", Utilities::int_to_string(world.n_global_particles())); - if (world.get_property_manager().need_update() == Particle::Property::update_output_step) world.update_particles(); set_last_output_time (this->get_time()); - const std::string data_file_name = world.generate_output(); + const std::string data_file_names = world.generate_output(); // If we do not write output return early with the number of particles // that were advected - if (data_file_name == "") + if (data_file_names.empty()) return std::make_pair("Number of advected particles:", Utilities::int_to_string(world.n_global_particles())); - // record the file base file name in the output file - statistics.add_value ("Particle file name", - this->get_output_directory() + data_file_name); - return std::make_pair("Writing particle output:", data_file_name); + statistics.add_value ("Particle file name(s)", data_file_names); + return std::make_pair("Writing particle output:", data_file_names); } diff --git a/tests/composition_passive_particles/screen-output b/tests/composition_passive_particles/screen-output index cb1adfbd038..cf850226d6e 100644 --- a/tests/composition_passive_particles/screen-output +++ b/tests/composition_passive_particles/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00000 - Writing particle output: output-composition_passive_particles/particles/particles-00000 + Writing particle output: output-composition_passive_particles/particles/particles-00000.vtu *** Timestep 1: t=0.0625 seconds Solving temperature system... 10 iterations. @@ -32,7 +32,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00001 - Writing particle output: output-composition_passive_particles/particles/particles-00001 + Writing particle output: output-composition_passive_particles/particles/particles-00001.vtu *** Timestep 3: t=0.1875 seconds Solving temperature system... 10 iterations. @@ -53,7 +53,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00002 - Writing particle output: output-composition_passive_particles/particles/particles-00002 + Writing particle output: output-composition_passive_particles/particles/particles-00002.vtu *** Timestep 5: t=0.3125 seconds Solving temperature system... 10 iterations. @@ -64,7 +64,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00003 - Writing particle output: output-composition_passive_particles/particles/particles-00003 + Writing particle output: output-composition_passive_particles/particles/particles-00003.vtu *** Timestep 6: t=0.375 seconds Solving temperature system... 9 iterations. @@ -85,7 +85,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00004 - Writing particle output: output-composition_passive_particles/particles/particles-00004 + Writing particle output: output-composition_passive_particles/particles/particles-00004.vtu *** Timestep 8: t=0.5 seconds Solving temperature system... 10 iterations. @@ -96,7 +96,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00005 - Writing particle output: output-composition_passive_particles/particles/particles-00005 + Writing particle output: output-composition_passive_particles/particles/particles-00005.vtu *** Timestep 9: t=0.5625 seconds Solving temperature system... 10 iterations. @@ -117,7 +117,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00006 - Writing particle output: output-composition_passive_particles/particles/particles-00006 + Writing particle output: output-composition_passive_particles/particles/particles-00006.vtu *** Timestep 11: t=0.6875 seconds Solving temperature system... 10 iterations. @@ -138,7 +138,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00007 - Writing particle output: output-composition_passive_particles/particles/particles-00007 + Writing particle output: output-composition_passive_particles/particles/particles-00007.vtu *** Timestep 13: t=0.8125 seconds Solving temperature system... 10 iterations. @@ -149,7 +149,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00008 - Writing particle output: output-composition_passive_particles/particles/particles-00008 + Writing particle output: output-composition_passive_particles/particles/particles-00008.vtu *** Timestep 14: t=0.875 seconds Solving temperature system... 10 iterations. @@ -170,7 +170,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00009 - Writing particle output: output-composition_passive_particles/particles/particles-00009 + Writing particle output: output-composition_passive_particles/particles/particles-00009.vtu *** Timestep 16: t=1 seconds Solving temperature system... 10 iterations. @@ -181,7 +181,7 @@ Number of degrees of freedom: 1,526 (578+81+289+289+289) Postprocessing: Writing graphical output: output-composition_passive_particles/solution/solution-00010 - Writing particle output: output-composition_passive_particles/particles/particles-00010 + Writing particle output: output-composition_passive_particles/particles/particles-00010.vtu Termination requested by criterion: end time diff --git a/tests/composition_passive_particles/statistics b/tests/composition_passive_particles/statistics index 16f37a5ed58..d8259507fba 100644 --- a/tests/composition_passive_particles/statistics +++ b/tests/composition_passive_particles/statistics @@ -13,21 +13,21 @@ # 13: Schur complement iterations in Stokes preconditioner # 14: Visualization file name # 15: Number of advected particles -# 16: Particle file name - 0 0.000000000000e+00 0.000000000000e+00 64 659 289 578 0 0 0 22 23 23 output-composition_passive_particles/solution/solution-00000 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00000 - 1 6.250000000000e-02 6.250000000000e-02 64 659 289 578 10 10 11 12 13 13 "" 10 "" - 2 1.250000000000e-01 6.250000000000e-02 64 659 289 578 10 11 10 22 23 23 output-composition_passive_particles/solution/solution-00001 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00001 - 3 1.875000000000e-01 6.250000000000e-02 64 659 289 578 10 12 11 22 23 23 "" 10 "" - 4 2.500000000000e-01 6.250000000000e-02 64 659 289 578 10 11 11 22 23 23 output-composition_passive_particles/solution/solution-00002 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00002 - 5 3.125000000000e-01 6.250000000000e-02 64 659 289 578 10 11 11 22 23 23 output-composition_passive_particles/solution/solution-00003 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00003 - 6 3.750000000000e-01 6.250000000000e-02 64 659 289 578 9 11 10 22 23 23 "" 10 "" - 7 4.375000000000e-01 6.250000000000e-02 64 659 289 578 10 11 10 22 23 23 output-composition_passive_particles/solution/solution-00004 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00004 - 8 5.000000000000e-01 6.250000000000e-02 64 659 289 578 10 10 11 22 23 23 output-composition_passive_particles/solution/solution-00005 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00005 - 9 5.625000000000e-01 6.250000000000e-02 64 659 289 578 10 10 10 22 23 23 "" 10 "" -10 6.250000000000e-01 6.250000000000e-02 64 659 289 578 10 10 10 22 23 23 output-composition_passive_particles/solution/solution-00006 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00006 -11 6.875000000000e-01 6.250000000000e-02 64 659 289 578 10 10 10 22 23 23 "" 10 "" -12 7.500000000000e-01 6.250000000000e-02 64 659 289 578 11 11 11 22 23 23 output-composition_passive_particles/solution/solution-00007 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00007 -13 8.125000000000e-01 6.250000000000e-02 64 659 289 578 10 10 10 10 11 11 output-composition_passive_particles/solution/solution-00008 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00008 -14 8.750000000000e-01 6.250000000000e-02 64 659 289 578 10 10 10 9 10 10 "" 10 "" -15 9.375000000000e-01 6.250000000000e-02 64 659 289 578 10 10 9 8 9 9 output-composition_passive_particles/solution/solution-00009 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00009 -16 1.000000000000e+00 6.250000000000e-02 64 659 289 578 10 10 10 9 10 10 output-composition_passive_particles/solution/solution-00010 10 output-composition_passive_particles/output-composition_passive_particles/particles/particles-00010 +# 16: Particle file name(s) + 0 0.000000000000e+00 0.000000000000e+00 64 659 289 578 0 0 0 22 23 23 output-composition_passive_particles/solution/solution-00000 10 output-composition_passive_particles/particles/particles-00000.vtu + 1 6.250000000000e-02 6.250000000000e-02 64 659 289 578 10 10 11 12 13 13 "" 10 "" + 2 1.250000000000e-01 6.250000000000e-02 64 659 289 578 10 11 10 22 23 23 output-composition_passive_particles/solution/solution-00001 10 output-composition_passive_particles/particles/particles-00001.vtu + 3 1.875000000000e-01 6.250000000000e-02 64 659 289 578 10 12 11 22 23 23 "" 10 "" + 4 2.500000000000e-01 6.250000000000e-02 64 659 289 578 10 11 11 22 23 23 output-composition_passive_particles/solution/solution-00002 10 output-composition_passive_particles/particles/particles-00002.vtu + 5 3.125000000000e-01 6.250000000000e-02 64 659 289 578 10 11 11 22 23 23 output-composition_passive_particles/solution/solution-00003 10 output-composition_passive_particles/particles/particles-00003.vtu + 6 3.750000000000e-01 6.250000000000e-02 64 659 289 578 9 11 10 22 23 23 "" 10 "" + 7 4.375000000000e-01 6.250000000000e-02 64 659 289 578 10 11 10 22 23 23 output-composition_passive_particles/solution/solution-00004 10 output-composition_passive_particles/particles/particles-00004.vtu + 8 5.000000000000e-01 6.250000000000e-02 64 659 289 578 10 10 11 22 23 23 output-composition_passive_particles/solution/solution-00005 10 output-composition_passive_particles/particles/particles-00005.vtu + 9 5.625000000000e-01 6.250000000000e-02 64 659 289 578 10 10 10 22 23 23 "" 10 "" +10 6.250000000000e-01 6.250000000000e-02 64 659 289 578 10 10 10 22 23 23 output-composition_passive_particles/solution/solution-00006 10 output-composition_passive_particles/particles/particles-00006.vtu +11 6.875000000000e-01 6.250000000000e-02 64 659 289 578 10 10 10 22 23 23 "" 10 "" +12 7.500000000000e-01 6.250000000000e-02 64 659 289 578 11 11 11 22 23 23 output-composition_passive_particles/solution/solution-00007 10 output-composition_passive_particles/particles/particles-00007.vtu +13 8.125000000000e-01 6.250000000000e-02 64 659 289 578 10 10 10 10 11 11 output-composition_passive_particles/solution/solution-00008 10 output-composition_passive_particles/particles/particles-00008.vtu +14 8.750000000000e-01 6.250000000000e-02 64 659 289 578 10 10 10 9 10 10 "" 10 "" +15 9.375000000000e-01 6.250000000000e-02 64 659 289 578 10 10 9 8 9 9 output-composition_passive_particles/solution/solution-00009 10 output-composition_passive_particles/particles/particles-00009.vtu +16 1.000000000000e+00 6.250000000000e-02 64 659 289 578 10 10 10 9 10 10 output-composition_passive_particles/solution/solution-00010 10 output-composition_passive_particles/particles/particles-00010.vtu diff --git a/tests/particle_generator_ascii/screen-output b/tests/particle_generator_ascii/screen-output index 90318dcf9cd..1930e0f2b26 100644 --- a/tests/particle_generator_ascii/screen-output +++ b/tests/particle_generator_ascii/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_generator_ascii/particles/particles-00000 + Writing particle output: output-particle_generator_ascii/particles/particles-00000.vtu *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000728 m/s Compositions min/max/mass: -0.002207/1.002/0.1825 - Writing particle output: output-particle_generator_ascii/particles/particles-00001 + Writing particle output: output-particle_generator_ascii/particles/particles-00001.vtu Termination requested by criterion: end time diff --git a/tests/particle_generator_ascii/statistics b/tests/particle_generator_ascii/statistics index cf177a93566..2ba20f8b056 100644 --- a/tests/particle_generator_ascii/statistics +++ b/tests/particle_generator_ascii/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 204 1.81487741e-04 4.04466705e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 2 output-particle_generator_ascii/output-particle_generator_ascii/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 18 33 34 203 3.27312912e-04 7.27581707e-04 -2.20654267e-03 1.00187358e+00 1.82473299e-01 2 output-particle_generator_ascii/output-particle_generator_ascii/particles/particles-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 204 1.81487741e-04 4.04466705e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 2 output-particle_generator_ascii/particles/particles-00000.vtu +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 18 33 34 203 3.27312912e-04 7.27581707e-04 -2.20654267e-03 1.00187358e+00 1.82473299e-01 2 output-particle_generator_ascii/particles/particles-00001.vtu diff --git a/tests/particle_generator_box/screen-output b/tests/particle_generator_box/screen-output index 85071544832..76a2d708a80 100644 --- a/tests/particle_generator_box/screen-output +++ b/tests/particle_generator_box/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_generator_box/particles/particles-00000 + Writing particle output: output-particle_generator_box/particles/particles-00000.vtu *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000728 m/s Compositions min/max/mass: -0.002207/1.002/0.1825 - Writing particle output: output-particle_generator_box/particles/particles-00001 + Writing particle output: output-particle_generator_box/particles/particles-00001.vtu Termination requested by criterion: end time diff --git a/tests/particle_generator_box/statistics b/tests/particle_generator_box/statistics index a3f06f8deba..d42d722f256 100644 --- a/tests/particle_generator_box/statistics +++ b/tests/particle_generator_box/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 9 output-particle_generator_box/output-particle_generator_box/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 3.27312911e-04 7.27581702e-04 -2.20654271e-03 1.00187358e+00 1.82473299e-01 9 output-particle_generator_box/output-particle_generator_box/particles/particles-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 9 output-particle_generator_box/particles/particles-00000.vtu +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 3.27312911e-04 7.27581702e-04 -2.20654271e-03 1.00187358e+00 1.82473299e-01 9 output-particle_generator_box/particles/particles-00001.vtu diff --git a/tests/particle_generator_box_3d/particles/particle-00000.0000.txt b/tests/particle_generator_box_3d/particles/particles-00000.0000.txt similarity index 100% rename from tests/particle_generator_box_3d/particles/particle-00000.0000.txt rename to tests/particle_generator_box_3d/particles/particles-00000.0000.txt diff --git a/tests/particle_generator_box_3d/particles/particle-00001.0000.txt b/tests/particle_generator_box_3d/particles/particles-00001.0000.txt similarity index 100% rename from tests/particle_generator_box_3d/particles/particle-00001.0000.txt rename to tests/particle_generator_box_3d/particles/particles-00001.0000.txt diff --git a/tests/particle_generator_box_3d/screen-output b/tests/particle_generator_box_3d/screen-output index 3fbdf385795..2eb34e90cbc 100644 --- a/tests/particle_generator_box_3d/screen-output +++ b/tests/particle_generator_box_3d/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 3,770 (2,187+125+729+729) Postprocessing: RMS, max velocity: 0.000133 m/s, 0.000329 m/s Compositions min/max/mass: 0/1/0.2092 - Writing particle output: output-particle_generator_box_3d/particles/particle-00000 + Writing particle output: output-particle_generator_box_3d/particles/particles-00000.txt *** Timestep 1: t=10 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 3,770 (2,187+125+729+729) Postprocessing: RMS, max velocity: 0.000135 m/s, 0.000332 m/s Compositions min/max/mass: -0.01188/1.004/0.2077 - Writing particle output: output-particle_generator_box_3d/particles/particle-00001 + Writing particle output: output-particle_generator_box_3d/particles/particles-00001.txt Termination requested by criterion: end time diff --git a/tests/particle_generator_box_3d/statistics b/tests/particle_generator_box_3d/statistics index 97a7e2fe942..68d42f62497 100644 --- a/tests/particle_generator_box_3d/statistics +++ b/tests/particle_generator_box_3d/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 64 2312 729 729 0 0 30 31 30 1.33396575e-04 3.28761678e-04 0.00000000e+00 1.00000000e+00 2.09224301e-01 40 output-particle_generator_box_3d/output-particle_generator_box_3d/particles/particle-00000 -1 1.000000000000e+01 1.000000000000e+01 64 2312 729 729 0 11 26 27 27 1.35483537e-04 3.32391551e-04 -1.18774181e-02 1.00447226e+00 2.07680080e-01 40 output-particle_generator_box_3d/output-particle_generator_box_3d/particles/particle-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 64 2312 729 729 0 0 30 31 30 1.33396575e-04 3.28761678e-04 0.00000000e+00 1.00000000e+00 2.09224301e-01 40 output-particle_generator_box_3d/particles/particles-00000.txt +1 1.000000000000e+01 1.000000000000e+01 64 2312 729 729 0 11 26 27 27 1.35483537e-04 3.32391551e-04 -1.18774181e-02 1.00447226e+00 2.07680080e-01 40 output-particle_generator_box_3d/particles/particles-00001.txt diff --git a/tests/particle_generator_quadrature_points/log.txt b/tests/particle_generator_quadrature_points/log.txt index 3823bea0dbe..8af1da80b6c 100644 --- a/tests/particle_generator_quadrature_points/log.txt +++ b/tests/particle_generator_quadrature_points/log.txt @@ -11,7 +11,7 @@ Number of degrees of freedom: 349 (162+25+81+81) Postprocessing: RMS, max velocity: 0.000133 m/s, 0.000331 m/s Compositions min/max/mass: 0/1/0.1914 - Writing particle output: output-particle_generator_quadrature_points/particles/particle-00000 + Writing particle output: output-particle_generator_quadrature_points/particles/particles-00000.txt Termination requested by criterion: end time diff --git a/tests/particle_generator_quadrature_points/particles/particle-00000.0000.txt b/tests/particle_generator_quadrature_points/particles/particles-00000.0000.txt similarity index 100% rename from tests/particle_generator_quadrature_points/particles/particle-00000.0000.txt rename to tests/particle_generator_quadrature_points/particles/particles-00000.0000.txt diff --git a/tests/particle_generator_quadrature_points/particles/particle-00000.0001.txt b/tests/particle_generator_quadrature_points/particles/particles-00000.0001.txt similarity index 100% rename from tests/particle_generator_quadrature_points/particles/particle-00000.0001.txt rename to tests/particle_generator_quadrature_points/particles/particles-00000.0001.txt diff --git a/tests/particle_generator_quadrature_points/statistics b/tests/particle_generator_quadrature_points/statistics index f74d3179ed6..e48146f54d5 100644 --- a/tests/particle_generator_quadrature_points/statistics +++ b/tests/particle_generator_quadrature_points/statistics @@ -16,5 +16,5 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 60 1.33268179e-04 3.31044348e-04 0.00000000e+00 1.00000000e+00 1.91399339e-01 144 output-particle_generator_quadrature_points/output-particle_generator_quadrature_points/particles/particle-00000 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 60 1.33268179e-04 3.31044348e-04 0.00000000e+00 1.00000000e+00 1.91399339e-01 144 output-particle_generator_quadrature_points/particles/particles-00000.txt diff --git a/tests/particle_generator_radial/screen-output b/tests/particle_generator_radial/screen-output index 107616412a3..f5c7dd74e40 100644 --- a/tests/particle_generator_radial/screen-output +++ b/tests/particle_generator_radial/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_generator_radial/particles/particles-00000 + Writing particle output: output-particle_generator_radial/particles/particles-00000.vtu *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000728 m/s Compositions min/max/mass: -0.002207/1.002/0.1825 - Writing particle output: output-particle_generator_radial/particles/particles-00001 + Writing particle output: output-particle_generator_radial/particles/particles-00001.vtu Termination requested by criterion: end time diff --git a/tests/particle_generator_radial/statistics b/tests/particle_generator_radial/statistics index 054d6232fe2..dab2f27b26d 100644 --- a/tests/particle_generator_radial/statistics +++ b/tests/particle_generator_radial/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 11 output-particle_generator_radial/output-particle_generator_radial/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 3.27312911e-04 7.27581702e-04 -2.20654271e-03 1.00187358e+00 1.82473299e-01 11 output-particle_generator_radial/output-particle_generator_radial/particles/particles-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 11 output-particle_generator_radial/particles/particles-00000.vtu +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 3.27312911e-04 7.27581702e-04 -2.20654271e-03 1.00187358e+00 1.82473299e-01 11 output-particle_generator_radial/particles/particles-00001.vtu diff --git a/tests/particle_generator_reference_cell/log.txt b/tests/particle_generator_reference_cell/log.txt index 47e04aa18dd..3d0d6fcf38c 100644 --- a/tests/particle_generator_reference_cell/log.txt +++ b/tests/particle_generator_reference_cell/log.txt @@ -11,7 +11,7 @@ Number of degrees of freedom: 349 (162+25+81+81) Postprocessing: RMS, max velocity: 0.000133 m/s, 0.000331 m/s Compositions min/max/mass: 0/1/0.1914 - Writing particle output: output-particle_generator_reference_cell/particles/particle-00000 + Writing particle output: output-particle_generator_reference_cell/particles/particles-00000.txt Termination requested by criterion: end time diff --git a/tests/particle_generator_reference_cell/particles/particle-00000.0000.txt b/tests/particle_generator_reference_cell/particles/particles-00000.0000.txt similarity index 100% rename from tests/particle_generator_reference_cell/particles/particle-00000.0000.txt rename to tests/particle_generator_reference_cell/particles/particles-00000.0000.txt diff --git a/tests/particle_generator_reference_cell/particles/particle-00000.0001.txt b/tests/particle_generator_reference_cell/particles/particles-00000.0001.txt similarity index 100% rename from tests/particle_generator_reference_cell/particles/particle-00000.0001.txt rename to tests/particle_generator_reference_cell/particles/particles-00000.0001.txt diff --git a/tests/particle_generator_reference_cell/statistics b/tests/particle_generator_reference_cell/statistics index 554c0c1558b..9a26c65860a 100644 --- a/tests/particle_generator_reference_cell/statistics +++ b/tests/particle_generator_reference_cell/statistics @@ -16,5 +16,5 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 60 1.33268179e-04 3.31044348e-04 0.00000000e+00 1.00000000e+00 1.91399339e-01 256 output-particle_generator_reference_cell/output-particle_generator_reference_cell/particles/particle-00000 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 60 1.33268179e-04 3.31044348e-04 0.00000000e+00 1.00000000e+00 1.91399339e-01 256 output-particle_generator_reference_cell/particles/particles-00000.txt diff --git a/tests/particle_initial_adaptive_output/particles/particle-00001.0000.txt b/tests/particle_initial_adaptive_output/particles/particles-00001.0000.txt similarity index 100% rename from tests/particle_initial_adaptive_output/particles/particle-00001.0000.txt rename to tests/particle_initial_adaptive_output/particles/particles-00001.0000.txt diff --git a/tests/particle_initial_adaptive_output/screen-output b/tests/particle_initial_adaptive_output/screen-output index 2a8379a0d2a..51b059b914d 100644 --- a/tests/particle_initial_adaptive_output/screen-output +++ b/tests/particle_initial_adaptive_output/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 349 (162+25+81+81) Postprocessing: RMS, max velocity: 0.000133 m/s, 0.000331 m/s Compositions min/max/mass: 0/1/0.1914 - Writing particle output: output-particle_initial_adaptive_output/particles/particle-00000 + Writing particle output: output-particle_initial_adaptive_output/particles/particles-00000.txt Number of active cells: 22 (on 4 levels) Number of degrees of freedom: 490 (228+34+114+114) @@ -49,7 +49,7 @@ Number of degrees of freedom: 673 (314+45+157+157) Postprocessing: RMS, max velocity: 0.000294 m/s, 0.000754 m/s Compositions min/max/mass: -0.03271/1.126/0.1805 - Writing particle output: output-particle_initial_adaptive_output/particles/particle-00001 + Writing particle output: output-particle_initial_adaptive_output/particles/particles-00001.txt Termination requested by criterion: end time diff --git a/tests/particle_initial_adaptive_output/statistics b/tests/particle_initial_adaptive_output/statistics index fe875d2e93c..74597df9dd6 100644 --- a/tests/particle_initial_adaptive_output/statistics +++ b/tests/particle_initial_adaptive_output/statistics @@ -16,8 +16,8 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 20 1.33268179e-04 3.31044348e-04 0.00000000e+00 1.00000000e+00 1.91399339e-01 9 output-particle_initial_adaptive_output/output-particle_initial_adaptive_output/particles/particle-00000 -0 0.000000000000e+00 0.000000000000e+00 22 262 114 114 0 0 24 25 96 1.88354432e-04 5.22667993e-04 -2.04424004e-04 1.12309321e+00 1.84641134e-01 9 "" -0 0.000000000000e+00 0.000000000000e+00 31 359 157 157 0 0 25 26 100 2.00599771e-04 5.05391243e-04 -3.37085547e-03 1.12152823e+00 1.83635165e-01 9 "" -1 7.000000000000e+01 7.000000000000e+01 31 359 157 157 0 10 24 25 100 2.93570080e-04 7.53816301e-04 -3.27113474e-02 1.12566651e+00 1.80515275e-01 9 output-particle_initial_adaptive_output/output-particle_initial_adaptive_output/particles/particle-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 20 1.33268179e-04 3.31044348e-04 0.00000000e+00 1.00000000e+00 1.91399339e-01 9 output-particle_initial_adaptive_output/particles/particles-00000.txt +0 0.000000000000e+00 0.000000000000e+00 22 262 114 114 0 0 24 25 96 1.88354431e-04 5.22667990e-04 -2.04424004e-04 1.12309321e+00 1.84641134e-01 9 "" +0 0.000000000000e+00 0.000000000000e+00 31 359 157 157 0 0 25 26 100 2.00599771e-04 5.05391242e-04 -3.37085547e-03 1.12152823e+00 1.83635165e-01 9 "" +1 7.000000000000e+01 7.000000000000e+01 31 359 157 157 0 10 24 25 100 2.93570080e-04 7.53816301e-04 -3.27113474e-02 1.12566651e+00 1.80515275e-01 9 output-particle_initial_adaptive_output/particles/particles-00001.txt diff --git a/tests/particle_integrator_euler/screen-output b/tests/particle_integrator_euler/screen-output index af63bb0c708..bd9d685df07 100644 --- a/tests/particle_integrator_euler/screen-output +++ b/tests/particle_integrator_euler/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_integrator_euler/particles/particles-00000 + Writing particle output: output-particle_integrator_euler/particles/particles-00000.vtu *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000728 m/s Compositions min/max/mass: -0.002207/1.002/0.1825 - Writing particle output: output-particle_integrator_euler/particles/particles-00001 + Writing particle output: output-particle_integrator_euler/particles/particles-00001.vtu Termination requested by criterion: end time diff --git a/tests/particle_integrator_euler/statistics b/tests/particle_integrator_euler/statistics index c4457651d41..c3210cb2427 100644 --- a/tests/particle_integrator_euler/statistics +++ b/tests/particle_integrator_euler/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-particle_integrator_euler/output-particle_integrator_euler/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 3.27312911e-04 7.27581702e-04 -2.20654271e-03 1.00187358e+00 1.82473299e-01 10 output-particle_integrator_euler/output-particle_integrator_euler/particles/particles-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-particle_integrator_euler/particles/particles-00000.vtu +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 3.27312911e-04 7.27581702e-04 -2.20654271e-03 1.00187358e+00 1.82473299e-01 10 output-particle_integrator_euler/particles/particles-00001.vtu diff --git a/tests/particle_integrator_rk4/screen-output b/tests/particle_integrator_rk4/screen-output index f4562093c17..152adc1b271 100644 --- a/tests/particle_integrator_rk4/screen-output +++ b/tests/particle_integrator_rk4/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_integrator_rk4/particles/particles-00000 + Writing particle output: output-particle_integrator_rk4/particles/particles-00000.vtu *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000728 m/s Compositions min/max/mass: -0.002207/1.002/0.1825 - Writing particle output: output-particle_integrator_rk4/particles/particles-00001 + Writing particle output: output-particle_integrator_rk4/particles/particles-00001.vtu Termination requested by criterion: end time diff --git a/tests/particle_integrator_rk4/statistics b/tests/particle_integrator_rk4/statistics index 5fd94059331..76776674c35 100644 --- a/tests/particle_integrator_rk4/statistics +++ b/tests/particle_integrator_rk4/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-particle_integrator_rk4/output-particle_integrator_rk4/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 3.27312911e-04 7.27581702e-04 -2.20654271e-03 1.00187358e+00 1.82473299e-01 10 output-particle_integrator_rk4/output-particle_integrator_rk4/particles/particles-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-particle_integrator_rk4/particles/particles-00000.vtu +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 3.27312911e-04 7.27581702e-04 -2.20654271e-03 1.00187358e+00 1.82473299e-01 10 output-particle_integrator_rk4/particles/particles-00001.vtu diff --git a/tests/particle_linear_accelerated_flow_rk2/particles/particle-00000.0000.txt b/tests/particle_linear_accelerated_flow_rk2/particles/particles-00000.0000.txt similarity index 100% rename from tests/particle_linear_accelerated_flow_rk2/particles/particle-00000.0000.txt rename to tests/particle_linear_accelerated_flow_rk2/particles/particles-00000.0000.txt diff --git a/tests/particle_linear_accelerated_flow_rk2/particles/particle-00001.0000.txt b/tests/particle_linear_accelerated_flow_rk2/particles/particles-00001.0000.txt similarity index 100% rename from tests/particle_linear_accelerated_flow_rk2/particles/particle-00001.0000.txt rename to tests/particle_linear_accelerated_flow_rk2/particles/particles-00001.0000.txt diff --git a/tests/particle_linear_accelerated_flow_rk2/screen-output b/tests/particle_linear_accelerated_flow_rk2/screen-output index 6df63e2c2b2..3fa5e28eae3 100644 --- a/tests/particle_linear_accelerated_flow_rk2/screen-output +++ b/tests/particle_linear_accelerated_flow_rk2/screen-output @@ -7,14 +7,14 @@ Number of degrees of freedom: 31 (18+4+9) Postprocessing: RMS, max velocity: 0.1 m/s, 0.1 m/s - Writing particle output: output-particle_linear_accelerated_flow_rk2/particles/particle-00000 + Writing particle output: output-particle_linear_accelerated_flow_rk2/particles/particles-00000.txt *** Timestep 1: t=1 seconds Skipping temperature solve because RHS is zero. Postprocessing: RMS, max velocity: 1.1 m/s, 1.1 m/s - Writing particle output: output-particle_linear_accelerated_flow_rk2/particles/particle-00001 + Writing particle output: output-particle_linear_accelerated_flow_rk2/particles/particles-00001.txt Termination requested by criterion: end time diff --git a/tests/particle_linear_accelerated_flow_rk2/statistics b/tests/particle_linear_accelerated_flow_rk2/statistics index 8847409a0bb..e0e33b4ade6 100644 --- a/tests/particle_linear_accelerated_flow_rk2/statistics +++ b/tests/particle_linear_accelerated_flow_rk2/statistics @@ -8,6 +8,6 @@ # 8: RMS velocity (m/s) # 9: Max. velocity (m/s) # 10: Number of advected particles -# 11: Particle file name -0 0.000000000000e+00 0.000000000000e+00 1 22 9 0 1.00000000e-01 1.00000000e-01 1 output-particle_linear_accelerated_flow_rk2/output-particle_linear_accelerated_flow_rk2/particles/particle-00000 -1 1.000000000000e+00 1.000000000000e+00 1 22 9 0 1.10000000e+00 1.10000000e+00 1 output-particle_linear_accelerated_flow_rk2/output-particle_linear_accelerated_flow_rk2/particles/particle-00001 +# 11: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 1 22 9 0 1.00000000e-01 1.00000000e-01 1 output-particle_linear_accelerated_flow_rk2/particles/particles-00000.txt +1 1.000000000000e+00 1.000000000000e+00 1 22 9 0 1.10000000e+00 1.10000000e+00 1 output-particle_linear_accelerated_flow_rk2/particles/particles-00001.txt diff --git a/tests/particle_load_balancing_refinement/screen-output b/tests/particle_load_balancing_refinement/screen-output index ec82932d5a1..7e3a59decd0 100644 --- a/tests/particle_load_balancing_refinement/screen-output +++ b/tests/particle_load_balancing_refinement/screen-output @@ -9,7 +9,7 @@ Number of degrees of freedom: 1,237 (578+81+289+289) Solving Stokes system... 24+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_refinement/particles/particle-00000 + Writing particle output: output-particle_load_balancing_refinement/particles/particles-00000.txt Number of active cells: 25 (on 4 levels) Number of degrees of freedom: 554 (258+38+129+129) @@ -21,7 +21,7 @@ Number of degrees of freedom: 554 (258+38+129+129) Solving Stokes system... 24+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_refinement/particles/particle-00001 + Writing particle output: output-particle_load_balancing_refinement/particles/particles-00001.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) diff --git a/tests/particle_load_balancing_refinement/statistics b/tests/particle_load_balancing_refinement/statistics index 9e529c85ddf..1eceb6775d5 100644 --- a/tests/particle_load_balancing_refinement/statistics +++ b/tests/particle_load_balancing_refinement/statistics @@ -11,6 +11,6 @@ # 11: Velocity iterations in Stokes preconditioner # 12: Schur complement iterations in Stokes preconditioner # 13: Number of advected particles -# 14: Particle file name -0 0.000000000000e+00 0.000000000000e+00 64 659 289 289 0 0 24 25 24 10 output-particle_load_balancing_refinement/output-particle_load_balancing_refinement/particles/particle-00000 -1 1.000000000000e+02 1.000000000000e+02 25 296 129 129 0 10 24 25 93 10 output-particle_load_balancing_refinement/output-particle_load_balancing_refinement/particles/particle-00001 +# 14: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 64 659 289 289 0 0 24 25 24 10 output-particle_load_balancing_refinement/particles/particles-00000.txt +1 1.000000000000e+02 1.000000000000e+02 25 296 129 129 0 10 24 25 93 10 output-particle_load_balancing_refinement/particles/particles-00001.txt diff --git a/tests/particle_load_balancing_refinement_02/screen-output b/tests/particle_load_balancing_refinement_02/screen-output index b3d507418bf..92ca76dcfb0 100644 --- a/tests/particle_load_balancing_refinement_02/screen-output +++ b/tests/particle_load_balancing_refinement_02/screen-output @@ -9,7 +9,7 @@ Number of degrees of freedom: 1,237 (578+81+289+289) Solving Stokes system... 24+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_refinement_02/particles/particle-00000 + Writing particle output: output-particle_load_balancing_refinement_02/particles/particles-00000.txt Number of active cells: 25 (on 4 levels) Number of degrees of freedom: 554 (258+38+129+129) @@ -21,7 +21,7 @@ Number of degrees of freedom: 554 (258+38+129+129) Solving Stokes system... 24+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_refinement_02/particles/particle-00001 + Writing particle output: output-particle_load_balancing_refinement_02/particles/particles-00001.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) @@ -33,7 +33,7 @@ Number of degrees of freedom: 246 (114+18+57+57) Solving Stokes system... 24+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_refinement_02/particles/particle-00002 + Writing particle output: output-particle_load_balancing_refinement_02/particles/particles-00002.txt Number of active cells: 16 (on 4 levels) Number of degrees of freedom: 391 (182+27+91+91) @@ -45,7 +45,7 @@ Number of degrees of freedom: 391 (182+27+91+91) Solving Stokes system... 24+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_refinement_02/particles/particle-00003 + Writing particle output: output-particle_load_balancing_refinement_02/particles/particles-00003.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) @@ -57,7 +57,7 @@ Number of degrees of freedom: 246 (114+18+57+57) Solving Stokes system... 22+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_refinement_02/particles/particle-00004 + Writing particle output: output-particle_load_balancing_refinement_02/particles/particles-00004.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) @@ -69,7 +69,7 @@ Number of degrees of freedom: 246 (114+18+57+57) Solving Stokes system... 23+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_refinement_02/particles/particle-00005 + Writing particle output: output-particle_load_balancing_refinement_02/particles/particles-00005.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) diff --git a/tests/particle_load_balancing_refinement_02/statistics b/tests/particle_load_balancing_refinement_02/statistics index ac4669b55a2..397a8c949af 100644 --- a/tests/particle_load_balancing_refinement_02/statistics +++ b/tests/particle_load_balancing_refinement_02/statistics @@ -11,10 +11,10 @@ # 11: Velocity iterations in Stokes preconditioner # 12: Schur complement iterations in Stokes preconditioner # 13: Number of advected particles -# 14: Particle file name -0 0.000000000000e+00 0.000000000000e+00 64 659 289 289 0 0 24 25 24 10 output-particle_load_balancing_refinement_02/output-particle_load_balancing_refinement_02/particles/particle-00000 -1 1.008967269522e+02 1.008967269522e+02 25 296 129 129 0 10 24 25 93 10 output-particle_load_balancing_refinement_02/output-particle_load_balancing_refinement_02/particles/particle-00001 -2 2.744184569823e+02 1.735217300301e+02 10 132 57 57 0 9 24 25 100 10 output-particle_load_balancing_refinement_02/output-particle_load_balancing_refinement_02/particles/particle-00002 -3 3.822474882325e+02 1.078290312503e+02 16 209 91 91 0 10 24 25 110 10 output-particle_load_balancing_refinement_02/output-particle_load_balancing_refinement_02/particles/particle-00003 -4 4.427290900083e+02 6.048160177580e+01 10 132 57 57 0 9 22 23 92 10 output-particle_load_balancing_refinement_02/output-particle_load_balancing_refinement_02/particles/particle-00004 -5 5.000000000000e+02 5.727090999165e+01 10 132 57 57 0 9 23 24 96 10 output-particle_load_balancing_refinement_02/output-particle_load_balancing_refinement_02/particles/particle-00005 +# 14: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 64 659 289 289 0 0 24 25 24 10 output-particle_load_balancing_refinement_02/particles/particles-00000.txt +1 1.008967269545e+02 1.008967269545e+02 25 296 129 129 0 10 24 25 93 10 output-particle_load_balancing_refinement_02/particles/particles-00001.txt +2 2.744184569869e+02 1.735217300324e+02 10 132 57 57 0 9 24 25 100 10 output-particle_load_balancing_refinement_02/particles/particles-00002.txt +3 3.822474882500e+02 1.078290312631e+02 16 209 91 91 0 10 24 25 110 10 output-particle_load_balancing_refinement_02/particles/particles-00003.txt +4 4.427290900341e+02 6.048160178405e+01 10 132 57 57 0 9 22 23 92 10 output-particle_load_balancing_refinement_02/particles/particles-00004.txt +5 5.000000000000e+02 5.727090996594e+01 10 132 57 57 0 9 23 24 96 10 output-particle_load_balancing_refinement_02/particles/particles-00005.txt diff --git a/tests/particle_load_balancing_removal/particles/particle-00001.0000.txt b/tests/particle_load_balancing_removal/particles/particles-00001.0000.txt similarity index 100% rename from tests/particle_load_balancing_removal/particles/particle-00001.0000.txt rename to tests/particle_load_balancing_removal/particles/particles-00001.0000.txt diff --git a/tests/particle_load_balancing_removal/screen-output b/tests/particle_load_balancing_removal/screen-output index 6fd5acdd962..7b25b013f24 100644 --- a/tests/particle_load_balancing_removal/screen-output +++ b/tests/particle_load_balancing_removal/screen-output @@ -9,7 +9,7 @@ Number of degrees of freedom: 349 (162+25+81+81) Solving Stokes system... 20+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_removal/particles/particle-00000 + Writing particle output: output-particle_load_balancing_removal/particles/particles-00000.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) @@ -21,7 +21,7 @@ Number of degrees of freedom: 246 (114+18+57+57) Solving Stokes system... 19+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_removal/particles/particle-00001 + Writing particle output: output-particle_load_balancing_removal/particles/particles-00001.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) diff --git a/tests/particle_load_balancing_removal/statistics b/tests/particle_load_balancing_removal/statistics index ac53d9c2db2..2e886d98a21 100644 --- a/tests/particle_load_balancing_removal/statistics +++ b/tests/particle_load_balancing_removal/statistics @@ -11,6 +11,6 @@ # 11: Velocity iterations in Stokes preconditioner # 12: Schur complement iterations in Stokes preconditioner # 13: Number of advected particles -# 14: Particle file name -0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 20 98 output-particle_load_balancing_removal/output-particle_load_balancing_removal/particles/particle-00000 -1 1.000000000000e+02 1.000000000000e+02 10 132 57 57 0 8 19 20 60 67 output-particle_load_balancing_removal/output-particle_load_balancing_removal/particles/particle-00001 +# 14: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 20 98 output-particle_load_balancing_removal/particles/particles-00000.txt +1 1.000000000000e+02 1.000000000000e+02 10 132 57 57 0 8 19 20 60 67 output-particle_load_balancing_removal/particles/particles-00001.txt diff --git a/tests/particle_load_balancing_removal_addition/particles/particle-00001.0000.txt b/tests/particle_load_balancing_removal_addition/particles/particles-00001.0000.txt similarity index 100% rename from tests/particle_load_balancing_removal_addition/particles/particle-00001.0000.txt rename to tests/particle_load_balancing_removal_addition/particles/particles-00001.0000.txt diff --git a/tests/particle_load_balancing_removal_addition/screen-output b/tests/particle_load_balancing_removal_addition/screen-output index 0022fb3860d..925deff0d4e 100644 --- a/tests/particle_load_balancing_removal_addition/screen-output +++ b/tests/particle_load_balancing_removal_addition/screen-output @@ -9,7 +9,7 @@ Number of degrees of freedom: 349 (162+25+81+81) Solving Stokes system... 20+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_removal_addition/particles/particle-00000 + Writing particle output: output-particle_load_balancing_removal_addition/particles/particles-00000.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) @@ -21,7 +21,7 @@ Number of degrees of freedom: 246 (114+18+57+57) Solving Stokes system... 19+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_removal_addition/particles/particle-00001 + Writing particle output: output-particle_load_balancing_removal_addition/particles/particles-00001.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) diff --git a/tests/particle_load_balancing_removal_addition/statistics b/tests/particle_load_balancing_removal_addition/statistics index e5d7c22ffcc..48d66eef56b 100644 --- a/tests/particle_load_balancing_removal_addition/statistics +++ b/tests/particle_load_balancing_removal_addition/statistics @@ -11,6 +11,6 @@ # 11: Velocity iterations in Stokes preconditioner # 12: Schur complement iterations in Stokes preconditioner # 13: Number of advected particles -# 14: Particle file name -0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 20 104 output-particle_load_balancing_removal_addition/output-particle_load_balancing_removal_addition/particles/particle-00000 -1 1.000000000000e+02 1.000000000000e+02 10 132 57 57 0 8 19 20 60 72 output-particle_load_balancing_removal_addition/output-particle_load_balancing_removal_addition/particles/particle-00001 +# 14: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 20 104 output-particle_load_balancing_removal_addition/particles/particles-00000.txt +1 1.000000000000e+02 1.000000000000e+02 10 132 57 57 0 8 19 20 60 72 output-particle_load_balancing_removal_addition/particles/particles-00001.txt diff --git a/tests/particle_load_balancing_removal_addition_properties/particles/particle-00001.0000.txt b/tests/particle_load_balancing_removal_addition_properties/particles/particles-00001.0000.txt similarity index 100% rename from tests/particle_load_balancing_removal_addition_properties/particles/particle-00001.0000.txt rename to tests/particle_load_balancing_removal_addition_properties/particles/particles-00001.0000.txt diff --git a/tests/particle_load_balancing_removal_addition_properties/screen-output b/tests/particle_load_balancing_removal_addition_properties/screen-output index 691aa062ed2..6c32c5c79cd 100644 --- a/tests/particle_load_balancing_removal_addition_properties/screen-output +++ b/tests/particle_load_balancing_removal_addition_properties/screen-output @@ -9,7 +9,7 @@ Number of degrees of freedom: 349 (162+25+81+81) Solving Stokes system... 20+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_removal_addition_properties/particles/particle-00000 + Writing particle output: output-particle_load_balancing_removal_addition_properties/particles/particles-00000.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) @@ -45,7 +45,7 @@ Number of degrees of freedom: 246 (114+18+57+57) Solving Stokes system... 18+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_removal_addition_properties/particles/particle-00001 + Writing particle output: output-particle_load_balancing_removal_addition_properties/particles/particles-00001.txt Number of active cells: 10 (on 3 levels) Number of degrees of freedom: 246 (114+18+57+57) diff --git a/tests/particle_load_balancing_removal_addition_properties/statistics b/tests/particle_load_balancing_removal_addition_properties/statistics index 70eecdd45e0..8cb6d81ec5b 100644 --- a/tests/particle_load_balancing_removal_addition_properties/statistics +++ b/tests/particle_load_balancing_removal_addition_properties/statistics @@ -11,8 +11,8 @@ # 11: Velocity iterations in Stokes preconditioner # 12: Schur complement iterations in Stokes preconditioner # 13: Number of advected particles -# 14: Particle file name -0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 20 104 output-particle_load_balancing_removal_addition_properties/output-particle_load_balancing_removal_addition_properties/particles/particle-00000 -1 2.484857051185e+02 2.484857051185e+02 10 132 57 57 0 9 21 22 66 71 "" -2 4.467714923784e+02 1.982857872599e+02 10 132 57 57 0 8 19 20 60 72 "" -3 5.000000000000e+02 5.322850762156e+01 10 132 57 57 0 7 18 19 57 73 output-particle_load_balancing_removal_addition_properties/output-particle_load_balancing_removal_addition_properties/particles/particle-00001 +# 14: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 16 187 81 81 0 0 20 21 20 104 output-particle_load_balancing_removal_addition_properties/particles/particles-00000.txt +1 2.484857051215e+02 2.484857051215e+02 10 132 57 57 0 9 21 22 66 71 "" +2 4.467714923795e+02 1.982857872579e+02 10 132 57 57 0 8 19 20 60 72 "" +3 5.000000000000e+02 5.322850762053e+01 10 132 57 57 0 7 18 19 57 73 output-particle_load_balancing_removal_addition_properties/particles/particles-00001.txt diff --git a/tests/particle_output_hdf5/screen-output b/tests/particle_output_hdf5/screen-output index 33020482975..8453da2744c 100644 --- a/tests/particle_output_hdf5/screen-output +++ b/tests/particle_output_hdf5/screen-output @@ -9,7 +9,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Solving Stokes system... 33+0 iterations. Postprocessing: - Writing particle output: output-particle_output_hdf5/particles/particles-00000 + Writing particle output: output-particle_output_hdf5/particles/particles-00000.h5 *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -17,7 +17,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Solving Stokes system... 32+0 iterations. Postprocessing: - Writing particle output: output-particle_output_hdf5/particles/particles-00001 + Writing particle output: output-particle_output_hdf5/particles/particles-00001.h5 Termination requested by criterion: end time diff --git a/tests/particle_output_hdf5/statistics b/tests/particle_output_hdf5/statistics index 8e79f6c9ad6..bb0970dcc79 100644 --- a/tests/particle_output_hdf5/statistics +++ b/tests/particle_output_hdf5/statistics @@ -11,6 +11,6 @@ # 11: Velocity iterations in Stokes preconditioner # 12: Schur complement iterations in Stokes preconditioner # 13: Number of advected particles -# 14: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 33 34 99 10 output-particle_output_hdf5/output-particle_output_hdf5/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 16 32 33 99 10 output-particle_output_hdf5/output-particle_output_hdf5/particles/particles-00001 +# 14: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 33 34 99 10 output-particle_output_hdf5/particles/particles-00000.h5 +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 16 32 33 99 10 output-particle_output_hdf5/particles/particles-00001.h5 diff --git a/tests/particle_output_multiple_formats.prm b/tests/particle_output_multiple_formats.prm new file mode 100644 index 00000000000..d941a4f3306 --- /dev/null +++ b/tests/particle_output_multiple_formats.prm @@ -0,0 +1,118 @@ +# A simple test that checks for multiple output options (ascii, vtu, hdf5) for particles. + +# MPI: 1 + +set Dimension = 2 +set End time = 70 +set Use years in output instead of seconds = false + +subsection Geometry model + set Model name = box + subsection Box + set X extent = 0.9142 + set Y extent = 1.0000 + end +end + +subsection Model settings + set Include adiabatic heating = false + set Include shear heating = false + set Tangential velocity boundary indicators = left, right + set Zero velocity boundary indicators = bottom, top +end + +subsection Material model + set Model name = simple + subsection Simple model + set Reference density = 1010 + set Viscosity = 1e2 + set Thermal expansion coefficient = 0 + end +end + +subsection Gravity model + set Model name = vertical + subsection Vertical + set Magnitude = 10 + end +end + + +############### Parameters describing the temperature field +# Note: The temperature plays no role in this model + +subsection Boundary temperature model + set Model name = box +end + +subsection Initial temperature model + set Model name = function + subsection Function + set Function expression = 0 + end +end + + +############### Parameters describing the compositional field +# Note: The compositional field is what drives the flow +# in this example + +subsection Compositional fields + set Number of fields = 1 +end + +subsection Initial composition model + set Model name = function + subsection Function + set Variable names = x,z + set Function constants = pi=3.1415926 + set Function expression = 0.5*(1+tanh((0.2+0.02*cos(pi*x/0.9142)-z)/0.02)) + end +end + +subsection Material model + subsection Simple model + set Density differential for compositional field 1 = -10 + end +end + + +############### Parameters describing the discretization + +subsection Mesh refinement + set Initial adaptive refinement = 0 + set Strategy = composition + set Initial global refinement = 4 + set Time steps between mesh refinement = 0 + set Coarsening fraction = 0.05 + set Refinement fraction = 0.3 +end + +############### Parameters describing what to do with the solution + +subsection Postprocess + set List of postprocessors = particles + + subsection Particles + set Number of particles = 16 + set Time between data output = 70 + set Data output format = ascii, vtu, hdf5 + set List of particle properties = function, initial composition, initial position + + subsection Function + set Variable names = x,z + set Function expression = if( (z>0.2+0.02*cos(pi*x/0.9142)) , 0 , 1 ) + end + + set Particle generator name = uniform box + + subsection Generator + subsection Uniform box + set Minimum x = 0.3 + set Maximum x = 0.5 + set Minimum y = 0.1 + set Maximum y = 0.3 + end + end + end +end diff --git a/tests/particle_output_multiple_formats/particles.pvd b/tests/particle_output_multiple_formats/particles.pvd new file mode 100644 index 00000000000..65939569a67 --- /dev/null +++ b/tests/particle_output_multiple_formats/particles.pvd @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/tests/particle_output_multiple_formats/particles.xdmf b/tests/particle_output_multiple_formats/particles.xdmf new file mode 100644 index 00000000000..99d2f0c8f6a --- /dev/null +++ b/tests/particle_output_multiple_formats/particles.xdmf @@ -0,0 +1,68 @@ + + + + + + + + + + + + diff --git a/tests/particle_output_multiple_formats/particles/particles-00000.0000.txt b/tests/particle_output_multiple_formats/particles/particles-00000.0000.txt new file mode 100644 index 00000000000..ab463935094 --- /dev/null +++ b/tests/particle_output_multiple_formats/particles/particles-00000.0000.txt @@ -0,0 +1,17 @@ +# position[0] position[1] id function initial C_1 initial position[0] initial position[1] +0.3 0.1 0 1 0.999984 0.3 0.1 +0.366667 0.1 4 1 0.999975 0.366667 0.1 +0.433333 0.1 8 1 0.999961 0.433333 0.1 +0.3 0.166667 1 1 0.9874 0.3 0.166667 +0.3 0.233333 2 0 0.0906855 0.3 0.233333 +0.366667 0.166667 5 1 0.981015 0.366667 0.166667 +0.433333 0.166667 9 1 0.970588 0.433333 0.166667 +0.366667 0.233333 6 0 0.0617019 0.366667 0.233333 +0.433333 0.233333 10 0 0.0403039 0.433333 0.233333 +0.3 0.3 3 0 0.000126903 0.3 0.3 +0.366667 0.3 7 0 8.36807e-05 0.366667 0.3 +0.433333 0.3 11 0 5.34433e-05 0.433333 0.3 +0.5 0.1 12 1 0.999939 0.5 0.1 +0.5 0.166667 13 1 0.954329 0.5 0.166667 +0.5 0.233333 14 0 0.025904 0.5 0.233333 +0.5 0.3 15 0 3.38418e-05 0.5 0.3 diff --git a/tests/particle_output_multiple_formats/particles/particles-00000.0000.vtu b/tests/particle_output_multiple_formats/particles/particles-00000.0000.vtu new file mode 100644 index 00000000000..102ba667ade --- /dev/null +++ b/tests/particle_output_multiple_formats/particles/particles-00000.0000.vtu @@ -0,0 +1,157 @@ + + + + + + + 0.3 0.1 0.0 + 0.366667 0.1 0.0 + 0.433333 0.1 0.0 + 0.3 0.166667 0.0 + 0.3 0.233333 0.0 + 0.366667 0.166667 0.0 + 0.433333 0.166667 0.0 + 0.366667 0.233333 0.0 + 0.433333 0.233333 0.0 + 0.3 0.3 0.0 + 0.366667 0.3 0.0 + 0.433333 0.3 0.0 + 0.5 0.1 0.0 + 0.5 0.166667 0.0 + 0.5 0.233333 0.0 + 0.5 0.3 0.0 + + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + + + 0 + 4 + 8 + 1 + 2 + 5 + 9 + 6 + 10 + 3 + 7 + 11 + 12 + 13 + 14 + 15 + + + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + + + 0.999984 + 0.999975 + 0.999961 + 0.9874 + 0.0906855 + 0.981015 + 0.970588 + 0.0617019 + 0.0403039 + 0.000126903 + 8.36807e-05 + 5.34433e-05 + 0.999939 + 0.954329 + 0.025904 + 3.38418e-05 + + + 0.3 0.1 0 + 0.366667 0.1 0 + 0.433333 0.1 0 + 0.3 0.166667 0 + 0.3 0.233333 0 + 0.366667 0.166667 0 + 0.433333 0.166667 0 + 0.366667 0.233333 0 + 0.433333 0.233333 0 + 0.3 0.3 0 + 0.366667 0.3 0 + 0.433333 0.3 0 + 0.5 0.1 0 + 0.5 0.166667 0 + 0.5 0.233333 0 + 0.5 0.3 0 + + + + + diff --git a/tests/particle_output_multiple_formats/particles/particles-00000.h5 b/tests/particle_output_multiple_formats/particles/particles-00000.h5 new file mode 100644 index 00000000000..7627a1bc367 Binary files /dev/null and b/tests/particle_output_multiple_formats/particles/particles-00000.h5 differ diff --git a/tests/particle_output_multiple_formats/particles/particles-00000.pvtu b/tests/particle_output_multiple_formats/particles/particles-00000.pvtu new file mode 100644 index 00000000000..5d123907cba --- /dev/null +++ b/tests/particle_output_multiple_formats/particles/particles-00000.pvtu @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/tests/particle_output_multiple_formats/particles/particles-00001.0000.txt b/tests/particle_output_multiple_formats/particles/particles-00001.0000.txt new file mode 100644 index 00000000000..f3d5adee82c --- /dev/null +++ b/tests/particle_output_multiple_formats/particles/particles-00001.0000.txt @@ -0,0 +1,17 @@ +# position[0] position[1] id function initial C_1 initial position[0] initial position[1] +0.265344 0.103332 0 1 0.999984 0.3 0.1 +0.329755 0.10115 4 1 0.999975 0.366667 0.1 +0.39636 0.0992927 8 1 0.999961 0.433333 0.1 +0.265214 0.173929 1 1 0.9874 0.3 0.166667 +0.329738 0.169027 5 1 0.981015 0.366667 0.166667 +0.280115 0.241376 2 0 0.0906855 0.3 0.233333 +0.39653 0.164903 9 1 0.970588 0.433333 0.166667 +0.345146 0.23483 6 0 0.0617019 0.366667 0.233333 +0.411465 0.229477 10 0 0.0403039 0.433333 0.233333 +0.295704 0.310186 3 0 0.000126903 0.3 0.3 +0.360976 0.302879 7 0 8.36807e-05 0.366667 0.3 +0.426544 0.296614 11 0 5.34433e-05 0.433333 0.3 +0.464798 0.097824 12 1 0.999939 0.5 0.1 +0.465163 0.161715 13 1 0.954329 0.5 0.166667 +0.479016 0.225469 14 0 0.025904 0.5 0.233333 +0.492695 0.291577 15 0 3.38418e-05 0.5 0.3 diff --git a/tests/particle_output_multiple_formats/particles/particles-00001.0000.vtu b/tests/particle_output_multiple_formats/particles/particles-00001.0000.vtu new file mode 100644 index 00000000000..35637a1f922 --- /dev/null +++ b/tests/particle_output_multiple_formats/particles/particles-00001.0000.vtu @@ -0,0 +1,157 @@ + + + + + + + 0.265344 0.103332 0.0 + 0.329755 0.10115 0.0 + 0.39636 0.0992927 0.0 + 0.265214 0.173929 0.0 + 0.329738 0.169027 0.0 + 0.280115 0.241376 0.0 + 0.39653 0.164903 0.0 + 0.345146 0.23483 0.0 + 0.411465 0.229477 0.0 + 0.295704 0.310186 0.0 + 0.360976 0.302879 0.0 + 0.426544 0.296614 0.0 + 0.464798 0.097824 0.0 + 0.465163 0.161715 0.0 + 0.479016 0.225469 0.0 + 0.492695 0.291577 0.0 + + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + + + 0 + 4 + 8 + 1 + 5 + 2 + 9 + 6 + 10 + 3 + 7 + 11 + 12 + 13 + 14 + 15 + + + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + + + 0.999984 + 0.999975 + 0.999961 + 0.9874 + 0.981015 + 0.0906855 + 0.970588 + 0.0617019 + 0.0403039 + 0.000126903 + 8.36807e-05 + 5.34433e-05 + 0.999939 + 0.954329 + 0.025904 + 3.38418e-05 + + + 0.3 0.1 0 + 0.366667 0.1 0 + 0.433333 0.1 0 + 0.3 0.166667 0 + 0.366667 0.166667 0 + 0.3 0.233333 0 + 0.433333 0.166667 0 + 0.366667 0.233333 0 + 0.433333 0.233333 0 + 0.3 0.3 0 + 0.366667 0.3 0 + 0.433333 0.3 0 + 0.5 0.1 0 + 0.5 0.166667 0 + 0.5 0.233333 0 + 0.5 0.3 0 + + + + + diff --git a/tests/particle_output_multiple_formats/particles/particles-00001.h5 b/tests/particle_output_multiple_formats/particles/particles-00001.h5 new file mode 100644 index 00000000000..4e8be21fb7d Binary files /dev/null and b/tests/particle_output_multiple_formats/particles/particles-00001.h5 differ diff --git a/tests/particle_output_multiple_formats/particles/particles-00001.pvtu b/tests/particle_output_multiple_formats/particles/particles-00001.pvtu new file mode 100644 index 00000000000..ea70f3f8baf --- /dev/null +++ b/tests/particle_output_multiple_formats/particles/particles-00001.pvtu @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/tests/particle_output_multiple_formats/screen-output b/tests/particle_output_multiple_formats/screen-output new file mode 100644 index 00000000000..1c31dc2f75a --- /dev/null +++ b/tests/particle_output_multiple_formats/screen-output @@ -0,0 +1,28 @@ + +Number of active cells: 256 (on 5 levels) +Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) + +*** Timestep 0: t=0 seconds + Skipping temperature solve because RHS is zero. + Solving C_1 system ... 0 iterations. + Rebuilding Stokes preconditioner... + Solving Stokes system... 34+0 iterations. + + Postprocessing: + Writing particle output: output-particle_output_multiple_formats/particles/particles-00000.{txt,vtu,h5} + +*** Timestep 1: t=70 seconds + Skipping temperature solve because RHS is zero. + Solving C_1 system ... 14 iterations. + Solving Stokes system... 34+0 iterations. + + Postprocessing: + Writing particle output: output-particle_output_multiple_formats/particles/particles-00001.{txt,vtu,h5} + +Termination requested by criterion: end time + + ++---------------------------------------------+------------+------------+ ++---------------------------------+-----------+------------+------------+ ++---------------------------------+-----------+------------+------------+ + diff --git a/tests/particle_output_multiple_formats/statistics b/tests/particle_output_multiple_formats/statistics new file mode 100755 index 00000000000..ba35de9c16e --- /dev/null +++ b/tests/particle_output_multiple_formats/statistics @@ -0,0 +1,16 @@ +# 1: Time step number +# 2: Time (seconds) +# 3: Time step size (seconds) +# 4: Number of mesh cells +# 5: Number of Stokes degrees of freedom +# 6: Number of temperature degrees of freedom +# 7: Number of degrees of freedom for all compositions +# 8: Iterations for temperature solver +# 9: Iterations for composition solver 1 +# 10: Iterations for Stokes solver +# 11: Velocity iterations in Stokes preconditioner +# 12: Schur complement iterations in Stokes preconditioner +# 13: Number of advected particles +# 14: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 16 output-particle_output_multiple_formats/particles/particles-00000.{txt,vtu,h5} +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 16 output-particle_output_multiple_formats/particles/particles-00001.{txt,vtu,h5} diff --git a/tests/particle_periodic_boundaries/screen-output b/tests/particle_periodic_boundaries/screen-output index 04310275879..7a2b23ee4ba 100644 --- a/tests/particle_periodic_boundaries/screen-output +++ b/tests/particle_periodic_boundaries/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000155 m/s, 0.000382 m/s Compositions min/max/mass: 0/1/0.1821 - Writing particle output: output-particle_periodic_boundaries/particles/particles-00000 + Writing particle output: output-particle_periodic_boundaries/particles/particles-00000.vtu *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000341 m/s, 0.000841 m/s Compositions min/max/mass: -0.003566/1.005/0.1821 - Writing particle output: output-particle_periodic_boundaries/particles/particles-00001 + Writing particle output: output-particle_periodic_boundaries/particles/particles-00001.vtu Termination requested by criterion: end time diff --git a/tests/particle_periodic_boundaries/statistics b/tests/particle_periodic_boundaries/statistics index 67f628b10b8..90ec76c4530 100644 --- a/tests/particle_periodic_boundaries/statistics +++ b/tests/particle_periodic_boundaries/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 239 1.54661470e-04 3.81585753e-04 0.00000000e+00 1.00000000e+00 1.82080183e-01 10 output-particle_periodic_boundaries/output-particle_periodic_boundaries/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 252 3.41092015e-04 8.41016587e-04 -3.56591222e-03 1.00494083e+00 1.82097735e-01 10 output-particle_periodic_boundaries/output-particle_periodic_boundaries/particles/particles-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 239 1.54661470e-04 3.81585753e-04 0.00000000e+00 1.00000000e+00 1.82080183e-01 10 output-particle_periodic_boundaries/particles/particles-00000.vtu +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 252 3.41092015e-04 8.41016587e-04 -3.56591222e-03 1.00494083e+00 1.82097735e-01 10 output-particle_periodic_boundaries/particles/particles-00001.vtu diff --git a/tests/particle_property_function/screen-output b/tests/particle_property_function/screen-output index fe7b0b39b7a..8075db56a8f 100644 --- a/tests/particle_property_function/screen-output +++ b/tests/particle_property_function/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_property_function/particles/particles-00000 + Writing particle output: output-particle_property_function/particles/particles-00000.vtu *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000728 m/s Compositions min/max/mass: -0.002207/1.002/0.1825 - Writing particle output: output-particle_property_function/particles/particles-00001 + Writing particle output: output-particle_property_function/particles/particles-00001.vtu Termination requested by criterion: end time diff --git a/tests/particle_property_function/statistics b/tests/particle_property_function/statistics index da6196ccafb..a1569acdf7e 100644 --- a/tests/particle_property_function/statistics +++ b/tests/particle_property_function/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 33 34 99 1.81487743e-04 4.04466707e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-particle_property_function/output-particle_property_function/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 16 32 33 99 3.27312912e-04 7.27581703e-04 -2.20654270e-03 1.00187358e+00 1.82473299e-01 10 output-particle_property_function/output-particle_property_function/particles/particles-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 33 34 99 1.81487743e-04 4.04466707e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-particle_property_function/particles/particles-00000.vtu +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 16 32 33 99 3.27312912e-04 7.27581703e-04 -2.20654270e-03 1.00187358e+00 1.82473299e-01 10 output-particle_property_function/particles/particles-00001.vtu diff --git a/tests/particle_property_initial_composition/screen-output b/tests/particle_property_initial_composition/screen-output index 948284c6dcb..5ac4e134c0e 100644 --- a/tests/particle_property_initial_composition/screen-output +++ b/tests/particle_property_initial_composition/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_property_initial_composition/particles/particles-00000 + Writing particle output: output-particle_property_initial_composition/particles/particles-00000.vtu *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000728 m/s Compositions min/max/mass: -0.002207/1.002/0.1825 - Writing particle output: output-particle_property_initial_composition/particles/particles-00001 + Writing particle output: output-particle_property_initial_composition/particles/particles-00001.vtu Termination requested by criterion: end time diff --git a/tests/particle_property_initial_composition/statistics b/tests/particle_property_initial_composition/statistics index 9c6f62a7297..8de23f4ba52 100644 --- a/tests/particle_property_initial_composition/statistics +++ b/tests/particle_property_initial_composition/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition anomaly # 17: Global mass for composition anomaly # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 33 34 99 1.81487743e-04 4.04466707e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-particle_property_initial_composition/output-particle_property_initial_composition/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 16 32 33 99 3.27312912e-04 7.27581703e-04 -2.20654270e-03 1.00187358e+00 1.82473299e-01 10 output-particle_property_initial_composition/output-particle_property_initial_composition/particles/particles-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 33 34 99 1.81487743e-04 4.04466707e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-particle_property_initial_composition/particles/particles-00000.vtu +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 16 32 33 99 3.27312912e-04 7.27581703e-04 -2.20654270e-03 1.00187358e+00 1.82473299e-01 10 output-particle_property_initial_composition/particles/particles-00001.vtu diff --git a/tests/particle_property_integrated_strain_invariant/particles/particle-00000.0000.txt b/tests/particle_property_integrated_strain_invariant/particles/particles-00000.0000.txt similarity index 100% rename from tests/particle_property_integrated_strain_invariant/particles/particle-00000.0000.txt rename to tests/particle_property_integrated_strain_invariant/particles/particles-00000.0000.txt diff --git a/tests/particle_property_integrated_strain_invariant/particles/particle-00001.0000.txt b/tests/particle_property_integrated_strain_invariant/particles/particles-00001.0000.txt similarity index 100% rename from tests/particle_property_integrated_strain_invariant/particles/particle-00001.0000.txt rename to tests/particle_property_integrated_strain_invariant/particles/particles-00001.0000.txt diff --git a/tests/particle_property_integrated_strain_invariant/screen-output b/tests/particle_property_integrated_strain_invariant/screen-output index 55a1c8d3079..3ca1a21fbbf 100644 --- a/tests/particle_property_integrated_strain_invariant/screen-output +++ b/tests/particle_property_integrated_strain_invariant/screen-output @@ -1,5 +1,3 @@ ------------------------------------------------------------------------------ ------------------------------------------------------------------------------ Number of active cells: 100 (on 1 levels) Number of degrees of freedom: 1,444 (882+121+441) @@ -12,7 +10,7 @@ Number of degrees of freedom: 1,444 (882+121+441) Postprocessing: - Writing particle output: output-particle_property_integrated_strain_invariant/particles/particle-00000 + Writing particle output: output-particle_property_integrated_strain_invariant/particles/particles-00000.txt @@ -24,10 +22,10 @@ Number of degrees of freedom: 1,444 (882+121+441) Solving temperature system... 0 iterations. Rebuilding Stokes preconditioner... Solving Stokes system... 0+0 iterations. - Relative Stokes residual after nonlinear iteration 1: 5.22529e-15 + Relative Stokes residual after nonlinear iteration 1: 5.6078e-15 Postprocessing: - Writing particle output: output-particle_property_integrated_strain_invariant/particles/particle-00001 + Writing particle output: output-particle_property_integrated_strain_invariant/particles/particles-00001.txt diff --git a/tests/particle_property_integrated_strain_invariant/statistics b/tests/particle_property_integrated_strain_invariant/statistics index c2d0ff1ce09..a1c459533fb 100644 --- a/tests/particle_property_integrated_strain_invariant/statistics +++ b/tests/particle_property_integrated_strain_invariant/statistics @@ -10,6 +10,6 @@ # 10: Velocity iterations in Stokes preconditioner # 11: Schur complement iterations in Stokes preconditioner # 12: Number of advected particles -# 13: Particle file name -0 0.000000000000e+00 0.000000000000e+00 100 1003 441 1 0 2 5 3 100 output-particle_property_integrated_strain_invariant/output-particle_property_integrated_strain_invariant/particles/particle-00000 -1 1.000000000000e+01 1.000000000000e+01 100 1003 441 1 0 0 0 0 100 output-particle_property_integrated_strain_invariant/output-particle_property_integrated_strain_invariant/particles/particle-00001 +# 13: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 100 1003 441 1 0 2 5 3 100 output-particle_property_integrated_strain_invariant/particles/particles-00000.txt +1 1.000000000000e+01 1.000000000000e+01 100 1003 441 1 0 0 0 0 100 output-particle_property_integrated_strain_invariant/particles/particles-00001.txt diff --git a/tests/particle_property_integrated_strain_pure_shear/particles/particle-00000.0000.txt b/tests/particle_property_integrated_strain_pure_shear/particles/particles-00000.0000.txt similarity index 100% rename from tests/particle_property_integrated_strain_pure_shear/particles/particle-00000.0000.txt rename to tests/particle_property_integrated_strain_pure_shear/particles/particles-00000.0000.txt diff --git a/tests/particle_property_integrated_strain_pure_shear/particles/particle-00000.0001.txt b/tests/particle_property_integrated_strain_pure_shear/particles/particles-00000.0001.txt similarity index 100% rename from tests/particle_property_integrated_strain_pure_shear/particles/particle-00000.0001.txt rename to tests/particle_property_integrated_strain_pure_shear/particles/particles-00000.0001.txt diff --git a/tests/particle_property_integrated_strain_pure_shear/particles/particle-00001.0000.txt b/tests/particle_property_integrated_strain_pure_shear/particles/particles-00001.0000.txt similarity index 100% rename from tests/particle_property_integrated_strain_pure_shear/particles/particle-00001.0000.txt rename to tests/particle_property_integrated_strain_pure_shear/particles/particles-00001.0000.txt diff --git a/tests/particle_property_integrated_strain_pure_shear/particles/particle-00001.0001.txt b/tests/particle_property_integrated_strain_pure_shear/particles/particles-00001.0001.txt similarity index 100% rename from tests/particle_property_integrated_strain_pure_shear/particles/particle-00001.0001.txt rename to tests/particle_property_integrated_strain_pure_shear/particles/particles-00001.0001.txt diff --git a/tests/particle_property_integrated_strain_pure_shear/screen-output b/tests/particle_property_integrated_strain_pure_shear/screen-output index 6e2180bde8b..c2abadaba67 100644 --- a/tests/particle_property_integrated_strain_pure_shear/screen-output +++ b/tests/particle_property_integrated_strain_pure_shear/screen-output @@ -8,7 +8,7 @@ Number of degrees of freedom: 268 (162+25+81) Solving Stokes system... 20+0 iterations. Postprocessing: - Writing particle output: output-particle_property_integrated_strain_pure_shear/particles/particle-00000 + Writing particle output: output-particle_property_integrated_strain_pure_shear/particles/particles-00000.txt *** Timestep 1: t=0.125 seconds Skipping temperature solve because RHS is zero. @@ -72,7 +72,7 @@ Number of degrees of freedom: 268 (162+25+81) Solving Stokes system... 0+0 iterations. Postprocessing: - Writing particle output: output-particle_property_integrated_strain_pure_shear/particles/particle-00001 + Writing particle output: output-particle_property_integrated_strain_pure_shear/particles/particles-00001.txt Termination requested by criterion: end time diff --git a/tests/particle_property_integrated_strain_pure_shear/statistics b/tests/particle_property_integrated_strain_pure_shear/statistics index b9aea4bfa7c..bc68b7edfab 100644 --- a/tests/particle_property_integrated_strain_pure_shear/statistics +++ b/tests/particle_property_integrated_strain_pure_shear/statistics @@ -9,13 +9,13 @@ # 9: Velocity iterations in Stokes preconditioner # 10: Schur complement iterations in Stokes preconditioner # 11: Number of advected particles -# 12: Particle file name -0 0.000000000000e+00 0.000000000000e+00 16 187 81 0 20 21 63 10 output-particle_property_integrated_strain_pure_shear/output-particle_property_integrated_strain_pure_shear/particles/particle-00000 -1 1.250000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 10 "" -2 2.500000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 10 "" -3 3.750000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 9 "" -4 5.000000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 8 "" -5 6.250000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 7 "" -6 7.500000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 6 "" -7 8.750000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 5 "" -8 1.000000000000e+00 1.250000000000e-01 16 187 81 0 0 0 0 4 output-particle_property_integrated_strain_pure_shear/output-particle_property_integrated_strain_pure_shear/particles/particle-00001 +# 12: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 16 187 81 0 20 21 63 10 output-particle_property_integrated_strain_pure_shear/particles/particles-00000.txt +1 1.250000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 10 "" +2 2.500000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 10 "" +3 3.750000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 9 "" +4 5.000000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 8 "" +5 6.250000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 7 "" +6 7.500000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 6 "" +7 8.750000000000e-01 1.250000000000e-01 16 187 81 0 0 0 0 5 "" +8 1.000000000000e+00 1.250000000000e-01 16 187 81 0 0 0 0 4 output-particle_property_integrated_strain_pure_shear/particles/particles-00001.txt diff --git a/tests/particle_property_integrated_strain_simple_shear/particles/particle-00000.0000.txt b/tests/particle_property_integrated_strain_simple_shear/particles/particles-00000.0000.txt similarity index 100% rename from tests/particle_property_integrated_strain_simple_shear/particles/particle-00000.0000.txt rename to tests/particle_property_integrated_strain_simple_shear/particles/particles-00000.0000.txt diff --git a/tests/particle_property_integrated_strain_simple_shear/particles/particle-00000.0001.txt b/tests/particle_property_integrated_strain_simple_shear/particles/particles-00000.0001.txt similarity index 100% rename from tests/particle_property_integrated_strain_simple_shear/particles/particle-00000.0001.txt rename to tests/particle_property_integrated_strain_simple_shear/particles/particles-00000.0001.txt diff --git a/tests/particle_property_integrated_strain_simple_shear/particles/particle-00001.0000.txt b/tests/particle_property_integrated_strain_simple_shear/particles/particles-00001.0000.txt similarity index 100% rename from tests/particle_property_integrated_strain_simple_shear/particles/particle-00001.0000.txt rename to tests/particle_property_integrated_strain_simple_shear/particles/particles-00001.0000.txt diff --git a/tests/particle_property_integrated_strain_simple_shear/particles/particle-00001.0001.txt b/tests/particle_property_integrated_strain_simple_shear/particles/particles-00001.0001.txt similarity index 100% rename from tests/particle_property_integrated_strain_simple_shear/particles/particle-00001.0001.txt rename to tests/particle_property_integrated_strain_simple_shear/particles/particles-00001.0001.txt diff --git a/tests/particle_property_integrated_strain_simple_shear/screen-output b/tests/particle_property_integrated_strain_simple_shear/screen-output index 6428a928b67..fbeb41586a7 100644 --- a/tests/particle_property_integrated_strain_simple_shear/screen-output +++ b/tests/particle_property_integrated_strain_simple_shear/screen-output @@ -8,7 +8,7 @@ Number of degrees of freedom: 3,556 (2,178+289+1,089) Solving Stokes system... 28+0 iterations. Postprocessing: - Writing particle output: output-particle_property_integrated_strain_simple_shear/particles/particle-00000 + Writing particle output: output-particle_property_integrated_strain_simple_shear/particles/particles-00000.txt *** Timestep 1: t=0.03125 seconds Skipping temperature solve because RHS is zero. @@ -264,7 +264,7 @@ Number of degrees of freedom: 3,556 (2,178+289+1,089) Solving Stokes system... 0+0 iterations. Postprocessing: - Writing particle output: output-particle_property_integrated_strain_simple_shear/particles/particle-00001 + Writing particle output: output-particle_property_integrated_strain_simple_shear/particles/particles-00001.txt Termination requested by criterion: end time diff --git a/tests/particle_property_integrated_strain_simple_shear/statistics b/tests/particle_property_integrated_strain_simple_shear/statistics index 19e9e4a337a..2384e394707 100644 --- a/tests/particle_property_integrated_strain_simple_shear/statistics +++ b/tests/particle_property_integrated_strain_simple_shear/statistics @@ -9,37 +9,37 @@ # 9: Velocity iterations in Stokes preconditioner # 10: Schur complement iterations in Stokes preconditioner # 11: Number of advected particles -# 12: Particle file name - 0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 0 28 29 203 10 output-particle_property_integrated_strain_simple_shear/output-particle_property_integrated_strain_simple_shear/particles/particle-00000 - 1 3.125000000000e-02 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" - 2 6.250000000000e-02 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" - 3 9.375000000000e-02 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" - 4 1.250000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" - 5 1.562500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" - 6 1.875000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" - 7 2.187500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" - 8 2.500000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" - 9 2.812500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -10 3.125000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -11 3.437500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -12 3.750000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -13 4.062500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -14 4.375000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -15 4.687500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -16 5.000000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -17 5.312500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -18 5.625000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -19 5.937500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -20 6.250000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -21 6.562500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -22 6.875000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -23 7.187500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -24 7.500000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -25 7.812500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -26 8.125000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -27 8.437500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -28 8.750000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -29 9.062500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -30 9.375000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -31 9.687500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" -32 1.000000000000e+00 3.125000000000e-02 256 2467 1089 0 0 0 0 10 output-particle_property_integrated_strain_simple_shear/output-particle_property_integrated_strain_simple_shear/particles/particle-00001 +# 12: Particle file name(s) + 0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 0 28 29 203 10 output-particle_property_integrated_strain_simple_shear/particles/particles-00000.txt + 1 3.125000000000e-02 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" + 2 6.250000000000e-02 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" + 3 9.375000000000e-02 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" + 4 1.250000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" + 5 1.562500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" + 6 1.875000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" + 7 2.187500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" + 8 2.500000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" + 9 2.812500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +10 3.125000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +11 3.437500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +12 3.750000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +13 4.062500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +14 4.375000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +15 4.687500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +16 5.000000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +17 5.312500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +18 5.625000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +19 5.937500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +20 6.250000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +21 6.562500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +22 6.875000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +23 7.187500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +24 7.500000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +25 7.812500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +26 8.125000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +27 8.437500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +28 8.750000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +29 9.062500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +30 9.375000000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +31 9.687500000000e-01 3.125000000000e-02 256 2467 1089 0 0 0 0 10 "" +32 1.000000000000e+00 3.125000000000e-02 256 2467 1089 0 0 0 0 10 output-particle_property_integrated_strain_simple_shear/particles/particles-00001.txt diff --git a/tests/particle_property_multiple_functions/screen-output b/tests/particle_property_multiple_functions/screen-output index fcf545eb069..156e442e0c8 100644 --- a/tests/particle_property_multiple_functions/screen-output +++ b/tests/particle_property_multiple_functions/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_property_multiple_functions/particles/particles-00000 + Writing particle output: output-particle_property_multiple_functions/particles/particles-00000.vtu *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000728 m/s Compositions min/max/mass: -0.002207/1.002/0.1825 - Writing particle output: output-particle_property_multiple_functions/particles/particles-00001 + Writing particle output: output-particle_property_multiple_functions/particles/particles-00001.vtu Termination requested by criterion: end time diff --git a/tests/particle_property_multiple_functions/statistics b/tests/particle_property_multiple_functions/statistics index 50b462fc7c4..9239f21c10f 100644 --- a/tests/particle_property_multiple_functions/statistics +++ b/tests/particle_property_multiple_functions/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 33 34 99 1.81487743e-04 4.04466707e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-particle_property_multiple_functions/output-particle_property_multiple_functions/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 16 32 33 99 3.27312912e-04 7.27581703e-04 -2.20654270e-03 1.00187358e+00 1.82473299e-01 10 output-particle_property_multiple_functions/output-particle_property_multiple_functions/particles/particles-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 33 34 99 1.81487743e-04 4.04466707e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-particle_property_multiple_functions/particles/particles-00000.vtu +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 16 32 33 99 3.27312912e-04 7.27581703e-04 -2.20654270e-03 1.00187358e+00 1.82473299e-01 10 output-particle_property_multiple_functions/particles/particles-00001.vtu diff --git a/tests/particle_timing_information/screen-output b/tests/particle_timing_information/screen-output index e2b45c92494..947fbf8e3f4 100644 --- a/tests/particle_timing_information/screen-output +++ b/tests/particle_timing_information/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 349 (162+25+81+81) Postprocessing: RMS, max velocity: 0.000133 m/s, 0.000331 m/s Compositions min/max/mass: 0/1/0.1914 - Writing particle output: output-particle_timing_information/particles/particle-00000 + Writing particle output: output-particle_timing_information/particles/particles-00000.txt Number of active cells: 19 (on 4 levels) Number of degrees of freedom: 447 (208+31+104+104) @@ -49,7 +49,7 @@ Number of degrees of freedom: 673 (314+45+157+157) Postprocessing: RMS, max velocity: 0.000294 m/s, 0.000754 m/s Compositions min/max/mass: -0.03271/1.126/0.1805 - Writing particle output: output-particle_timing_information/particles/particle-00001 + Writing particle output: output-particle_timing_information/particles/particles-00001.txt Termination requested by criterion: end time diff --git a/tests/pure_shear/screen-output b/tests/pure_shear/screen-output index d0077b55c88..4bc02c6edaa 100644 --- a/tests/pure_shear/screen-output +++ b/tests/pure_shear/screen-output @@ -14,7 +14,7 @@ Number of degrees of freedom: 7,912 (2,178+289+1,089+1,089+1,089+1,089+1,089) Solving Stokes system... 29+0 iterations. Postprocessing: - Writing particle output: output-pure_shear/particles/particles-00000 + Writing particle output: output-pure_shear/particles/particles-00000.vtu Writing graphical output: output-pure_shear/solution/solution-00000 Compositions min/max/mass: 1/1/1 // 0/0/0 // 0/0/0 // 1/1/1 diff --git a/tests/pure_shear/statistics b/tests/pure_shear/statistics index 594432290f4..1c174ff8842 100644 --- a/tests/pure_shear/statistics +++ b/tests/pure_shear/statistics @@ -14,7 +14,7 @@ # 14: Velocity iterations in Stokes preconditioner # 15: Schur complement iterations in Stokes preconditioner # 16: Number of advected particles -# 17: Particle file name +# 17: Particle file name(s) # 18: Visualization file name # 19: Minimal value for composition strain_xx # 20: Maximal value for composition strain_xx @@ -28,5 +28,5 @@ # 28: Minimal value for composition strain_yy # 29: Maximal value for composition strain_yy # 30: Global mass for composition strain_yy -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 4356 0 0 0 0 0 29 30 30 1 output-pure_shear/output-pure_shear/particles/particles-00000 output-pure_shear/solution/solution-00000 1.00000000e+00 1.00000000e+00 1.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 1.00000000e+00 1.00000000e+00 1.00000000e+00 -1 2.500000000000e-02 2.500000000000e-02 256 2467 1089 4356 0 12 14 14 12 0 0 0 1 "" "" 9.93100838e-01 1.03132146e+00 1.01247838e+00 -3.31050914e-02 -1.20280965e-06 -1.39197824e-02 1.19709601e-06 3.16354470e-02 1.38510433e-02 9.68681045e-01 1.00168239e+00 9.87519271e-01 +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 4356 0 0 0 0 0 29 30 30 1 output-pure_shear/particles/particles-00000.vtu output-pure_shear/solution/solution-00000 1.00000000e+00 1.00000000e+00 1.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 1.00000000e+00 1.00000000e+00 1.00000000e+00 +1 2.500000000000e-02 2.500000000000e-02 256 2467 1089 4356 0 12 14 14 12 0 0 0 1 "" "" 9.93100838e-01 1.03132146e+00 1.01247838e+00 -3.31050914e-02 -1.20280965e-06 -1.39197824e-02 1.19709601e-06 3.16354470e-02 1.38510433e-02 9.68681045e-01 1.00168239e+00 9.87519271e-01 diff --git a/tests/simple_shear/screen-output b/tests/simple_shear/screen-output index 2acdfa064a9..1c9bf23246e 100644 --- a/tests/simple_shear/screen-output +++ b/tests/simple_shear/screen-output @@ -14,7 +14,7 @@ Number of degrees of freedom: 2,104 (578+81+289+289+289+289+289) Solving Stokes system... 1+0 iterations. Postprocessing: - Writing particle output: output-simple_shear/particles/particles-00000 + Writing particle output: output-simple_shear/particles/particles-00000.vtu Compositions min/max/mass: 1/1/1 // 0/0/0 // 0/0/0 // 1/1/1 Writing graphical output: output-simple_shear/solution/solution-00000 diff --git a/tests/simple_shear/statistics b/tests/simple_shear/statistics index 6afd0307229..8fc3f28fa8e 100644 --- a/tests/simple_shear/statistics +++ b/tests/simple_shear/statistics @@ -14,7 +14,7 @@ # 14: Velocity iterations in Stokes preconditioner # 15: Schur complement iterations in Stokes preconditioner # 16: Number of advected particles -# 17: Particle file name +# 17: Particle file name(s) # 18: Minimal value for composition strain_xx # 19: Maximal value for composition strain_xx # 20: Global mass for composition strain_xx @@ -28,5 +28,5 @@ # 28: Maximal value for composition strain_yy # 29: Global mass for composition strain_yy # 30: Visualization file name -0 0.000000000000e+00 0.000000000000e+00 64 659 289 1156 0 0 0 0 0 1 2 5 1 output-simple_shear/output-simple_shear/particles/particles-00000 1.00000000e+00 1.00000000e+00 1.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 1.00000000e+00 1.00000000e+00 1.00000000e+00 output-simple_shear/solution/solution-00000 -1 2.500000000000e-02 2.500000000000e-02 64 659 289 1156 0 0 11 12 0 0 0 0 1 "" 1.00000000e+00 1.00000000e+00 1.00000000e+00 5.00000000e-02 5.00000000e-02 5.00000000e-02 -1.86696664e-17 2.06781794e-17 6.33698543e-32 1.00000000e+00 1.00000000e+00 1.00000000e+00 "" +0 0.000000000000e+00 0.000000000000e+00 64 659 289 1156 0 0 0 0 0 1 2 5 1 output-simple_shear/particles/particles-00000.vtu 1.00000000e+00 1.00000000e+00 1.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 1.00000000e+00 1.00000000e+00 1.00000000e+00 output-simple_shear/solution/solution-00000 +1 2.500000000000e-02 2.500000000000e-02 64 659 289 1156 0 0 11 12 0 0 0 0 1 "" 1.00000000e+00 1.00000000e+00 1.00000000e+00 5.00000000e-02 5.00000000e-02 5.00000000e-02 -1.86696664e-17 2.06781794e-17 6.33698543e-32 1.00000000e+00 1.00000000e+00 1.00000000e+00 "" diff --git a/tests/sol_cx_particles/screen-output b/tests/sol_cx_particles/screen-output index cb85d359641..63adbb2ebf7 100644 --- a/tests/sol_cx_particles/screen-output +++ b/tests/sol_cx_particles/screen-output @@ -12,77 +12,77 @@ Number of degrees of freedom: 3,556 (2,178+289+1,089) Relative Stokes residual after nonlinear iteration 2: 9.78708e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00000 + Writing particle output: output-sol_cx_particles/particles/particles-00000.vtu *** Timestep 1: t=8.80814 seconds Solving Stokes system... 0+0 iterations. Relative Stokes residual after nonlinear iteration 1: 7.71004e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00001 + Writing particle output: output-sol_cx_particles/particles/particles-00001.vtu *** Timestep 2: t=17.6163 seconds Solving Stokes system... 0+0 iterations. Relative Stokes residual after nonlinear iteration 1: 7.71004e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00002 + Writing particle output: output-sol_cx_particles/particles/particles-00002.vtu *** Timestep 3: t=26.4244 seconds Solving Stokes system... 0+0 iterations. Relative Stokes residual after nonlinear iteration 1: 7.71004e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00003 + Writing particle output: output-sol_cx_particles/particles/particles-00003.vtu *** Timestep 4: t=35.2326 seconds Solving Stokes system... 0+0 iterations. Relative Stokes residual after nonlinear iteration 1: 7.71004e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00004 + Writing particle output: output-sol_cx_particles/particles/particles-00004.vtu *** Timestep 5: t=44.0407 seconds Solving Stokes system... 0+0 iterations. Relative Stokes residual after nonlinear iteration 1: 7.71004e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00005 + Writing particle output: output-sol_cx_particles/particles/particles-00005.vtu *** Timestep 6: t=52.8489 seconds Solving Stokes system... 0+0 iterations. Relative Stokes residual after nonlinear iteration 1: 7.71004e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00006 + Writing particle output: output-sol_cx_particles/particles/particles-00006.vtu *** Timestep 7: t=61.657 seconds Solving Stokes system... 0+0 iterations. Relative Stokes residual after nonlinear iteration 1: 7.71004e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00007 + Writing particle output: output-sol_cx_particles/particles/particles-00007.vtu *** Timestep 8: t=70.4652 seconds Solving Stokes system... 0+0 iterations. Relative Stokes residual after nonlinear iteration 1: 7.71004e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00008 + Writing particle output: output-sol_cx_particles/particles/particles-00008.vtu *** Timestep 9: t=79.2733 seconds Solving Stokes system... 0+0 iterations. Relative Stokes residual after nonlinear iteration 1: 7.71004e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00009 + Writing particle output: output-sol_cx_particles/particles/particles-00009.vtu *** Timestep 10: t=88.0814 seconds Solving Stokes system... 0+0 iterations. Relative Stokes residual after nonlinear iteration 1: 7.71004e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00010 + Writing particle output: output-sol_cx_particles/particles/particles-00010.vtu Number of active cells: 238 (on 5 levels) Number of degrees of freedom: 3,379 (2,070+274+1,035) @@ -92,19 +92,19 @@ Number of degrees of freedom: 3,379 (2,070+274+1,035) Solving Stokes system... 29+0 iterations. Relative Stokes residual after nonlinear iteration 1: 0.337215 Solving Stokes system... 0+0 iterations. - Relative Stokes residual after nonlinear iteration 2: 7.60284e-08 + Relative Stokes residual after nonlinear iteration 2: 7.47448e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00011 + Writing particle output: output-sol_cx_particles/particles/particles-00011.vtu *** Timestep 12: t=100 seconds Solving Stokes system... 27+0 iterations. Relative Stokes residual after nonlinear iteration 1: 0.101315 Solving Stokes system... 0+0 iterations. - Relative Stokes residual after nonlinear iteration 2: 6.68795e-08 + Relative Stokes residual after nonlinear iteration 2: 6.55627e-08 Postprocessing: - Writing particle output: output-sol_cx_particles/particles/particles-00012 + Writing particle output: output-sol_cx_particles/particles/particles-00012.vtu Termination requested by criterion: end time diff --git a/tests/sol_cx_particles/statistics b/tests/sol_cx_particles/statistics index 03dfcaebfff..49b1564b02d 100644 --- a/tests/sol_cx_particles/statistics +++ b/tests/sol_cx_particles/statistics @@ -9,17 +9,17 @@ # 9: Velocity iterations in Stokes preconditioner # 10: Schur complement iterations in Stokes preconditioner # 11: Number of advected particles -# 12: Particle file name - 0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 2 37 38 37 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00000 - 1 8.808144427681e+00 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00001 - 2 1.761628885536e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00002 - 3 2.642443328304e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00003 - 4 3.523257771072e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00004 - 5 4.404072213840e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00005 - 6 5.284886656609e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00006 - 7 6.165701099377e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00007 - 8 7.046515542145e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00008 - 9 7.927329984913e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00009 -10 8.808144427681e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00010 -11 9.688958870449e+01 8.808144427681e+00 238 2344 1035 2 29 30 120 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00011 -12 1.000000000000e+02 3.110411295510e+00 238 2344 1035 2 27 28 112 10 output-sol_cx_particles/output-sol_cx_particles/particles/particles-00012 +# 12: Particle file name(s) + 0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 2 37 38 37 10 output-sol_cx_particles/particles/particles-00000.vtu + 1 8.808144427681e+00 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/particles/particles-00001.vtu + 2 1.761628885536e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/particles/particles-00002.vtu + 3 2.642443328304e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/particles/particles-00003.vtu + 4 3.523257771072e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/particles/particles-00004.vtu + 5 4.404072213840e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/particles/particles-00005.vtu + 6 5.284886656609e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/particles/particles-00006.vtu + 7 6.165701099377e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/particles/particles-00007.vtu + 8 7.046515542145e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/particles/particles-00008.vtu + 9 7.927329984913e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/particles/particles-00009.vtu +10 8.808144427681e+01 8.808144427681e+00 256 2467 1089 1 0 0 0 10 output-sol_cx_particles/particles/particles-00010.vtu +11 9.688958870449e+01 8.808144427681e+00 238 2344 1035 2 29 30 120 10 output-sol_cx_particles/particles/particles-00011.vtu +12 1.000000000000e+02 3.110411295510e+00 238 2344 1035 2 27 28 112 10 output-sol_cx_particles/particles/particles-00012.vtu diff --git a/tests/van_keken_smooth_particle/screen-output b/tests/van_keken_smooth_particle/screen-output index f1a37c32cb6..30ea57bcdb2 100644 --- a/tests/van_keken_smooth_particle/screen-output +++ b/tests/van_keken_smooth_particle/screen-output @@ -11,7 +11,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-van_keken_smooth_particle/particles/particles-00000 + Writing particle output: output-van_keken_smooth_particle/particles/particles-00000.vtu *** Timestep 1: t=70 seconds Skipping temperature solve because RHS is zero. @@ -21,7 +21,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000728 m/s Compositions min/max/mass: -0.002207/1.002/0.1825 - Writing particle output: output-van_keken_smooth_particle/particles/particles-00001 + Writing particle output: output-van_keken_smooth_particle/particles/particles-00001.vtu Termination requested by criterion: end time diff --git a/tests/van_keken_smooth_particle/statistics b/tests/van_keken_smooth_particle/statistics index 86d124bff45..0541ea13bf5 100644 --- a/tests/van_keken_smooth_particle/statistics +++ b/tests/van_keken_smooth_particle/statistics @@ -16,6 +16,6 @@ # 16: Maximal value for composition C_1 # 17: Global mass for composition C_1 # 18: Number of advected particles -# 19: Particle file name -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-van_keken_smooth_particle/output-van_keken_smooth_particle/particles/particles-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 3.27312911e-04 7.27581702e-04 -2.20654271e-03 1.00187358e+00 1.82473299e-01 10 output-van_keken_smooth_particle/output-van_keken_smooth_particle/particles/particles-00001 +# 19: Particle file name(s) +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 34 35 34 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 output-van_keken_smooth_particle/particles/particles-00000.vtu +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 14 34 35 35 3.27312911e-04 7.27581702e-04 -2.20654271e-03 1.00187358e+00 1.82473299e-01 10 output-van_keken_smooth_particle/particles/particles-00001.vtu