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

ENH: additional step function, cleanup autoPtr use in Function1

Browse Source
This commit is contained in:
Mark Olesen
2020-05-22 11:39:36 +02:00
parent 09d9c5cc03
commit 51c2329f97
41 changed files with 397 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2012-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -32,24 +33,28 @@ License
template<class Type>
Foam::TimeFunction1<Type>::TimeFunction1
(
const Time& t,
const word& name,
const Time& runTime,
const word& entryName,
const dictionary& dict
)
:
time_(t),
name_(name),
entry_(Function1<Type>::New(name, dict))
time_(runTime),
name_(entryName),
entry_(Function1<Type>::New(entryName, dict))
{
entry_->convertTimeBase(t);
entry_->convertTimeBase(runTime);
}
template<class Type>
Foam::TimeFunction1<Type>::TimeFunction1(const Time& t, const word& name)
Foam::TimeFunction1<Type>::TimeFunction1
(
const Time& runTime,
const word& entryName
)
:
time_(t),
name_(name),
time_(runTime),
name_(entryName),
entry_(nullptr)
{}
@ -57,24 +62,12 @@ Foam::TimeFunction1<Type>::TimeFunction1(const Time& t, const word& name)
template<class Type>
Foam::TimeFunction1<Type>::TimeFunction1
(
const TimeFunction1<Type>& tde
const TimeFunction1<Type>& rhs
)
:
time_(tde.time_),
name_(tde.name_),
entry_()
{
if (tde.entry_.valid())
{
entry_.reset(tde.entry_->clone().ptr());
}
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class Type>
Foam::TimeFunction1<Type>::~TimeFunction1()
time_(rhs.time_),
name_(rhs.name_),
entry_(rhs.entry_) // steal/reuse (missing clone!)
{}
@ -83,15 +76,7 @@ Foam::TimeFunction1<Type>::~TimeFunction1()
template<class Type>
void Foam::TimeFunction1<Type>::reset(const dictionary& dict)
{
entry_.reset
(
Function1<Type>::New
(
name_,
dict
).ptr()
);
entry_ = Function1<Type>::New(name_, dict);
entry_->convertTimeBase(time_);
}
@ -127,10 +112,14 @@ template<class Type>
Foam::Ostream& Foam::operator<<
(
Ostream& os,
const TimeFunction1<Type>& de
const TimeFunction1<Type>& rhs
)
{
return de.entry_->operator<<(os, de);
if (rhs.entry_)
{
rhs.entry_->operator<<(os, rhs);
}
return os;
}