Commit 861ab17e authored by Marcel Koch's avatar Marcel Koch
Browse files

update to changes from ginkgo

parent 928619bd
......@@ -35,7 +35,7 @@ namespace hyteg {
class DirichletHandlerBase
{
public:
using vec = gko::distributed::Vector< real_t >;
using vec = gko::distributed::Vector< real_t, int32_t >;
using mtx = gko::distributed::Matrix< real_t, int32_t >;
DirichletHandlerBase( std::vector< int32_t > bcIndices,
......@@ -276,7 +276,7 @@ class GinkgoCGSolver : public Solver< OperatorType >
using mtx = gko::distributed::Matrix< valueType, int32_t >;
using csr = gko::matrix::Csr< valueType, int32_t >;
using vec = gko::distributed::Vector< valueType >;
using vec = gko::distributed::Vector< valueType, int32_t >;
using dense = gko::matrix::Dense< valueType >;
GinkgoCGSolver() = default;
......
......@@ -198,7 +198,7 @@ class GinkgoSparseMatrixProxy : public SparseMatrixProxy
if ( !is_finialized_ )
{
communicate_overlap( assembler_, part_, matrix_->get_communicator() );
matrix_->read_distributed( assembler_.get_ordered_data(), part_, gko::distributed::data_placement::local );
matrix_->read_distributed( assembler_.get_ordered_data(), part_ );
is_finialized_ = true;
}
return matrix_;
......
......@@ -23,7 +23,7 @@ std::pair<int, int> local_range_(const uint_t local_size){
class GinkgoVectorProxy : public VectorProxy
{
public:
GinkgoVectorProxy(gko::distributed::Vector<real_t> *vec, const gko::dim<2> global_size, std::shared_ptr<gko::distributed::Partition<>> part) :
GinkgoVectorProxy(gko::distributed::Vector<real_t, int32_t> *vec, const gko::dim<2> global_size, std::shared_ptr<gko::distributed::Partition<>> part) :
vec_(vec), global_size_(global_size), part_(std::move(part)), data_(global_size){
auto rank = vec_->get_communicator()->rank();
local_start_ = static_cast<uint_t >(part_->get_range_bounds()[rank]);
......@@ -54,6 +54,6 @@ class GinkgoVectorProxy : public VectorProxy
gko::matrix_data<real_t, gko::distributed::global_index_type > data_;
gko::dim<2> global_size_;
gko::distributed::Vector<real_t>* vec_;
gko::distributed::Vector<real_t, int32_t>* vec_;
};
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment