From c19daef3549dda14aaaf73afab6b9a31b5ee5bb4 Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 26 Nov 1998 10:10:30 +0000 Subject: [PATCH] Make names of output data sets conforming to the rules of the DataOut class (i.e. no special characters, no spaces, etc.) git-svn-id: https://svn.dealii.org/trunk@680 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/Attic/examples/convergence/convergence.cc | 10 +++++----- deal.II/deal.II/Attic/examples/dof/dof_test.cc | 4 ++++ .../examples/error-estimation/error-estimation.cc | 10 +++++----- deal.II/deal.II/Attic/examples/multigrid/multigrid.cc | 10 +++++----- tests/big-tests/convergence/convergence.cc | 10 +++++----- tests/big-tests/dof/dof_test.cc | 4 ++++ tests/big-tests/error-estimation/error-estimation.cc | 10 +++++----- tests/big-tests/multigrid/multigrid.cc | 10 +++++----- 8 files changed, 38 insertions(+), 30 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/convergence/convergence.cc b/deal.II/deal.II/Attic/examples/convergence/convergence.cc index 31a21a835f..4c53da2b0c 100644 --- a/deal.II/deal.II/Attic/examples/convergence/convergence.cc +++ b/deal.II/deal.II/Attic/examples/convergence/convergence.cc @@ -409,11 +409,11 @@ int PoissonProblem::run (const unsigned int level) { DataOut out; ofstream o(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.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_ucd (o); o.close (); } diff --git a/deal.II/deal.II/Attic/examples/dof/dof_test.cc b/deal.II/deal.II/Attic/examples/dof/dof_test.cc index c4fc5358ab..112ee9283d 100644 --- a/deal.II/deal.II/Attic/examples/dof/dof_test.cc +++ b/deal.II/deal.II/Attic/examples/dof/dof_test.cc @@ -287,6 +287,10 @@ void TestCases::run (ParameterHandler &prm) { << " Unconstrained matrix bandwidth= " << unconstrained_bandwidth << endl << " Constrained matrix bandwidth = " << sparsity.bandwidth() << endl << endl; + + // release the lock that dof has to the + // finite element object + dof->clear (); }; diff --git a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc index a518904637..bf56362131 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc +++ b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc @@ -518,11 +518,11 @@ void PoissonProblem::run (ParameterHandler &prm) { DataOut out; fill_data (out); - 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_error_per_dof, "H1-Error"); - out.add_data_vector (estimated_error_per_dof, "Estimated Error"); - out.add_data_vector (error_ratio, "Ratio True:Estimated 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_error_per_dof, "H1_Error"); + out.add_data_vector (estimated_error_per_dof, "Estimated_Error"); + out.add_data_vector (error_ratio, "Ratio_True_to_Estimated_Error"); string filename = prm.get ("Output base filename"); switch (refine_mode) { diff --git a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc index 6178d5ee56..9061524b50 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc +++ b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc @@ -569,11 +569,11 @@ int PoissonProblem::run (const unsigned int level) { out.attach_dof_handler (*dof); out.add_data_vector (solution, "u"); - 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.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_ucd (o); o.close (); } diff --git a/tests/big-tests/convergence/convergence.cc b/tests/big-tests/convergence/convergence.cc index 31a21a835f..4c53da2b0c 100644 --- a/tests/big-tests/convergence/convergence.cc +++ b/tests/big-tests/convergence/convergence.cc @@ -409,11 +409,11 @@ int PoissonProblem::run (const unsigned int level) { DataOut out; ofstream o(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.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_ucd (o); o.close (); } diff --git a/tests/big-tests/dof/dof_test.cc b/tests/big-tests/dof/dof_test.cc index c4fc5358ab..112ee9283d 100644 --- a/tests/big-tests/dof/dof_test.cc +++ b/tests/big-tests/dof/dof_test.cc @@ -287,6 +287,10 @@ void TestCases::run (ParameterHandler &prm) { << " Unconstrained matrix bandwidth= " << unconstrained_bandwidth << endl << " Constrained matrix bandwidth = " << sparsity.bandwidth() << endl << endl; + + // release the lock that dof has to the + // finite element object + dof->clear (); }; diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index a518904637..bf56362131 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -518,11 +518,11 @@ void PoissonProblem::run (ParameterHandler &prm) { DataOut out; fill_data (out); - 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_error_per_dof, "H1-Error"); - out.add_data_vector (estimated_error_per_dof, "Estimated Error"); - out.add_data_vector (error_ratio, "Ratio True:Estimated 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_error_per_dof, "H1_Error"); + out.add_data_vector (estimated_error_per_dof, "Estimated_Error"); + out.add_data_vector (error_ratio, "Ratio_True_to_Estimated_Error"); string filename = prm.get ("Output base filename"); switch (refine_mode) { diff --git a/tests/big-tests/multigrid/multigrid.cc b/tests/big-tests/multigrid/multigrid.cc index 6178d5ee56..9061524b50 100644 --- a/tests/big-tests/multigrid/multigrid.cc +++ b/tests/big-tests/multigrid/multigrid.cc @@ -569,11 +569,11 @@ int PoissonProblem::run (const unsigned int level) { out.attach_dof_handler (*dof); out.add_data_vector (solution, "u"); - 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.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_ucd (o); o.close (); } -- 2.39.5