From: Benjamin Brands <benjamin.brands@fau.de>
Date: Thu, 9 Aug 2018 10:59:31 +0000 (+0200)
Subject: remove inconsistency/bug in cases of serial save/ parallel load and vice versa
X-Git-Tag: v9.1.0-rc1~834^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d88fa9d310a0fa2b4314d5a4574d54d51119c16;p=dealii.git

remove inconsistency/bug in cases of serial save/ parallel load and vice versa
---

diff --git a/source/lac/scalapack.cc b/source/lac/scalapack.cc
index 6a41d47a22..6c0292042f 100644
--- a/source/lac/scalapack.cc
+++ b/source/lac/scalapack.cc
@@ -2739,7 +2739,7 @@ ScaLAPACKMatrix<NumberType>::save_parallel(
                                                   1,
                                                   n_mpi_processes);
 
-  const int MB = n_rows, NB = std::ceil(n_columns / n_mpi_processes);
+  const int MB = n_rows, NB = std::ceil((double)n_columns / n_mpi_processes);
   ScaLAPACKMatrix<NumberType> tmp(n_rows, n_columns, column_grid, MB, NB);
   copy_to(tmp);
 
@@ -3155,7 +3155,7 @@ ScaLAPACKMatrix<NumberType>::load_parallel(const char *filename)
                                                   1,
                                                   n_mpi_processes);
 
-  const int MB = n_rows, NB = std::ceil(n_columns / n_mpi_processes);
+  const int MB = n_rows, NB = std::ceil((double)n_columns / n_mpi_processes);
   ScaLAPACKMatrix<NumberType> tmp(n_rows, n_columns, column_grid, MB, NB);
 
   // get pointer to data held by the process