From: Wolfgang Bangerth Date: Thu, 9 Apr 1998 09:24:32 +0000 (+0000) Subject: Small changes. X-Git-Tag: v8.0.0~23088 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1808020925af90996c77d9b5183de165466a8002;p=dealii.git Small changes. git-svn-id: https://svn.dealii.org/trunk@166 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Attic/examples/convergence/convergence.cc b/deal.II/deal.II/Attic/examples/convergence/convergence.cc index 5b17341eb4..cff66569ed 100644 --- a/deal.II/deal.II/Attic/examples/convergence/convergence.cc +++ b/deal.II/deal.II/Attic/examples/convergence/convergence.cc @@ -292,28 +292,33 @@ void PoissonProblem::run (const unsigned int level) { cout << h1_error_per_cell.l2_norm() << endl; h1_error.push_back (h1_error_per_cell.l2_norm()); - dVector l1_error_per_dof, l2_error_per_dof, linfty_error_per_dof; - dVector h1_seminorm_error_per_dof, h1_error_per_dof; - dof->distribute_cell_to_dof_vector (l1_error_per_cell, l1_error_per_dof); - dof->distribute_cell_to_dof_vector (l2_error_per_cell, l2_error_per_dof); - dof->distribute_cell_to_dof_vector (linfty_error_per_cell, linfty_error_per_dof); - dof->distribute_cell_to_dof_vector (h1_seminorm_error_per_cell, h1_seminorm_error_per_dof); - dof->distribute_cell_to_dof_vector (h1_error_per_cell, h1_error_per_dof); - - string filename = "gnuplot."; - filename += ('0'+level); - cout << " Writing error plots to <" << filename << ">..." << endl; - - DataOut out; - ofstream gnuplot(filename.c_str()); - fill_data (out); - out.add_data_vector (l1_error_per_dof, "L1-Error"); - out.add_data_vector (l2_error_per_dof, "L2-Error"); - out.add_data_vector (linfty_error_per_dof, "Linfty-Error"); - out.add_data_vector (h1_seminorm_error_per_dof, "H1-seminorm-Error"); - out.add_data_vector (h1_error_per_dof, "H1-Error"); - out.write_gnuplot (gnuplot); - gnuplot.close (); + if (level<=5) + { + dVector l1_error_per_dof, l2_error_per_dof, linfty_error_per_dof; + dVector h1_seminorm_error_per_dof, h1_error_per_dof; + dof->distribute_cell_to_dof_vector (l1_error_per_cell, l1_error_per_dof); + dof->distribute_cell_to_dof_vector (l2_error_per_cell, l2_error_per_dof); + dof->distribute_cell_to_dof_vector (linfty_error_per_cell, linfty_error_per_dof); + dof->distribute_cell_to_dof_vector (h1_seminorm_error_per_cell, h1_seminorm_error_per_dof); + dof->distribute_cell_to_dof_vector (h1_error_per_cell, h1_error_per_dof); + + string filename = "gnuplot."; + filename += ('0'+level); + cout << " Writing error plots to <" << filename << ">..." << endl; + + DataOut out; + ofstream gnuplot(filename.c_str()); + fill_data (out); + out.add_data_vector (l1_error_per_dof, "L1-Error"); + out.add_data_vector (l2_error_per_dof, "L2-Error"); + out.add_data_vector (linfty_error_per_dof, "Linfty-Error"); + out.add_data_vector (h1_seminorm_error_per_dof, "H1-seminorm-Error"); + out.add_data_vector (h1_error_per_dof, "H1-Error"); + out.write_gnuplot (gnuplot); + gnuplot.close (); + } + else + cout << " Not writing error as grid." << endl; cout << endl; }; @@ -367,7 +372,7 @@ void PoissonProblem::print_history () const { int main () { PoissonProblem<2> problem; - for (unsigned int level=1; level<8; ++level) + for (unsigned int level=1; level<10; ++level) problem.run (level); cout << endl << "Printing convergence history to ..." << endl; diff --git a/tests/big-tests/convergence/convergence.cc b/tests/big-tests/convergence/convergence.cc index 5b17341eb4..cff66569ed 100644 --- a/tests/big-tests/convergence/convergence.cc +++ b/tests/big-tests/convergence/convergence.cc @@ -292,28 +292,33 @@ void PoissonProblem::run (const unsigned int level) { cout << h1_error_per_cell.l2_norm() << endl; h1_error.push_back (h1_error_per_cell.l2_norm()); - dVector l1_error_per_dof, l2_error_per_dof, linfty_error_per_dof; - dVector h1_seminorm_error_per_dof, h1_error_per_dof; - dof->distribute_cell_to_dof_vector (l1_error_per_cell, l1_error_per_dof); - dof->distribute_cell_to_dof_vector (l2_error_per_cell, l2_error_per_dof); - dof->distribute_cell_to_dof_vector (linfty_error_per_cell, linfty_error_per_dof); - dof->distribute_cell_to_dof_vector (h1_seminorm_error_per_cell, h1_seminorm_error_per_dof); - dof->distribute_cell_to_dof_vector (h1_error_per_cell, h1_error_per_dof); - - string filename = "gnuplot."; - filename += ('0'+level); - cout << " Writing error plots to <" << filename << ">..." << endl; - - DataOut out; - ofstream gnuplot(filename.c_str()); - fill_data (out); - out.add_data_vector (l1_error_per_dof, "L1-Error"); - out.add_data_vector (l2_error_per_dof, "L2-Error"); - out.add_data_vector (linfty_error_per_dof, "Linfty-Error"); - out.add_data_vector (h1_seminorm_error_per_dof, "H1-seminorm-Error"); - out.add_data_vector (h1_error_per_dof, "H1-Error"); - out.write_gnuplot (gnuplot); - gnuplot.close (); + if (level<=5) + { + dVector l1_error_per_dof, l2_error_per_dof, linfty_error_per_dof; + dVector h1_seminorm_error_per_dof, h1_error_per_dof; + dof->distribute_cell_to_dof_vector (l1_error_per_cell, l1_error_per_dof); + dof->distribute_cell_to_dof_vector (l2_error_per_cell, l2_error_per_dof); + dof->distribute_cell_to_dof_vector (linfty_error_per_cell, linfty_error_per_dof); + dof->distribute_cell_to_dof_vector (h1_seminorm_error_per_cell, h1_seminorm_error_per_dof); + dof->distribute_cell_to_dof_vector (h1_error_per_cell, h1_error_per_dof); + + string filename = "gnuplot."; + filename += ('0'+level); + cout << " Writing error plots to <" << filename << ">..." << endl; + + DataOut out; + ofstream gnuplot(filename.c_str()); + fill_data (out); + out.add_data_vector (l1_error_per_dof, "L1-Error"); + out.add_data_vector (l2_error_per_dof, "L2-Error"); + out.add_data_vector (linfty_error_per_dof, "Linfty-Error"); + out.add_data_vector (h1_seminorm_error_per_dof, "H1-seminorm-Error"); + out.add_data_vector (h1_error_per_dof, "H1-Error"); + out.write_gnuplot (gnuplot); + gnuplot.close (); + } + else + cout << " Not writing error as grid." << endl; cout << endl; }; @@ -367,7 +372,7 @@ void PoissonProblem::print_history () const { int main () { PoissonProblem<2> problem; - for (unsigned int level=1; level<8; ++level) + for (unsigned int level=1; level<10; ++level) problem.run (level); cout << endl << "Printing convergence history to ..." << endl;