Merge pull request #163 from fverdugo/split_vector

Split vector

Author: fverdugo

CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## "master" branch
+
+### Added
+
+- Split format support for `PVector`.
+- Helper functions to build partitioned sparse matrices and vectors in split format, `pvector_from_split_blocks` and `psparse_from_split_blocks`.
+
+### Deprecated
+
+- `OwnAndGhostVectors` is replaced by `SplitVector`.
+
 ## [0.5.1] - 2024-07-26
 
 ### Added

src/PartitionedArrays.jl

@@ -134,9 +134,16 @@ export repartition
 export repartition!
 export renumber
 export find_local_indices
+export SplitVector
+export split_vector
+export split_vector_blocks
+export pvector_from_split_blocks
 include("p_vector.jl")
 
 export SplitMatrix
+export split_matrix
+export split_matrix_blocks
+export psparse_from_split_blocks
 export PSparseMatrix
 export psparse
 export psparse!

src/p_sparse_matrix.jl

@@ -637,6 +637,16 @@ function split_matrix(
     SplitMatrix(blocks,row_permutation,col_permutation)
 end
 
+function split_matrix(
+    own_own::AbstractMatrix,
+    own_ghost::AbstractMatrix,
+    ghost_own::AbstractMatrix,
+    ghost_ghost::AbstractMatrix,
+    row_permutation,
+    col_permutation)
+    blocks = split_matrix_blocks(own_own,own_ghost,ghost_own,ghost_ghost)
+    split_matrix(blocks,row_permutation,col_permutation)
+end
 
 Base.size(a::AbstractSplitMatrix) = (length(a.row_permutation),length(a.col_permutation))
 Base.IndexStyle(::Type{<:AbstractSplitMatrix}) = IndexCartesian()
@@ -1294,6 +1304,33 @@ function psparse!(C,V,cache)
     end
 end
 
+function psparse_from_split_blocks(oo,oh,ho,hh,rowp,colp;assembled=false)
+    rperms = map(local_permutation,rowp)
+    cperms = map(local_permutation,colp)
+    values = map(split_matrix,oo,oh,ho,hh,rperms,cperms)
+    PSparseMatrix(values,rowp,colp,assembled)
+end
+
+function psparse_from_split_blocks(oo,oh,rowp,colp;assembled=true)
+    ho = map(oo,rowp,colp) do oo, rows, cols
+        T = typeof(oo)
+        Tv = eltype(oo)
+        Ti = indextype(oo)
+        n_ghost_rows = ghost_length(rows)
+        n_own_cols = own_length(cols)
+        sparse_matrix(T,Ti[],Ti[],Tv[],n_ghost_rows,n_own_cols)
+    end
+    hh = map(oo,rowp,colp) do oo, rows, cols
+        T = typeof(oo)
+        Tv = eltype(oo)
+        Ti = indextype(oo)
+        n_ghost_rows = ghost_length(rows)
+        n_ghost_cols = ghost_length(cols)
+        sparse_matrix(T,Ti[],Ti[],Tv[],n_ghost_rows,n_ghost_cols)
+    end
+    psparse_from_split_blocks(oo,oh,ho,hh,rowp,colp;assembled)
+end
+
 function assemble(A::PSparseMatrix;kwargs...)
     rows = map(remove_ghost,partition(axes(A,1))) 
     assemble(A,rows;kwargs...)