From de51fb4d78330a844fa1a989bcb98de62391cf33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkovsky@mmg.fjfi.cvut.cz>
Date: Wed, 6 May 2020 11:13:33 +0200
Subject: [PATCH] Switched MatrixType in PDEProblem to segments-based matrix
---
src/TNL/Problems/PDEProblem.h | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/TNL/Problems/PDEProblem.h b/src/TNL/Problems/PDEProblem.h
index e73bf633c2..179255b93c 100644
--- a/src/TNL/Problems/PDEProblem.h
+++ b/src/TNL/Problems/PDEProblem.h
@@ -13,7 +13,8 @@
#include <TNL/Problems/Problem.h>
#include <TNL/Problems/CommonData.h>
#include <TNL/Pointers/SharedPointer.h>
-#include <TNL/Matrices/Legacy/SlicedEllpack.h>
+#include <TNL/Matrices/SparseMatrix.h>
+#include <TNL/Containers/Segments/SlicedEllpack.h>
#include <TNL/Solvers/PDE/TimeDependentPDESolver.h>
namespace TNL {
@@ -39,7 +40,14 @@ class PDEProblem : public Problem< Real, Device, Index >
using SubdomainOverlapsType = typename DistributedMeshType::SubdomainOverlapsType;
using DofVectorType = Containers::Vector< RealType, DeviceType, IndexType>;
using DofVectorPointer = Pointers::SharedPointer< DofVectorType, DeviceType >;
- using MatrixType = Matrices::Legacy::SlicedEllpack< RealType, DeviceType, IndexType >;
+ template< typename _Device, typename _Index, typename _IndexAlocator >
+ using SegmentsType = Containers::Segments::SlicedEllpack< _Device, _Index, _IndexAlocator >;
+ using MatrixType = TNL::Matrices::SparseMatrix< Real,
+ Device,
+ Index,
+ TNL::Matrices::GeneralMatrix,
+ SegmentsType
+ >;
using CommunicatorType = Communicator;
using CommonDataType = CommonData;
using CommonDataPointer = Pointers::SharedPointer< CommonDataType, DeviceType >;
--
GitLab