zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: function obejct updates

Browse Source
This commit is contained in:
andy
2013-10-04 16:44:58 +01:00
parent 184a4c7c67
commit 837ca32397
35 changed files with 261 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
View File

@ -52,6 +52,7 @@ void Foam::forceCoeffs::writeFileHeader(const label i)
<< "# magUInf : " << magUInf_ << nl
<< "# lRef : " << lRef_ << nl
<< "# Aref : " << Aref_ << nl
<< "# CofR : " << coordSys_.origin() << nl
<< "# Time" << tab << "Cm" << tab << "Cd" << tab << "Cl" << tab
<< "Cl(f)" << tab << "Cl(r)";
}
@ -68,7 +69,7 @@ void Foam::forceCoeffs::writeFileHeader(const label i)
for (label j = 0; j < nBin_; j++)
{
const word jn = Foam::name(j);
const word jn('[' + Foam::name(j) + ']');
file(i)
<< tab << "Cm" << jn << tab << "Cd" << jn << tab << "Cl" << jn;
@ -95,7 +96,7 @@ Foam::forceCoeffs::forceCoeffs
const bool loadFromFiles
)
:
forces(name, obr, dict, loadFromFiles),
forces(name, obr, dict, loadFromFiles, false),
liftDir_(vector::zero),
dragDir_(vector::zero),
pitchAxis_(vector::zero),
@ -104,6 +105,8 @@ Foam::forceCoeffs::forceCoeffs
Aref_(0.0)
{
read(dict);
Info<< endl;
}

39
src/postProcessing/functionObjects/forces/forces/forces.C
View File

@ -74,6 +74,7 @@ void Foam::forces::writeFileHeader(const label i)
// force data
file(i)
<< "# CofR : " << coordSys_.origin() << nl
<< "# Time" << tab
<< "forces(pressure,viscous,porous) "
<< "moment(pressure,viscous,porous)";
@ -99,7 +100,7 @@ void Foam::forces::writeFileHeader(const label i)
for (label j = 0; j < nBin_; j++)
{
const word jn = Foam::name(j);
const word jn('[' + Foam::name(j) + ']');
file(i)
<< tab
@ -110,7 +111,7 @@ void Foam::forces::writeFileHeader(const label i)
{
for (label j = 0; j < nBin_; j++)
{
const word jn = Foam::name(j);
const word jn('[' + Foam::name(j) + ']');
file(i)
<< tab
@ -496,14 +497,15 @@ Foam::forces::forces
const word& name,
const objectRegistry& obr,
const dictionary& dict,
const bool loadFromFiles
const bool loadFromFiles,
const bool readFields
)
:
functionObjectFile(obr, name, createFileNames(dict)),
name_(name),
obr_(obr),
active_(true),
log_(false),
log_(true),
force_(3),
moment_(3),
patchSet_(),
@ -526,7 +528,15 @@ Foam::forces::forces
initialised_(false)
{
// Check if the available mesh is an fvMesh otherise deactivate
if (!isA<fvMesh>(obr_))
if (isA<fvMesh>(obr_))
{
if (readFields)
{
read(dict);
Info<< endl;
}
}
else
{
active_ = false;
WarningIn
@ -538,11 +548,10 @@ Foam::forces::forces
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating."
) << "No fvMesh available, deactivating " << name_
<< endl;
}
read(dict);
}
@ -563,7 +572,7 @@ Foam::forces::forces
name_(name),
obr_(obr),
active_(true),
log_(false),
log_(true),
force_(3),
moment_(3),
patchSet_(patchSet),
@ -607,7 +616,13 @@ void Foam::forces::read(const dictionary& dict)
{
initialised_ = false;
log_ = dict.lookupOrDefault<Switch>("log", false);
log_ = dict.lookupOrDefault<Switch>("log", true);
if (log_)
{
Info<< type() << " " << name_ << ":" << nl;
}
directForceDensity_ = dict.lookupOrDefault("directForceDensity", false);
const fvMesh& mesh = refCast<const fvMesh>(obr_);
@ -644,15 +659,15 @@ void Foam::forces::read(const dictionary& dict)
localSystem_ = true;
}
if (dict.readIfPresent("porosity", porosity_))
if (dict.readIfPresent("porosity", porosity_) && log_)
{
if (porosity_)
{
Info<< "Including porosity effects" << endl;
Info<< " Including porosity effects" << endl;
}
else
{
Info<< "Not including porosity effects" << endl;
Info<< " Not including porosity effects" << endl;
}
}

3
src/postProcessing/functionObjects/forces/forces/forces.H
View File

@ -278,7 +278,8 @@ public:
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
const bool loadFromFiles = false,
const bool readFields = true
);