From d12b146244c30c3a5be9cf52c6446cb2bbfad2cb Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Tue, 5 Jul 2011 20:53:44 +0000
Subject: [PATCH] Included missing headers. make headercheck runs through now.
[[Imported from SVN: r1487]]
---
dune/istl/matrixmarket.hh | 31 ++++++++++++++++++++++++++++---
dune/istl/paamg/parameters.hh | 3 +++
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/dune/istl/matrixmarket.hh b/dune/istl/matrixmarket.hh
index 9f83d8a0d..66aabe27a 100644
--- a/dune/istl/matrixmarket.hh
+++ b/dune/istl/matrixmarket.hh
@@ -11,12 +11,37 @@
#include <ios>
#include "matrixutils.hh"
#include "bcrsmatrix.hh"
+#include "owneroverlapcopy.hh"
#include <dune/common/fmatrix.hh>
#include <dune/common/tuples.hh>
#include <dune/common/misc.hh>
namespace Dune
{
+
+ /**
+ * @defgroup ISTL_IO IO for matrices and vectors.
+ * @ingroup ISTL_SPMV
+ * @brief Provides methods for reading and writing matrices and vectors
+ * in various formats.
+ *
+ *
+ * Routine printmatix prints a (sparse matrix with all entries (even zeroes).
+ * Function printvector prints a vector to a stream.
+ * PrintSparseMatrix prints a sparse matrix omitting all nonzeroes.
+ * With writeMatrixToMatlab one can write a matrix in a Matlab readable format.
+ * Using storeMartrixMarket and loadMatrixMarket one can store and load a parallel ISTL
+ * matrix in MatrixMarket format.
+ *
+ * @addtogroup ISTL_IO
+ * @{
+ */
+
+ /** @file
+ * @author Markus Blatt
+ * @brief Provides classes for reading and writing MatrixMarket Files with
+ * an extension for parallel matrices.
+ */
namespace
{
/**
@@ -945,7 +970,7 @@ namespace Dune
for(Iterator iter = comm.indexSet().begin();
iter != comm.indexSet().end(); ++iter) {
file << iter->global()<<" "<<(std::size_t)iter->local()<<" "
- <<(char)iter->local().attribute()<<" "<<(int)iter->local().isPublic()<<std::endl;
+ <<(int)iter->local().attribute()<<" "<<(int)iter->local().isPublic()<<std::endl;
}
// Store neighbour information for efficient remote indices setup.
file<<"neighbours:";
@@ -1008,7 +1033,7 @@ namespace Dune
file >>g;
std::size_t l;
file >>l;
- char c;
+ int c;
file >>c;
bool b;
file >> b;
@@ -1033,6 +1058,6 @@ namespace Dune
}
comm.ri.template rebuild<false>();
}
-
+ /** @} */
}
#endif
diff --git a/dune/istl/paamg/parameters.hh b/dune/istl/paamg/parameters.hh
index a53457134..d2b630de0 100644
--- a/dune/istl/paamg/parameters.hh
+++ b/dune/istl/paamg/parameters.hh
@@ -2,6 +2,9 @@
// vi: set et ts=4 sw=2 sts=2:
#ifndef DUNE_AMG_PARAMETERS_HH
#define DUNE_AMG_PARAMETERS_HH
+
+#include <cstddef>
+
namespace Dune
{
namespace Amg
--
GitLab