From 74d73777e272fe956c044361f27445b25d7d20df Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Thu, 9 Jul 2015 23:51:59 +0200
Subject: [PATCH] include comments
---
MathLib/LinAlg/ApplyKnownSolution.h | 2 +-
MathLib/LinAlg/Eigen/EigenLinearSolver.cpp | 3 ++-
MathLib/LinAlg/Eigen/EigenLinearSolver.h | 3 +--
MathLib/LinAlg/Eigen/EigenMatrix.h | 5 ++++-
MathLib/LinAlg/Eigen/EigenTools.cpp | 6 +++---
MathLib/LinAlg/Eigen/EigenVector.h | 6 +++++-
MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp | 1 +
MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h | 2 +-
8 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/MathLib/LinAlg/ApplyKnownSolution.h b/MathLib/LinAlg/ApplyKnownSolution.h
index 72c28fe3481..c6aca210db8 100644
--- a/MathLib/LinAlg/ApplyKnownSolution.h
+++ b/MathLib/LinAlg/ApplyKnownSolution.h
@@ -15,7 +15,7 @@
#ifdef OGS_USE_EIGEN
#include "MathLib/LinAlg/Eigen/EigenTools.h"
-#endif // USE_LIS
+#endif // OGS_USE_EIGEN
#ifdef USE_LIS
#include "MathLib/LinAlg/Lis/LisTools.h"
diff --git a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
index 8071c650e30..d23ae859e5b 100644
--- a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
+++ b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
@@ -9,6 +9,7 @@
#include "EigenLinearSolver.h"
+#include <boost/property_tree/ptree.hpp>
#include <logog/include/logog.hpp>
#include <unsupported/Eigen/IterativeSolvers>
@@ -36,7 +37,7 @@ public:
// Compute the numerical factorization
_solver.factorize(A);
if(_solver.info()!=Eigen::Success) {
- INFO("\t failed");
+ ERR("The numerical factorization failed in Eigen");
return;
}
}
diff --git a/MathLib/LinAlg/Eigen/EigenLinearSolver.h b/MathLib/LinAlg/Eigen/EigenLinearSolver.h
index d536b157c9a..8f7261e3fa1 100644
--- a/MathLib/LinAlg/Eigen/EigenLinearSolver.h
+++ b/MathLib/LinAlg/Eigen/EigenLinearSolver.h
@@ -12,8 +12,7 @@
#include <vector>
-#include <boost/any.hpp>
-#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
#include "EigenVector.h"
#include "EigenOption.h"
diff --git a/MathLib/LinAlg/Eigen/EigenMatrix.h b/MathLib/LinAlg/Eigen/EigenMatrix.h
index fb254a58e0f..c6d5c276775 100644
--- a/MathLib/LinAlg/Eigen/EigenMatrix.h
+++ b/MathLib/LinAlg/Eigen/EigenMatrix.h
@@ -11,9 +11,10 @@
#define EIGENMATRIX_H_
#include <cassert>
+#ifndef NDEBUG
#include <fstream>
-#include <iosfwd>
#include <string>
+#endif
#include <Eigen/Sparse>
@@ -122,6 +123,7 @@ public:
/// return if this matrix is already assembled or not
bool isAssembled() const { return true; }
+#ifndef NDEBUG
/// printout this matrix for debugging
void write(const std::string &filename) const
{
@@ -138,6 +140,7 @@ public:
os << it.row() << " " << it.col() << ": " << it.value() << "\n";
os << std::endl;
}
+#endif
RawMatrixType& getRawMatrix() { return _mat; }
const RawMatrixType& getRawMatrix() const { return _mat; }
diff --git a/MathLib/LinAlg/Eigen/EigenTools.cpp b/MathLib/LinAlg/Eigen/EigenTools.cpp
index b820e768c84..3dd8589d3e8 100644
--- a/MathLib/LinAlg/Eigen/EigenTools.cpp
+++ b/MathLib/LinAlg/Eigen/EigenTools.cpp
@@ -23,7 +23,7 @@ void applyKnownSolution(EigenMatrix &A_, EigenVector &b_, const std::vector<std:
typedef EigenMatrix::RawMatrixType SpMat;
auto &A = A_.getRawMatrix();
auto &b = b_.getRawVector();
- const size_t n_rows = A.rows();
+ const std::size_t n_rows = A.rows();
for (std::size_t ix=0; ix<vec_knownX_id.size(); ix++)
{
int row_id = vec_knownX_id[ix];
@@ -32,7 +32,7 @@ void applyKnownSolution(EigenMatrix &A_, EigenVector &b_, const std::vector<std:
for (SpMat::InnerIterator it(A,row_id); it; ++it)
it.valueRef() = .0;
//b_i -= A(i,k)*val, i!=k
- for (size_t i=0; i<n_rows; i++)
+ for (std::size_t i=0; i<n_rows; i++)
for (SpMat::InnerIterator it(A,i); it; ++it)
{
if (it.col()!=row_id) continue;
@@ -41,7 +41,7 @@ void applyKnownSolution(EigenMatrix &A_, EigenVector &b_, const std::vector<std:
//b_k = val
b[row_id] = x;
//A(i, k) = 0., i!=k
- for (size_t i=0; i<n_rows; i++)
+ for (std::size_t i=0; i<n_rows; i++)
for (SpMat::InnerIterator it(A,i); it; ++it)
{
if (it.col()!=row_id) continue;
diff --git a/MathLib/LinAlg/Eigen/EigenVector.h b/MathLib/LinAlg/Eigen/EigenVector.h
index edc93f4af2e..7308c344333 100644
--- a/MathLib/LinAlg/Eigen/EigenVector.h
+++ b/MathLib/LinAlg/Eigen/EigenVector.h
@@ -10,9 +10,11 @@
#ifndef EIGENVECTOR_H_
#define EIGENVECTOR_H_
-#include <string>
#include <vector>
+#ifndef NDEBUG
#include <fstream>
+#include <string>
+#endif
#include <Eigen/Eigen>
@@ -86,8 +88,10 @@ public:
}
}
+#ifndef NDEBUG
/// printout this equation for debugging
void write (const std::string &filename) const { std::ofstream os(filename); os << _vec; }
+#endif
/// return a raw Lis vector object
RawVectorType& getRawVector() {return _vec; }
diff --git a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp
index b2254372238..d63d953dc24 100644
--- a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp
+++ b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp
@@ -9,6 +9,7 @@
#include "EigenLisLinearSolver.h"
+#include <boost/property_tree/ptree.hpp>
#ifdef _OPENMP
#include <omp.h>
#endif
diff --git a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h
index 796dd8b44bc..c503e34ddaa 100644
--- a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h
+++ b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h
@@ -12,7 +12,7 @@
#include <vector>
-#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
#include <lis.h>
#include "MathLib/LinAlg/Lis/LisOption.h"
--
GitLab