delete usage of LisLinearSolver. use EigenLisLinearSolver

MathLib/LinAlg/ApplyKnownSolution.h

@@ -15,10 +15,6 @@
 #include "MathLib/LinAlg/Eigen/EigenTools.h"
 #endif // OGS_USE_EIGEN
 
-#ifdef USE_LIS
-#include "MathLib/LinAlg/Lis/LisTools.h"
-#endif // USE_LIS
-
 #ifdef USE_PETSC
 #include "MathLib/LinAlg/PETSc/PETScTools.h"
 #endif // USE_PETSC

MathLib/LinAlg/Lis/LisTools.cpp

-/**
- * \file
- * \author Norihiro Watanabe
- * \date   2013-04-16
- * \brief  Implementation of Lis utility functions.
- *
- * \copyright
- * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.org/project/license
- *
- */
-
-#include "LisTools.h"
-
-#include <cassert>
-
-#include "logog/include/logog.hpp"
-
-#include "LisMatrix.h"
-#include "LisVector.h"
-
-#include "BaseLib/quicksort.h"
-#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
-#include "MathLib/LinAlg/Sparse/CRSTools.h"
-
-namespace MathLib
-{
-
-namespace detail
-{
-/// Converts the internal format of a lis matrix into the compressed row storage
-/// format. Since the column entries of a row in the internal lis format aren't
-/// sorted lis2crs not only transfers the indices and entries, it also
-/// sorts the columns and values, accordingly.
-MathLib::CRSMatrix<double, typename LisMatrix::IndexType>* lis2crs(LisMatrix &a)
-{
-    using IndexType = LisMatrix::IndexType;
-
-    LIS_MATRIX &A = a.getRawMatrix();
-
-    IndexType const n_rows(A->n); // number of rows
-    IndexType *iA(new IndexType[n_rows+1]); // row ptr array
-    iA[0] = 0;
-    for (LIS_INT k=1; k<n_rows+1; ++k) {
-        iA[k] = iA[k-1] + A->w_row[k-1 - A->is];
-    }
-
-    IndexType *jA(new IndexType[iA[n_rows]]); // column indices array
-    double *entries(new double[iA[n_rows]]);
-    for (IndexType r(0); r<n_rows; ++r) {
-        IndexType const beg_idx(iA[r]);
-        IndexType const end_idx(iA[r+1]);
-        for (IndexType j(beg_idx); j<end_idx; ++j) {
-            jA[j] = A->w_index[r-A->is][j-beg_idx];
-            entries[j] = A->w_value[r-A->is][j-beg_idx];
-        }
-    }
-
-    for (IndexType r(0); r<n_rows; ++r) {
-        IndexType const beg_idx(iA[r]);
-        IndexType const end_idx(iA[r+1]);
-        // sort the column entries of the row
-        BaseLib::quicksort(jA, beg_idx, end_idx, entries);
-    }
-
-    return new MathLib::CRSMatrix<double,IndexType>(A->n, iA, jA, entries);
-}
-
-// This function resets the the column indices and the entries, respectively.
-// The LIS_MATRIX must have reserved enough memory for each row already!
-void crs2lis(
-    MathLib::CRSMatrix<double, typename LisMatrix::IndexType> const& mat,
-    LIS_MATRIX &A)
-{
-    LisMatrix::IndexType const*const jA(mat.getColIdxArray());
-    double * entries(const_cast<double*>(mat.getEntryArray()));
-
-    // reset the entries in the lis matrix
-    LisMatrix::IndexType cnt(0);
-    for (LIS_INT row_i = 0; row_i < A->n; ++row_i) {
-        for (LIS_INT j = 0; j < A->w_row[row_i - A->is]; ++j) {
-            A->w_index[row_i-A->is][j] = jA[cnt];
-            A->w_value[row_i-A->is][j] = entries[cnt];
-            cnt++;
-        }
-    }
-}
-} // end namespace detail
-
-void applyKnownSolution(LisMatrix &eqsA, LisVector &eqsRHS, LisVector &/*eqsX*/,
-    const std::vector<LisMatrix::IndexType> &input_rows,
-    const std::vector<double> &input_vals)
-{
-    // unfortunatly the input is not sorted => copy and sort
-    std::vector<LisMatrix::IndexType> rows(input_rows);
-    std::vector<double> vals(input_vals);
-    BaseLib::quicksort(rows, 0, rows.size(), vals);
-
-    MathLib::CRSMatrix<double, typename LisMatrix::IndexType> *crs_mat(
-        MathLib::detail::lis2crs(eqsA));
-
-    // The following function is defined in CRSTools-impl.h
-    applyKnownSolution(crs_mat, eqsRHS, input_rows, input_vals);
-
-    detail::crs2lis(*crs_mat, eqsA.getRawMatrix());
-
-    delete crs_mat;
-}
-
-}  // MathLib

MathLib/LinAlg/Lis/LisTools.h

-/**
- * \file
- * \author Norihiro Watanabe
- * \date   2013-04-16
- * \brief  Definition of Lis utility functions.
- *
- * \copyright
- * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.org/project/license
- *
- */
-
-#ifndef LISTOOLS_H_
-#define LISTOOLS_H_
-
-#include <vector>
-
-#include "LisMatrix.h" // for LisMatrix::IndexType
-
-namespace MathLib
-{
-class LisVector;
-
-/**
- * Integrate Dirichlet boundary conditions into a system of linear equations.
- *
- * This function introduces the constants into the system by setting
- * appropriated row and column entries of the matrix to zero (except the
- * diagonal entries) and modifying values within the right hand side vector.
- *
- * @param eqsA                 Coefficient matrix
- * @param eqsRHS                 RHS vector
- * @param rows a vector of known solution entry IDs
- * @param vals a vector of known solutions
- */
-void applyKnownSolution(LisMatrix &eqsA, LisVector &eqsRHS, LisVector &/*eqsX*/,
-    const std::vector<LisMatrix::IndexType> &rows,
-    const std::vector<double> &vals);
-
-} // MathLib
-
-#endif //LISTOOLS_H_
-

ProcessLib/NumericsConfig.h

@@ -37,20 +37,6 @@
     using LinearSolverType = MathLib::EigenLisLinearSolver;
     }
 
-#elif defined(USE_LIS)
-
-    #include "MathLib/LinAlg/Lis/LisMatrix.h"
-    #include "MathLib/LinAlg/Lis/LisVector.h"
-    #include "MathLib/LinAlg/Lis/LisLinearSolver.h"
-
-namespace detail
-{
-    using GlobalVectorType = MathLib::LisVector;
-    using GlobalMatrixType = MathLib::LisMatrix;
-
-    using LinearSolverType = MathLib::LisLinearSolver;
-}
-
 #elif defined(USE_PETSC)
     #include "MathLib/LinAlg/PETSc/PETScVector.h"
     #include "MathLib/LinAlg/PETSc/PETScMatrix.h"

Tests/MathLib/TestLinearSolver.cpp

@@ -240,24 +240,6 @@ TEST(Math, CheckInterface_EigenLis)
 }
 #endif
 
-#ifdef USE_LIS
-TEST(Math, CheckInterface_Lis)
-{
-    // set solver options using Boost property tree
-    boost::property_tree::ptree t_root;
-    boost::property_tree::ptree t_solver;
-    t_root.put("lis", "-i cg -p none -tol 1e-15 -maxiter 1000");
-    BaseLib::ConfigTree conf(t_root, "",
-        BaseLib::ConfigTree::onerror, BaseLib::ConfigTree::onwarning);
-
-    using IntType = MathLib::LisMatrix::IndexType;
-
-    MathLib::LisMatrix A(Example1<IntType>::dim_eqs);
-    checkLinearSolverInterface<MathLib::LisMatrix, MathLib::LisVector,
-                               MathLib::LisLinearSolver, IntType>(A, conf);
-}
-#endif
-
 #ifdef USE_PETSC
 TEST(MPITest_Math, CheckInterface_PETSc_Linear_Solver_basic)
 {