]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge pull request #7301 from BenBrands/new_constructor_ScaLAPACK
authorWolfgang Bangerth <bangerth@colostate.edu>
Wed, 10 Oct 2018 21:52:16 +0000 (15:52 -0600)
committerGitHub <noreply@github.com>
Wed, 10 Oct 2018 21:52:16 +0000 (15:52 -0600)
add constructor for ScaLAPACKMatrix

1  2 
include/deal.II/lac/scalapack.h
source/lac/scalapack.cc

index 70c5e2512f97e99eea5db3956a672151021ab280,6dcc20d2b0931140348618c31481a83e49568d48..693f1b4217126f9445a9b36d333a78b096e7c6aa
@@@ -130,12 -130,26 +130,26 @@@ public
     * using the process grid in @p process_grid.
     */
    ScaLAPACKMatrix(
 -    const size_type                                          size,
 -    const std::shared_ptr<const Utilities::MPI::ProcessGrid> process_grid,
 -    const size_type                                          block_size = 32,
 -    const LAPACKSupport::Property                            property =
 +    const size_type                                           size,
 +    const std::shared_ptr<const Utilities::MPI::ProcessGrid> &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<const Utilities::MPI::ProcessGrid> &process_grid,
+     const size_type row_block_size    = 32,
+     const size_type column_block_size = 32);
    /**
     * Destructor
     */
Simple merge

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.