From ea86dc2cf4b02f2f21955e91bd79b53d6c55a602 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Thu, 22 Mar 2018 11:04:30 +0000
Subject: [PATCH] LduMatrix: Sum-diag operations for diagonal matrices

---
 .../LduMatrix/LduMatrix/LduMatrixOperations.C   | 15 +++++++++++++++
 .../lduMatrix/lduMatrix/lduMatrixOperations.C   | 17 ++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
index a157d7ec6..3477177f0 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
@@ -30,6 +30,11 @@ License
 template<class Type, class DType, class LUType>
 void Foam::LduMatrix<Type, DType, LUType>::sumDiag()
 {
+    if (!lowerPtr_ && !upperPtr_)
+    {
+        return;
+    }
+
     const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
     const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
     Field<DType>& Diag = diag();
@@ -48,6 +53,11 @@ void Foam::LduMatrix<Type, DType, LUType>::sumDiag()
 template<class Type, class DType, class LUType>
 void Foam::LduMatrix<Type, DType, LUType>::negSumDiag()
 {
+    if (!lowerPtr_ && !upperPtr_)
+    {
+        return;
+    }
+
     const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
     const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
     Field<DType>& Diag = diag();
@@ -69,6 +79,11 @@ void Foam::LduMatrix<Type, DType, LUType>::sumMagOffDiag
     Field<LUType>& sumOff
 ) const
 {
+    if (!lowerPtr_ && !upperPtr_)
+    {
+        return;
+    }
+
     const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
     const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
index c14078b26..1b89bf17c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,11 @@ Description
 
 void Foam::lduMatrix::sumDiag()
 {
+    if (!lowerPtr_ && !upperPtr_)
+    {
+        return;
+    }
+
     const scalarField& Lower = const_cast<const lduMatrix&>(*this).lower();
     const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();
     scalarField& Diag = diag();
@@ -49,6 +54,11 @@ void Foam::lduMatrix::sumDiag()
 
 void Foam::lduMatrix::negSumDiag()
 {
+    if (!lowerPtr_ && !upperPtr_)
+    {
+        return;
+    }
+
     const scalarField& Lower = const_cast<const lduMatrix&>(*this).lower();
     const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();
     scalarField& Diag = diag();
@@ -69,6 +79,11 @@ void Foam::lduMatrix::sumMagOffDiag
     scalarField& sumOff
 ) const
 {
+    if (!lowerPtr_ && !upperPtr_)
+    {
+        return;
+    }
+
     const scalarField& Lower = const_cast<const lduMatrix&>(*this).lower();
     const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();