From c44b46d9fb4709684347819231125d712e344e2f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 26 Mar 2019 08:17:53 +0100
Subject: [PATCH] STYLE: minor adjustments for fan tables (#1229)
---
.../functions/Function1/Table/TableBase.H | 5 +----
.../functions/Function1/TableFile/TableFile.C | 13 +++----------
.../functions/Function1/TableFile/TableFile.H | 14 +++++++-------
.../fvPatchFields/derived/fan/fanFvPatchField.H | 2 +-
.../derived/uniformJump/uniformJumpFvPatchField.C | 1 +
.../derived/uniformJump/uniformJumpFvPatchField.H | 2 +-
6 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index 86a2f8f248d..8a2686545ff 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -62,7 +62,7 @@ class TableBase
{
protected:
- // Protected data
+ // Protected Data
//- Table name
const word name_;
@@ -93,9 +93,6 @@ protected:
//- Return (demand driven) interpolator
const interpolationWeights& interpolator() const;
-
-private:
-
//- No copy assignment
void operator=(const TableBase<Type>&) = delete;
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
index 53f0e826763..d7ff3921b30 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -37,12 +37,12 @@ Foam::Function1Types::TableFile<Type>::TableFile
)
:
TableBase<Type>(entryName, dict),
- fName_("none")
+ fName_()
{
dict.readEntry("file", fName_);
fileName expandedFile(fName_);
- //IFstream is(expandedFile.expand());
+
autoPtr<ISstream> isPtr(fileHandler().NewIFstream(expandedFile.expand()));
ISstream& is = isPtr();
@@ -66,13 +66,6 @@ Foam::Function1Types::TableFile<Type>::TableFile(const TableFile<Type>& tbl)
{}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Function1Types::TableFile<Type>::~TableFile()
-{}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
index f7b1ce9ca85..485c98dac0e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -27,7 +27,7 @@ Class
Foam::Function1Types::TableFile
Description
- Templated table container function where data is read from file.
+ Templated table container function where data are read from file.
Usage:
\verbatim
@@ -40,8 +40,8 @@ Description
}
\endverbatim
- Data is stored as a list of Tuple2's. First column is always stored as
- scalar entries. Data is read in the form, e.g. for an entry \<entryName\>
+ Data are stored as a list of Tuple2's. First column is always stored as
+ scalar entries. Data are read in the form, e.g. for an entry \<entryName\>
that is (scalar, vector):
\verbatim
(
@@ -77,7 +77,7 @@ class TableFile
:
public TableBase<Type>
{
- // Private data
+ // Private Data
//- File name for csv table (optional)
fileName fName_;
@@ -97,7 +97,7 @@ public:
// Constructors
- //- Construct from entry name and Istream
+ //- Construct from entry name and "file" found in dictionary
TableFile(const word& entryName, const dictionary& dict);
//- Copy constructor
@@ -105,7 +105,7 @@ public:
//- Destructor
- virtual ~TableFile();
+ virtual ~TableFile() = default;
// I/O
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
index 11d86e338a1..06503f63a6a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.H
@@ -87,7 +87,7 @@ Usage
componentColumns 1(1);
separator ",";
mergeSeparators no;
- file "<constant>/pressureVsU";
+ file "<constant>/UvsPressure";
}
value uniform 0;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
index e5d58626637..0c065ca0273 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
@@ -131,6 +131,7 @@ template<class Type>
void Foam::uniformJumpFvPatchField<Type>::write(Ostream& os) const
{
fixedJumpFvPatchField<Type>::write(os);
+
if (this->cyclicPatch().owner())
{
jumpTable_->writeData(os);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
index 6f455e79d62..9c3576e740b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H
@@ -94,7 +94,7 @@ protected:
// Protected data
- //- "jump" table
+ //- The "jump" table
autoPtr<Function1<Type>> jumpTable_;
--
GitLab