From 1d211874aaf5d80a83ddc853af618700eb6249c3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 28 Jan 2017 17:59:34 +0000
Subject: [PATCH] functionObjects::streamLine,wallBoundedStreamLine: Removed
outdated check for 'UName'
Patch contributed by Bruno Santos
Resolves patch request https://bugs.openfoam.org/view.php?id=2444
---
.../field/streamLine/streamLine.C | 19 ++---------------
.../field/streamLine/streamLine.H | 6 +++++-
.../wallBoundedStreamLine.C | 21 ++-----------------
3 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/src/functionObjects/field/streamLine/streamLine.C b/src/functionObjects/field/streamLine/streamLine.C
index 252b4d600f2..0c66a5fce0e 100644
--- a/src/functionObjects/field/streamLine/streamLine.C
+++ b/src/functionObjects/field/streamLine/streamLine.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-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -311,22 +311,7 @@ bool Foam::functionObjects::streamLine::read(const dictionary& dict)
Info<< type() << " " << name() << ":" << nl;
dict.lookup("fields") >> fields_;
- if (dict.found("U"))
- {
- dict.lookup("U") >> UName_;
- }
- else
- {
- UName_ = "U";
- if (dict.found("U"))
- {
- IOWarningInFunction(dict)
- << "Using deprecated entry \"U\"."
- << " Please use \"UName\" instead."
- << endl;
- dict.lookup("U") >> UName_;
- }
- }
+ dict.lookup("U") >> UName_;
if (findIndex(fields_, UName_) == -1)
{
diff --git a/src/functionObjects/field/streamLine/streamLine.H b/src/functionObjects/field/streamLine/streamLine.H
index 008036b2891..7c0995e69f8 100644
--- a/src/functionObjects/field/streamLine/streamLine.H
+++ b/src/functionObjects/field/streamLine/streamLine.H
@@ -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-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -41,16 +41,20 @@ Description
writeControl writeTime;
setFormat vtk;
+ U U;
trackForward yes;
+
fields
(
U
p
);
+
lifeTime 10000;
trackLength 1e-3;
nSubCycle 5;
cloudName particleTracks;
+
seedSampleSet uniform;
uniformCoeffs
{
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
index e918fcf9707..7fd47295f1f 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.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-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -427,24 +427,7 @@ bool Foam::functionObjects::wallBoundedStreamLine::read(const dictionary& dict)
Info<< type() << " " << name() << ":" << nl;
dict.lookup("fields") >> fields_;
- if (dict.found("U"))
- {
- dict.lookup("U") >> UName_;
- }
- else
- {
- UName_ = "U";
- if (dict.found("U"))
- {
- IOWarningInFunction
- (
- dict
- ) << "Using deprecated entry \"U\"."
- << " Please use \"UName\" instead."
- << endl;
- dict.lookup("U") >> UName_;
- }
- }
+ dict.lookup("U") >> UName_;
if (findIndex(fields_, UName_) == -1)
{
--
GitLab