]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Add FESystems including FEs of higher degree. Make it compile on a prerelease of...
authorRalf Hartmann <Ralf.Hartmann@dlr.de>
Thu, 15 Mar 2001 18:48:14 +0000 (18:48 +0000)
committerRalf Hartmann <Ralf.Hartmann@dlr.de>
Thu, 15 Mar 2001 18:48:14 +0000 (18:48 +0000)
git-svn-id: https://svn.dealii.org/trunk@4217 0785d39b-7218-0410-832d-ea1e28bc413d

tests/fe/fe_data_test.cc

index 1f8f9324baf87dfc30c146f34a13751200888e7b..8dd7f74cb75420eba27c59ffbd375e58d12bcbba 100644 (file)
 template<int dim>
 void test_fe_datas()
 {
-  vector<FiniteElement<dim> *> fe_datas;
+  std::vector<FiniteElement<dim> *> fe_datas;
   fe_datas.push_back(new FE_Q<dim> (1));
   fe_datas.push_back(new FE_Q<dim> (4));
   fe_datas.push_back(new FESystem<dim>(FE_Q<dim> (2), 2));
   fe_datas.push_back(new FESystem<dim>(FE_Q<dim> (1), 2,
                                       FE_Q<dim> (2), 1));
-                                  // for this an assertion thrown in
-                                  // FESystem::build_interface_constraints
-                                  // for the following calls for dim=3
-//  fe_datas.push_back(new FESystem<dim>(FE_Q<dim> (3), 2));
-//  fe_datas.push_back(new FESystem<dim>(FE_Q<dim> (1), 2,
-//                                    FE_Q<dim> (3), 1));
-//  fe_datas.push_back(new FESystem<dim>(FE_Q<dim> (4), 2));
+                                  // for dim==3 the constraints are
+                                  // only hardcoded for Q1-Q2
+  if (dim!=3)
+    {
+      fe_datas.push_back(new FESystem<dim>(FE_Q<dim> (3), 2));
+      fe_datas.push_back(new FESystem<dim>(FE_Q<dim> (1), 2,
+                                          FE_Q<dim> (3), 1));
+      fe_datas.push_back(new FESystem<dim>(FE_Q<dim> (4), 2));
+    }
   
   deallog << endl << "dim=" << dim << endl;
   for (unsigned int n=0; n<fe_datas.size(); ++n)
@@ -65,7 +67,7 @@ void test_fe_datas()
 
 int main(int,char)
 {
-  ofstream logfile("fe_data_test.output");
+  std::ofstream logfile("fe_data_test.output");
   deallog.attach(logfile);
   deallog.depth_console(0);
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.