diff --git a/dune/istl/novlpschwarz.hh b/dune/istl/novlpschwarz.hh index bf2f2ce2d235e99f7ec3fd11c7b0bdd6d5e8fa4c..61d9755212618324e062e282d58cf5b001689f35 100644 --- a/dune/istl/novlpschwarz.hh +++ b/dune/istl/novlpschwarz.hh @@ -132,7 +132,7 @@ namespace Dune { // at the beginning make a multimap "bordercontribution". // process has i and j as border dofs but is not the owner // => only contribute to Ax if i,j is in bordercontribution - if (buildcomm == true) { + if (buildcomm) { // set up mask vector if (mask.size()!=static_cast<typename std::vector<double>::size_type>(x.size())) { @@ -188,7 +188,7 @@ namespace Dune { flag = false; continue; } - if (flag == false) + if (!flag) continue; } // don´t contribute to Ax if @@ -198,7 +198,7 @@ namespace Dune { // as interor/border dofs // if the owner of j does not have i as interior/border dof, // it will not be taken into account - if (flag==true) + if (flag) bordercontribution.insert(std::pair<int,int>(i.index(),j.index())); } } diff --git a/dune/istl/owneroverlapcopy.hh b/dune/istl/owneroverlapcopy.hh index 64ec00d4884dd5088aa3b97dbcd4dd496c52dd77..ebd27450210fe87f6559a1237a06aea6a09ae2a8 100644 --- a/dune/istl/owneroverlapcopy.hh +++ b/dune/istl/owneroverlapcopy.hh @@ -656,17 +656,17 @@ namespace Dune { if (OwnerCopyToOwnerCopyInterfaceBuilt) OwnerCopyToOwnerCopyInterface.free(); if (CopyToAllInterfaceBuilt) CopyToAllInterface.free(); if (globalLookup_) delete globalLookup_; - if (freecomm==true) - if(comm!=MPI_COMM_NULL) - { - // If it is possible to query whether MPI_Finalize - // was called, only free the communicator before - // calling MPI_Finalize. - int wasFinalized = 0; - MPI_Finalized( &wasFinalized ); - if(!wasFinalized) - MPI_Comm_free(&comm); + if (freecomm && (comm != MPI_COMM_NULL)) + { + // If it is possible to query whether MPI_Finalize + // was called, only free the communicator before + // calling MPI_Finalize. + int wasFinalized = 0; + MPI_Finalized(&wasFinalized); + if (!wasFinalized) { + MPI_Comm_free(&comm); } + } } private: