From 84b6f955c5a921ab444f59bbd6ad23f4d54ff5d7 Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Tue, 11 Dec 2012 18:39:40 +0100
Subject: [PATCH] remove version-dependent Lis macros from LisOption.h and
update the list of matrix storage types
---
.../SystemOfLinearEquations/LisOption.cpp | 3 ++-
.../SystemOfLinearEquations/LisOption.h | 22 +++++++++----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/MathLib/LinAlg/SystemOfLinearEquations/LisOption.cpp b/MathLib/LinAlg/SystemOfLinearEquations/LisOption.cpp
index 308f3dc0ff5..8ee5d504b09 100644
--- a/MathLib/LinAlg/SystemOfLinearEquations/LisOption.cpp
+++ b/MathLib/LinAlg/SystemOfLinearEquations/LisOption.cpp
@@ -88,9 +88,10 @@ LisOption::MatrixType LisOption::getMatrixType(const std::string &matrix_name)
RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, ELL);
RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, JDS);
RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, BSR);
+ RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, BSC);
RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, VBR);
- RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, DNS);
RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, COO);
+ RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, DNS);
return MatrixType::CRS;
#undef RETURN_MATRIX_ENUM_IF_SAME_STRING
diff --git a/MathLib/LinAlg/SystemOfLinearEquations/LisOption.h b/MathLib/LinAlg/SystemOfLinearEquations/LisOption.h
index 698bc5f13a5..704b38f80ee 100644
--- a/MathLib/LinAlg/SystemOfLinearEquations/LisOption.h
+++ b/MathLib/LinAlg/SystemOfLinearEquations/LisOption.h
@@ -14,7 +14,6 @@
#define LIS_OPTION_H_
#include <string>
-#include "lis.h"
namespace MathLib
{
@@ -70,16 +69,17 @@ struct LisOption
/// Matrix type
enum class MatrixType : int
{
- CRS = LIS_MATRIX_CRS,
- CCS = LIS_MATRIX_CCS,
- MSR = LIS_MATRIX_MSR,
- DIA = LIS_MATRIX_DIA,
- ELL = LIS_MATRIX_ELL,
- JDS = LIS_MATRIX_JDS,
- BSR = LIS_MATRIX_BSR,
- VBR = LIS_MATRIX_VBR,
- DNS = LIS_MATRIX_DNS,
- COO = LIS_MATRIX_COO
+ CRS = 1,
+ CCS = 2,
+ MSR = 3,
+ DIA = 4,
+ ELL = 5,
+ JDS = 6,
+ BSR = 7,
+ BSC = 8,
+ VBR = 9,
+ COO = 10,
+ DNS = 11
};
/// Linear solver type
--
GitLab