zhyang-dev/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

functionObjects: Removed the redundant "viable" member function

Browse Source 
Construction failure and recovery is not handled with exceptions in functionObjectList
This commit is contained in:
Henry Weller
2016-05-11 12:57:17 +01:00
parent 6960d664aa
commit 901f6cde1d
99 changed files with 220 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
View File

@ -73,6 +73,12 @@ Foam::functionObjects::CourantNo::CourantNo
phiName_("phi"),
rhoName_("rho")
{
if (!isA<fvMesh>(obr))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict);
const fvMesh& mesh = refCast<const fvMesh>(obr_);
@ -99,19 +105,6 @@ Foam::functionObjects::CourantNo::CourantNo
}
bool Foam::functionObjects::CourantNo::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::CourantNo::~CourantNo()

10
src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
View File

@ -110,16 +110,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~CourantNo();

19
src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
View File

@ -54,6 +54,12 @@ Foam::functionObjects::Lambda2::Lambda2
obr_(obr),
UName_("U")
{
if (!isA<fvMesh>(obr))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict);
const fvMesh& mesh = refCast<const fvMesh>(obr_);
@ -79,19 +85,6 @@ Foam::functionObjects::Lambda2::Lambda2
}
bool Foam::functionObjects::Lambda2::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::Lambda2::~Lambda2()

10
src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
View File

@ -104,16 +104,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~Lambda2();

19
src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
View File

@ -57,6 +57,12 @@ Foam::functionObjects::Peclet::Peclet
phiName_("phi"),
rhoName_("rho")
{
if (!isA<fvMesh>(obr))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict);
const fvMesh& mesh = refCast<const fvMesh>(obr_);
@ -82,19 +88,6 @@ Foam::functionObjects::Peclet::Peclet
}
bool Foam::functionObjects::Peclet::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::Peclet::~Peclet()

10
src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
View File

@ -106,16 +106,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~Peclet();

19
src/postProcessing/functionObjects/utilities/Q/Q.C
View File

@ -53,6 +53,12 @@ Foam::functionObjects::Q::Q
obr_(obr),
UName_("U")
{
if (!isA<fvMesh>(obr))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict);
const fvMesh& mesh = refCast<const fvMesh>(obr_);
@ -78,19 +84,6 @@ Foam::functionObjects::Q::Q
}
bool Foam::functionObjects::Q::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::Q::~Q()

10
src/postProcessing/functionObjects/utilities/Q/Q.H
View File

@ -107,16 +107,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~Q();

13
src/postProcessing/functionObjects/utilities/abort/abort.C
View File

@ -97,19 +97,6 @@ Foam::functionObjects::abort::abort
}
bool Foam::functionObjects::abort::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
return true;
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::abort::~abort()

10
src/postProcessing/functionObjects/utilities/abort/abort.H
View File

@ -126,16 +126,6 @@ public:
const bool loadFromFilesUnused = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~abort();

19
src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
View File

@ -52,23 +52,16 @@ Foam::functionObjects::blendingFactor::blendingFactor
phiName_("unknown-phiName"),
fieldName_("unknown-fieldName")
{
if (!isA<fvMesh>(obr))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict);
}
bool Foam::functionObjects::blendingFactor::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::blendingFactor::~blendingFactor()

11
src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
View File

@ -119,17 +119,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~blendingFactor();

19
src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
View File

@ -56,23 +56,16 @@ Foam::functionObjects::dsmcFields::dsmcFields
name_(name),
obr_(obr)
{
if (!isA<fvMesh>(obr))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict);
}
bool Foam::functionObjects::dsmcFields::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::dsmcFields::~dsmcFields()

10
src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
View File

@ -101,16 +101,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~dsmcFields();

13
src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.C
View File

@ -58,19 +58,6 @@ Foam::functionObjects::partialWrite::partialWrite
}
bool Foam::functionObjects::partialWrite::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::partialWrite::~partialWrite()

10
src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
View File

@ -170,16 +170,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~partialWrite();

12
src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
View File

@ -56,18 +56,6 @@ Foam::functionObjects::removeRegisteredObject::removeRegisteredObject
}
bool Foam::functionObjects::removeRegisteredObject::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
return true;
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::removeRegisteredObject::~removeRegisteredObject()

10
src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
View File

@ -127,16 +127,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~removeRegisteredObject();

19
src/postProcessing/functionObjects/utilities/residuals/residuals.C
View File

@ -54,23 +54,16 @@ Foam::functionObjects::residuals::residuals
obr_(obr),
fieldSet_()
{
if (!isA<fvMesh>(obr))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict);
}
bool Foam::functionObjects::residuals::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::residuals::~residuals()

10
src/postProcessing/functionObjects/utilities/residuals/residuals.H
View File

@ -145,16 +145,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~residuals();

19
src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
View File

@ -176,6 +176,12 @@ Foam::functionObjects::scalarTransport::scalarTransport
boundaryTypes()
)
{
if (!isA<fvMesh>(obr))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict);
if (resetOnStartUp_)
@ -185,19 +191,6 @@ Foam::functionObjects::scalarTransport::scalarTransport
}
bool Foam::functionObjects::scalarTransport::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::scalarTransport::~scalarTransport()

10
src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
View File

@ -144,16 +144,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~scalarTransport();

12
src/postProcessing/functionObjects/utilities/systemCall/systemCall.C
View File

@ -57,18 +57,6 @@ Foam::functionObjects::systemCall::systemCall
}
bool Foam::functionObjects::systemCall::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
return true;
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::systemCall::~systemCall()

10
src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
View File

@ -154,16 +154,6 @@ public:
const bool loadFromFilesUnused = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~systemCall();

12
src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
View File

@ -84,18 +84,6 @@ Foam::functionObjects::timeActivatedFileUpdate::timeActivatedFileUpdate
}
bool Foam::functionObjects::timeActivatedFileUpdate::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
return true;
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::timeActivatedFileUpdate::~timeActivatedFileUpdate()

10
src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
View File

@ -129,16 +129,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~timeActivatedFileUpdate();

30
src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
View File

@ -125,36 +125,24 @@ Foam::functionObjects::turbulenceFields::turbulenceFields
obr_(obr),
fieldSet_()
{
read(dict);
}
bool Foam::functionObjects::turbulenceFields::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
if (!isA<fvMesh>(obr))
{
return false;
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
if
(
obr.foundObject<compressible::turbulenceModel>(modelName)
|| obr.foundObject<incompressible::turbulenceModel>(modelName)
!obr.foundObject<compressible::turbulenceModel>(modelName)
&& !obr.foundObject<incompressible::turbulenceModel>(modelName)
)
{
return true;
}
else
{
return false;
FatalErrorInFunction
<< "Cannot find turbulenceModel in objectRegistry"
<< exit(FatalError);
}
read(dict);
}

10
src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
View File

@ -196,16 +196,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~turbulenceFields();

19
src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
View File

@ -54,6 +54,12 @@ Foam::functionObjects::vorticity::vorticity
UName_("U"),
outputName_(typeName)
{
if (!isA<fvMesh>(obr))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict);
const fvMesh& mesh = refCast<const fvMesh>(obr_);
@ -79,19 +85,6 @@ Foam::functionObjects::vorticity::vorticity
}
bool Foam::functionObjects::vorticity::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::vorticity::~vorticity()

10
src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
View File

@ -102,16 +102,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~vorticity();

12
src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.C
View File

@ -107,18 +107,6 @@ Foam::functionObjects::writeDictionary::writeDictionary
}
bool Foam::functionObjects::writeDictionary::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
return true;
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::writeDictionary::~writeDictionary()

10
src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.H
View File

@ -119,16 +119,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~writeDictionary();

12
src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.C
View File

@ -57,18 +57,6 @@ Foam::functionObjects::writeRegisteredObject::writeRegisteredObject
}
bool Foam::functionObjects::writeRegisteredObject::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
return true;
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::writeRegisteredObject::~writeRegisteredObject()

10
src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
View File

@ -142,16 +142,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~writeRegisteredObject();

19
src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
View File

@ -70,6 +70,12 @@ Foam::functionObjects::yPlus::yPlus
log_(true),
phiName_("phi")
{
if (!isA<fvMesh>(obr))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
const fvMesh& mesh = refCast<const fvMesh>(obr_);
volScalarField* yPlusPtr
@ -93,19 +99,6 @@ Foam::functionObjects::yPlus::yPlus
}
bool Foam::functionObjects::yPlus::viable
(
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
)
{
// Construction is viable if the available mesh is an fvMesh
return isA<fvMesh>(obr);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::yPlus::~yPlus()

10
src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
View File

@ -120,16 +120,6 @@ public:
const bool loadFromFiles = false
);
//- Return true if the construction of this functionObject is viable
// i.e. the prerequisites for construction are available
static bool viable
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
);
//- Destructor
virtual ~yPlus();