From: Ralf Hartmann Date: Thu, 5 Apr 2001 16:03:23 +0000 (+0000) Subject: DataOut's only output is on MappingQ1. Therefore use FEValues constructors without... X-Git-Tag: v8.0.0~19400 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bdc7188b0dc0d2f1848fef8e25f652d1fa9f319;p=dealii.git DataOut's only output is on MappingQ1. Therefore use FEValues constructors without mapping argument. Then the global mapping_q1 object can be removed. git-svn-id: https://svn.dealii.org/trunk@4382 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index 76b0acfcf4..396b35d4cd 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -22,10 +22,6 @@ #include #include #include -#include - -//TODO:[RH,GK] Replace global by local object; better: have two functions, or by default arg -static const MappingQ1 mapping; #ifdef DEAL_II_USE_MT #include @@ -305,8 +301,10 @@ void DataOut::build_some_patches (Data data) { QTrapez<1> q_trapez; QIterated patch_points (q_trapez, data.n_subdivisions); - - FEValues fe_patch_values(mapping, dofs->get_fe(), + + // this constructor implicitely + // uses a MappingQ1 mapping + FEValues fe_patch_values(dofs->get_fe(), patch_points, update_values); 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 0dc7e4644f..ae028c8140 100644 --- a/deal.II/deal.II/source/numerics/data_out_faces.cc +++ b/deal.II/deal.II/source/numerics/data_out_faces.cc @@ -22,11 +22,6 @@ #include #include -#include - -//TODO:[RH,GK] Replace global by local object; better: have two functions, or by default arg -static const MappingQ1 mapping; - #ifdef DEAL_II_USE_MT #include #endif @@ -41,8 +36,9 @@ void DataOutFaces::build_some_patches (Data data) QTrapez<1> q_trapez; QIterated patch_points (q_trapez, data.n_subdivisions); - FEFaceValues fe_patch_values(mapping, - dofs->get_fe(), + // this constructor implicitely + // uses a MappingQ1 mapping + FEFaceValues fe_patch_values(dofs->get_fe(), patch_points, update_values); 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 94ffba6632..17f6b43f33 100644 --- a/deal.II/deal.II/source/numerics/data_out_rotation.cc +++ b/deal.II/deal.II/source/numerics/data_out_rotation.cc @@ -19,13 +19,9 @@ #include #include #include -#include #include #include -//TODO:[RH,GK] Replace global by local object; better: have two functions, or by default arg -static const MappingQ1 mapping; - #ifdef DEAL_II_USE_MT #include #endif @@ -44,9 +40,10 @@ void DataOutRotation::build_some_patches (Data data) { QTrapez<1> q_trapez; QIterated patch_points (q_trapez, data.n_subdivisions); - - FEValues fe_patch_values(mapping, - dofs->get_fe(), + + // this constructor implicitely + // uses a MappingQ1 mapping + FEValues fe_patch_values(dofs->get_fe(), patch_points, update_values); 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 a8d56ef5e7..4a2712bfe8 100644 --- a/deal.II/deal.II/source/numerics/data_out_stack.cc +++ b/deal.II/deal.II/source/numerics/data_out_stack.cc @@ -21,8 +21,6 @@ #include #include #include -#include - // if necessary try to work around a bug in the IBM xlC compiler @@ -31,9 +29,6 @@ using namespace std; #endif -//TODO:[RH,GK] Replace global by local object; better: have two functions, or by default arg -static const MappingQ1 mapping; - template unsigned int @@ -223,7 +218,10 @@ void DataOutStack::build_patches (const unsigned int n_subdivisions) // cell to these points QTrapez<1> q_trapez; QIterated patch_points (q_trapez, n_subdivisions); - FEValues fe_patch_values (mapping, dof_handler->get_fe(), + + // this constructor implicitely + // uses a MappingQ1 mapping + FEValues fe_patch_values (dof_handler->get_fe(), patch_points, update_values); const unsigned int n_q_points = patch_points.n_quadrature_points;