[cig-commits] commit 2471 by ian.rose to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 2471

Make the free_surface_fe order agnostic

U   branches/freesurface/source/simulator/core.cc
U   branches/freesurface/source/simulator/freesurface.cc


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2471&peg=2471

Diff:
Modified: branches/freesurface/source/simulator/core.cc
===================================================================
--- branches/freesurface/source/simulator/core.cc	2014-04-10 22:25:27 UTC (rev 2470)
+++ branches/freesurface/source/simulator/core.cc	2014-04-11 11:19:39 UTC (rev 2471)
@@ -144,7 +144,7 @@
 
     rebuild_stokes_matrix (true),
     rebuild_stokes_preconditioner (true),
-    free_surface_fe (FE_Q<dim>(1),dim),
+    free_surface_fe (FE_Q<dim>(2),dim),
     free_surface_dof_handler (triangulation)
 
   {

Modified: branches/freesurface/source/simulator/freesurface.cc
===================================================================
--- branches/freesurface/source/simulator/freesurface.cc	2014-04-10 22:25:27 UTC (rev 2470)
+++ branches/freesurface/source/simulator/freesurface.cc	2014-04-11 11:19:39 UTC (rev 2471)
@@ -134,7 +134,7 @@
 //     Point<dim> centroid = corrections.second;
 
      //stuff for iterating over the mesh
-     QGauss<dim-1> face_quadrature(2);
+     QGauss<dim-1> face_quadrature(free_surface_fe.degree+1);
      UpdateFlags update_flags = UpdateFlags(update_values | update_normal_vectors | update_JxW_values);
      FEFaceValues<dim> fs_fe_face_values (mapping, free_surface_fe, face_quadrature, update_flags);
      FEFaceValues<dim> fe_face_values (mapping, finite_element, face_quadrature, update_flags);
@@ -235,7 +235,7 @@
   void Simulator<dim>::free_surface_solve_elliptic_problem()
   {
     pcout << "FS: free_surface_solve_elliptic_problem()" << std::endl;
-    QGauss<dim> quadrature(1+1);
+    QGauss<dim> quadrature(free_surface_fe.degree + 1);
     UpdateFlags update_flags = UpdateFlags(update_values | update_JxW_values | update_gradients);
     FEValues<dim> fe_values (mapping, free_surface_fe, quadrature, update_flags);