Commit 9d1f3916 authored by Andrew Heather's avatar Andrew Heather
Browse files

GIT: remove merge/rebase artifacts

parent 2c751d2a
......@@ -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:
......
......@@ -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)
{
......
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment