From 384143ca6480bd09eefa5cd049bc4f99bafb377b Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 11 Apr 2001 13:53:08 +0000 Subject: [PATCH] Since output formats cant write more than Q1, make that explicit in the creation of FEValues objects. git-svn-id: https://svn.dealii.org/trunk@4439 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/numerics/data_out.cc | 14 +++++++++----- deal.II/deal.II/source/numerics/data_out_faces.cc | 14 +++++++++----- .../deal.II/source/numerics/data_out_rotation.cc | 14 +++++++++----- deal.II/deal.II/source/numerics/data_out_stack.cc | 15 ++++++++++----- 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index 396b35d4cd..6593b8c135 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -22,6 +22,7 @@ #include #include #include +#include #ifdef DEAL_II_USE_MT #include @@ -302,11 +303,14 @@ void DataOut::build_some_patches (Data data) QTrapez<1> q_trapez; QIterated patch_points (q_trapez, data.n_subdivisions); - // this constructor implicitely - // uses a MappingQ1 mapping - FEValues fe_patch_values(dofs->get_fe(), - patch_points, - update_values); + // since most output formats can't + // handle cells that are not + // transformed using a Q1 mapping, + // we don't support anything else + // as well + static const MappingQ1 mapping; + FEValues fe_patch_values (mapping, dofs->get_fe(), + patch_points, update_values); const unsigned int n_q_points = patch_points.n_quadrature_points; diff --git a/deal.II/deal.II/source/numerics/data_out_faces.cc b/deal.II/deal.II/source/numerics/data_out_faces.cc index ae028c8140..d50d932095 100644 --- a/deal.II/deal.II/source/numerics/data_out_faces.cc +++ b/deal.II/deal.II/source/numerics/data_out_faces.cc @@ -21,6 +21,7 @@ #include #include #include +#include #ifdef DEAL_II_USE_MT #include @@ -36,11 +37,14 @@ void DataOutFaces::build_some_patches (Data data) QTrapez<1> q_trapez; QIterated patch_points (q_trapez, data.n_subdivisions); - // this constructor implicitely - // uses a MappingQ1 mapping - FEFaceValues fe_patch_values(dofs->get_fe(), - patch_points, - update_values); + // since most output formats can't + // handle cells that are not + // transformed using a Q1 mapping, + // we don't support anything else + // as well + static const MappingQ1 mapping; + FEFaceValues fe_patch_values (mapping, dofs->get_fe(), + patch_points, update_values); const unsigned int n_q_points = patch_points.n_quadrature_points; diff --git a/deal.II/deal.II/source/numerics/data_out_rotation.cc b/deal.II/deal.II/source/numerics/data_out_rotation.cc index 17f6b43f33..4aa135e855 100644 --- a/deal.II/deal.II/source/numerics/data_out_rotation.cc +++ b/deal.II/deal.II/source/numerics/data_out_rotation.cc @@ -21,6 +21,7 @@ #include #include #include +#include #ifdef DEAL_II_USE_MT #include @@ -41,11 +42,14 @@ void DataOutRotation::build_some_patches (Data data) QTrapez<1> q_trapez; QIterated patch_points (q_trapez, data.n_subdivisions); - // this constructor implicitely - // uses a MappingQ1 mapping - FEValues fe_patch_values(dofs->get_fe(), - patch_points, - update_values); + // since most output formats can't + // handle cells that are not + // transformed using a Q1 mapping, + // we don't support anything else + // as well + static const MappingQ1 mapping; + FEValues fe_patch_values (mapping, dofs->get_fe(), + patch_points, update_values); const unsigned int n_patches_per_circle = data.n_patches_per_circle; diff --git a/deal.II/deal.II/source/numerics/data_out_stack.cc b/deal.II/deal.II/source/numerics/data_out_stack.cc index 4a2712bfe8..62de438914 100644 --- a/deal.II/deal.II/source/numerics/data_out_stack.cc +++ b/deal.II/deal.II/source/numerics/data_out_stack.cc @@ -21,6 +21,8 @@ #include #include #include +#include + // if necessary try to work around a bug in the IBM xlC compiler @@ -219,11 +221,14 @@ void DataOutStack::build_patches (const unsigned int n_subdivisions) QTrapez<1> q_trapez; QIterated patch_points (q_trapez, n_subdivisions); - // this constructor implicitely - // uses a MappingQ1 mapping - FEValues fe_patch_values (dof_handler->get_fe(), - patch_points, - update_values); + // since most output formats can't + // handle cells that are not + // transformed using a Q1 mapping, + // we don't support anything else + // as well + static const MappingQ1 mapping; + FEValues fe_patch_values (mapping, dof_handler->get_fe(), + patch_points, update_values); const unsigned int n_q_points = patch_points.n_quadrature_points; std::vector patch_values (n_q_points); std::vector > patch_values_system (n_q_points, -- 2.39.5