zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: remove merge/rebase artifacts

Browse Source
This commit is contained in:
Andrew Heather
2020-06-08 16:39:17 +01:00
parent 2c751d2ad3
commit 9d1f39165b
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/functionObjects/field/Curle/Curle.H
View File

@ -139,23 +139,9 @@ class Curle
protected:
<<<<<<< HEAD
// Protected Member Functions
//- Calculate acoustic pressure field and return true if successful
virtual bool calc();
//- No copy construct
Curle(const Curle&) = delete;
//- No copy assignment
void operator=(const Curle&) = delete;
=======
//- Calculate the acoustic pressure field and return true if successful
virtual bool calc();
>>>>>>> DOC: elaborate the usage of function objects
public:

4
src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
View File

@ -73,11 +73,7 @@ Foam::Istream& Foam::functionObjects::operator>>
faItem.mean_ = dict.get<bool>("mean");
faItem.prime2Mean_ = dict.get<bool>("prime2Mean");
faItem.base_ = faItem.baseTypeNames_.get("base", dict);
<<<<<<< HEAD
faItem.window_ = dict.getOrDefault<scalar>("window", -1);
=======
faItem.window_ = dict.getOrDefault<scalar>("window", -1.0);
>>>>>>> DOC: elaborate the usage of function objects
if (faItem.window_ > 0)
{

5
src/functionObjects/field/fluxSummary/fluxSummary.C
View File

@ -969,13 +969,8 @@ bool Foam::functionObjects::fluxSummary::read(const dictionary& dict)
needsUpdate_ = true;
mode_ = modeTypeNames_.get("mode", dict);
phiName_ = dict.getOrDefault<word>("phi", "phi");
<<<<<<< HEAD
scaleFactor_ = dict.getOrDefault<scalar>("scaleFactor", 1);
tolerance_ = dict.getOrDefault<scalar>("tolerance", 0.8);
=======
scaleFactor_ = dict.getOrDefault<scalar>("scaleFactor", 1.0);
tolerance_ = dict.getOrDefault<scalar>("tolerance", 0.8);
>>>>>>> DOC: elaborate the usage of function objects
zoneNames_.clear();
zoneDirections_.clear();