From 181045f8a91b6d2e6b8feb801bb4919bcf75e4ce Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 17 Feb 2015 10:16:01 +0000
Subject: [PATCH] dimensionedType: Extend lookupOrDefault to handle any form of
dimensioned type input e.g. Not specified: default used. Fully
specified: rhoMax rhoMax [ 1 -3 0 0 0 ] 2.0; Without name:
rhoMax [ 1 -3 0 0 0 ] 2.0; Value only: rhoMax
2.0;
---
.../dimensionedType/dimensionedType.C | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 82f28aef311..4820505ba6b 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,8 +38,14 @@ Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrDefault
const dimensionSet& dims
)
{
- Type value = dict.lookupOrDefault<Type>(name, defaultValue);
- return dimensioned<Type>(name, dims, value);
+ if (dict.found(name))
+ {
+ return dimensioned<Type>(name, dims, dict.lookup(name));
+ }
+ else
+ {
+ return dimensioned<Type>(name, dims, defaultValue);
+ }
}
--
GitLab