From ff33bfda9641c79b4174ae9a0ec3c2788078b5f2 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 13 Jul 2022 19:05:43 +0200 Subject: [PATCH] COMP: lduMatrix::defaultTolerance as variable instead of constexpr - gcc48 has linkage errors with constexpr floats (sometimes?) --- src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C | 2 ++ src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C index 0ecf015fd4..3ebbdb5c63 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C @@ -41,6 +41,8 @@ namespace Foam } +const Foam::scalar Foam::lduMatrix::defaultTolerance = 1e-6; + const Foam::Enum < Foam::lduMatrix::normTypes diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H index 6ebb028e56..3c5e88d714 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H @@ -108,11 +108,11 @@ public: //- Names for the normTypes static const Enum normTypesNames_; - //- Default maximum number of iterations for solvers - static constexpr label defaultMaxIter = 1000; + //- Default maximum number of iterations for solvers (1000) + static constexpr const label defaultMaxIter = 1000; - //- Default (absolute) tolerance - static constexpr scalar defaultTolerance = 1e-6; + //- Default (absolute) tolerance (1e-6) + static const scalar defaultTolerance; //- Abstract base-class for lduMatrix solvers