[cig-commits] commit 1889 by heister to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 1889

fix include guards

U   trunk/aspect/source/geometry_model/box.cc
U   trunk/aspect/source/postprocess/visualization.cc
U   trunk/aspect/source/simulator/core.cc


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

Diff:
Modified: trunk/aspect/source/geometry_model/box.cc
===================================================================
--- trunk/aspect/source/geometry_model/box.cc	2013-09-11 15:45:34 UTC (rev 1888)
+++ trunk/aspect/source/geometry_model/box.cc	2013-09-11 17:04:03 UTC (rev 1889)
@@ -44,7 +44,7 @@
         coarse_grid.begin_active()->face(f)->set_boundary_indicator(f);
 
       //Tell p4est about the periodicity of the mesh.
-#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) >= 810
+#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) >= 801
       std::vector<std_cxx1x::tuple< typename parallel::distributed::Triangulation<dim>::cell_iterator, unsigned int,
                                     typename parallel::distributed::Triangulation<dim>::cell_iterator, unsigned int> >
                                    periodicity_vector;

Modified: trunk/aspect/source/postprocess/visualization.cc
===================================================================
--- trunk/aspect/source/postprocess/visualization.cc	2013-09-11 15:45:34 UTC (rev 1888)
+++ trunk/aspect/source/postprocess/visualization.cc	2013-09-11 17:04:03 UTC (rev 1889)
@@ -288,7 +288,7 @@
             // if deal.II supports it (after 7.3.x), pass time step number and time as
             // metadata into the output file
             DataOutBase::VtkFlags vtk_flags;
-#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) >= 740
+#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) >= 704
             vtk_flags.cycle = this->get_timestep_number();
             vtk_flags.time = this->get_time();
 #endif

Modified: trunk/aspect/source/simulator/core.cc
===================================================================
--- trunk/aspect/source/simulator/core.cc	2013-09-11 15:45:34 UTC (rev 1888)
+++ trunk/aspect/source/simulator/core.cc	2013-09-11 17:04:03 UTC (rev 1889)
@@ -640,7 +640,7 @@
                              == parameters.prescribed_velocity_boundary_indicators.end(), 
                   ExcInternalError());
 
-#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) >= 810
+#if (DEAL_II_MAJOR*100 + DEAL_II_MINOR) >= 801
           DoFTools::make_periodicity_constraints(dof_handler, 
                                                  (*p).first.first,  //first boundary id
                                                  (*p).first.second, //second boundary id