From: wolf Date: Thu, 9 Dec 1999 18:25:25 +0000 (+0000) Subject: Fix the compilation problem the hard way, by deleting the offending X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7ddbb731eb4e61a7933404cfa9e02ed00bd2c45;p=dealii-svn.git Fix the compilation problem the hard way, by deleting the offending 'flush'es. Since we are only interested in the order of output, but not in the particular time at which it appears, this is a reasonable strategy, but it does not solve the underlying problem. Since I don't like the LogStream class anyway, I leave it to others to fix the general problem... git-svn-id: https://svn.dealii.org/trunk@2033 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/deal.II/wave-test-3.cc b/tests/deal.II/wave-test-3.cc index afd6f89610..bb0d86d318 100644 --- a/tests/deal.II/wave-test-3.cc +++ b/tests/deal.II/wave-test-3.cc @@ -1,7 +1,6 @@ // deal_II_libraries.g=-ldeal_II_2d.g // deal_II_libraries=-ldeal_II_2d -#include #include #include #include @@ -3447,7 +3446,7 @@ void TimestepManager::refine_grids () if (parameters.produce_error_statistics) { - deallog << " Generating error statistics " << flush; + deallog << " Generating error statistics "; vector time_values (timesteps.size()); for (unsigned int i=0; i::refine_grids () (partial_sums.end() - p)/(GeometryInfo::children_per_cell-1)) << " cells in next sweep." << endl; - deallog << " Now refining..." << flush; + deallog << " Now refining..."; do_loop (mem_fun (&TimeStepBase_Tria::init_for_refinement), bind2nd (mem_fun1 (&TimeStepBase_Wave::refine_grid), TimeStepBase_Tria::RefinementData (top_threshold, @@ -3622,7 +3621,7 @@ void TimestepManager::write_statistics (const SweepInfo &sweep_info) const // write statistics if (true) { - deallog << " Writing statistics for whole sweep." << flush; + deallog << " Writing statistics for whole sweep."; deallog << "# Description of fields" << endl << "# =====================" << endl @@ -3651,7 +3650,7 @@ void TimestepManager::write_statistics (const SweepInfo &sweep_info) const // write summary if (true) { - deallog << " Writing summary." << flush; + deallog << " Writing summary."; sweep_info.write_summary (parameters.eval_list, logfile); @@ -3669,7 +3668,7 @@ void TimestepManager::write_stacked_data (DataOutStack &data_out_stack typename DataOutInterface::OutputFormat output_format = DataOutInterface::parse_output_format (parameters.output_format); - deallog << " Writing stacked time steps" << flush; + deallog << " Writing stacked time steps"; DataOutBase::EpsFlags eps_flags; eps_flags.height_vector = eps_flags.color_vector = 2; eps_flags.draw_mesh = false; @@ -5803,7 +5802,7 @@ void TimeStep_Dual::do_initial_step () { << ", sweep=" << sweep_no << ". " << tria->n_active_cells() << " cells, " - << dof_handler->n_dofs() << " dofs" << flush; + << dof_handler->n_dofs() << " dofs"; // add up sweep-accumulated data. count // u and v as separate dofs @@ -5861,7 +5860,7 @@ void TimeStep_Dual::do_timestep () << ", sweep=" << sweep_no << ". " << tria->n_active_cells() << " cells, " - << dof_handler->n_dofs() << " dofs" << flush; + << dof_handler->n_dofs() << " dofs"; // add up sweep-accumulated data. count // u and v as separate dofs @@ -6583,7 +6582,7 @@ void TimeStep_ErrorEstimation::estimate_error () { sweep_info->get_timers().error_estimation.start(); - deallog << "[ee]" << flush; + deallog << "[ee]"; if ((parameters.refinement_strategy == WaveParameters::energy_estimator) || @@ -7856,8 +7855,7 @@ void TimeStep_Postprocess::postprocess_timestep () << time << ", step=" << timestep_no << ", sweep=" << sweep_no - << ". " - << flush; + << ". "; if ((sweep_no < parameters.number_of_sweeps-1) || (parameters.refinement_strategy == WaveParameters::dual_estimator)) @@ -7885,7 +7883,7 @@ void TimeStep_Postprocess::postprocess_timestep () (((timestep_no % parameters.write_steps_interval) == 0) || (next_timestep == 0))) { - deallog << "[o]" << flush; + deallog << "[o]"; DataOut::OutputFormat output_format = DataOut::parse_output_format (parameters.output_format); @@ -7958,13 +7956,13 @@ void TimeStep_Postprocess::postprocess_timestep () out.write (logfile, output_format); - deallog << "." << flush; + deallog << "."; }; if (parameters.write_stacked_data && (timestep_no % parameters.write_stacked_interval == 0)) { - deallog << "[st]" << flush; + deallog << "[st]"; sweep_data->data_out_stack->new_parameter_value (time, (timestep_no == 0 ? @@ -8153,7 +8151,7 @@ void TimeStep_Primal::do_initial_step () << ", sweep=" << sweep_no << ". " << tria->n_active_cells() << " cells, " - << dof_handler->n_dofs() << " dofs" << flush; + << dof_handler->n_dofs() << " dofs"; // add up sweep-accumulated data. count @@ -8197,7 +8195,7 @@ void TimeStep_Primal::do_timestep () << ", sweep=" << sweep_no << ". " << tria->n_active_cells() << " cells, " - << dof_handler->n_dofs() << " dofs" << flush; + << dof_handler->n_dofs() << " dofs"; // add up sweep-accumulated data. count // u and v as separate dofs