From: Wolfgang Bangerth Date: Wed, 10 Oct 2018 21:52:16 +0000 (-0600) Subject: Merge pull request #7301 from BenBrands/new_constructor_ScaLAPACK X-Git-Tag: v9.1.0-rc1~634 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f7190407eea14d8e607a62992ef84facc0440c5;p=dealii.git Merge pull request #7301 from BenBrands/new_constructor_ScaLAPACK add constructor for ScaLAPACKMatrix --- 5f7190407eea14d8e607a62992ef84facc0440c5 diff --cc include/deal.II/lac/scalapack.h index 70c5e2512f,6dcc20d2b0..693f1b4217 --- a/include/deal.II/lac/scalapack.h +++ b/include/deal.II/lac/scalapack.h @@@ -130,12 -130,26 +130,26 @@@ public * using the process grid in @p process_grid. */ ScaLAPACKMatrix( - const size_type size, - const std::shared_ptr process_grid, - const size_type block_size = 32, - const LAPACKSupport::Property property = + const size_type size, + const std::shared_ptr &process_grid, + const size_type block_size = 32, + const LAPACKSupport::Property property = LAPACKSupport::Property::symmetric); + /** + * Constructor for a general rectangular matrix that is read from + * the file @p filename and distributed using the grid @p process_grid. + * + * Loads the matrix from file @p filename using HDF5. + * In case that deal.II was built without HDF5 + * a call to this function will cause an exception to be thrown. + */ + ScaLAPACKMatrix( + const std::string & filename, + const std::shared_ptr &process_grid, + const size_type row_block_size = 32, + const size_type column_block_size = 32); + /** * Destructor */