Check support for HDF5 and MPI

diff --git a/include/deal.II/base/hdf5.h b/include/deal.II/base/hdf5.h
index 4d34cd66464d576677796b55966856e6c430d8d6..26d18844035bb2495f595eaeb95cba999e8905f0 100644 (file)
--- a/include/deal.II/base/hdf5.h
+++ b/include/deal.II/base/hdf5.h
@@ -18,11 +18,13 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/lac/full_matrix.h>
+#ifdef DEAL_II_WITH_HDF5
 
-#include <hdf5.h>
+#  include <deal.II/lac/full_matrix.h>
 
-#include <vector>
+#  include <hdf5.h>
+
+#  include <vector>
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -391,4 +393,7 @@ namespace HDF5
 
 DEAL_II_NAMESPACE_CLOSE
 
-#endif
+
+#endif // DEAL_II_WITH_HDF5
+
+#endif // dealii_hdf5_h

diff --git a/source/base/hdf5.cc b/source/base/hdf5.cc
index 80c28624d7d4b6dcba6a06b8089e9bc9b3b226d8..dfe415927c1cc3ed1ef6e5382b3112074db52c9e 100644 (file)
--- a/source/base/hdf5.cc
+++ b/source/base/hdf5.cc
@@ -13,18 +13,19 @@
 //
 // ---------------------------------------------------------------------
 
-
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/hdf5.h>
+#ifdef DEAL_II_WITH_HDF5
+
+#  include <deal.II/base/hdf5.h>
 
-#include <deal.II/lac/full_matrix.h>
+#  include <deal.II/lac/full_matrix.h>
 
-#include <hdf5.h>
+#  include <hdf5.h>
 
-#include <memory>
-#include <numeric>
-#include <vector>
+#  include <memory>
+#  include <numeric>
+#  include <vector>
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -627,6 +628,12 @@ namespace HDF5
 
     if (mpi)
       {
+#  ifndef DEAL_II_WITH_MPI
+        AssertThrow(false, ExcMessage("MPI support is disabled."));
+#  endif // DEAL_II_WITH_MPI
+#  ifndef H5_HAVE_PARALLEL
+        AssertThrow(false, ExcMessage("HDF5 parallel support is disabled."));
+#  endif // H5_HAVE_PARALLEL
         plist = H5Pcreate(H5P_FILE_ACCESS);
         H5Pset_fapl_mpio(plist, mpi_communicator, info);
       }
@@ -801,3 +808,5 @@ namespace HDF5
 } // namespace HDF5
 
 DEAL_II_NAMESPACE_CLOSE
+
+#endif // DEAL_II_WITH_HDF5