From ee6f3909bd8cb06752ed5d83f2d0a9a5d5d08dd8 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 2 Jan 2015 19:20:19 +0000
Subject: [PATCH] LduMatrixOperations: Added support for scaling symmetric
 matrices Note: non-uniform scaling of a symmetric matrix generates an
 asymmetric matrix

---
 applications/test/LduMatrix/LduMatrixTest3.C    |  2 +-
 .../LduMatrix/LduMatrix/LduMatrixOperations.C   | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/applications/test/LduMatrix/LduMatrixTest3.C b/applications/test/LduMatrix/LduMatrixTest3.C
index 39b8a069bb..f13692ec05 100644
--- a/applications/test/LduMatrix/LduMatrixTest3.C
+++ b/applications/test/LduMatrix/LduMatrixTest3.C
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
 
         for (int corr=0; corr<nCorr; corr++)
         {
-            volScalarField rAU = 1.0/UEqn.A();
+            volScalarField rAU(1.0/UEqn.A());
 
             U = rAU*UEqn.H();
             phi = (fvc::interpolate(U) & mesh.Sf())
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
index d35c0c12d4..46d2a6e032 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-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -412,23 +412,20 @@ void Foam::LduMatrix<Type, DType, LUType>::operator*=
         *sourcePtr_ *= sf;
     }
 
-    if (upperPtr_)
+    // Non-uniform scaling causes a symmetric matrix
+    // to become asymmetric
+    if (symmetric() || asymmetric())
     {
-        Field<LUType>& upper = *upperPtr_;
+        Field<LUType>& upper = this->upper();
+        Field<LUType>& lower = this->lower();
 
         const unallocLabelList& l = lduAddr().lowerAddr();
+        const unallocLabelList& u = lduAddr().upperAddr();
 
         for (register label face=0; face<upper.size(); face++)
         {
             upper[face] *= sf[l[face]];
         }
-    }
-
-    if (lowerPtr_)
-    {
-        Field<LUType>& lower = *lowerPtr_;
-
-        const unallocLabelList& u = lduAddr().upperAddr();
 
         for (register label face=0; face<lower.size(); face++)
         {