zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fieldAverageItem: Updated

Browse Source 
Resolves bug-report https://bugs.openfoam.org/view.php?id=3130
This commit is contained in:
Henry Weller
2018-12-11 15:47:57 +00:00
parent 072bc78266
commit 2e8f733e4e
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
etc/config.sh/compiler
View File

@ -57,6 +57,12 @@ OpenFOAM | ThirdParty)
Gcc61) Gcc61)
gcc_version=gcc-6.1.0 gcc_version=gcc-6.1.0
;; ;;
Gcc72)
gcc_version=gcc-7.2.0
;;
Gcc73)
gcc_version=gcc-7.3.0
;;
Gcc81) Gcc81)
gcc_version=gcc-8.1.0 gcc_version=gcc-8.1.0
;; ;;

2
src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
View File

@ -60,7 +60,7 @@ Foam::functionObjects::fieldAverageItem::fieldAverageItem()
meanFieldName_("unknown"), meanFieldName_("unknown"),
prime2Mean_(0), prime2Mean_(0),
prime2MeanFieldName_("unknown"), prime2MeanFieldName_("unknown"),
base_(ITER), base_(baseType::iter),
window_(-1.0), window_(-1.0),
windowName_("") windowName_("")
{} {}

12
src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
View File

@ -89,10 +89,10 @@ public:
static const word EXT_PRIME2MEAN; static const word EXT_PRIME2MEAN;
//- Enumeration defining the averaging base type //- Enumeration defining the averaging base type
enum baseType enum class baseType
{ {
ITER, iter,
TIME time
}; };
@ -198,16 +198,16 @@ public:
return baseTypeNames_[base_]; return baseTypeNames_[base_];
} }
//- Return true if base is ITER //- Return true if base is iter
Switch iterBase() const Switch iterBase() const
{ {
return base_ == ITER; return base_ == baseType::iter;
} }
//- Return true if base is time //- Return true if base is time
Switch timeBase() const Switch timeBase() const
{ {
return base_ == TIME; return base_ == baseType::time;
} }
scalar window() const scalar window() const