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: Resolve conflict

Browse Source
This commit is contained in:
Andrew Heather
2016-06-10 16:05:48 +01:00
parent 1fd05b2d1b c91712fbc3
commit 7572c99c79
14 changed files with 116 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
View File

@ -69,10 +69,10 @@ Description
maxDiameter 0.5e-4;
minDiameter 0;
setFormat gnuplot;
coordinateSystem
origin (0 0 0);
coordinateRoation
{
type cartesian;
origin (0 0 0);
e3 (0 1 1);
e1 (1 0 0);
}
@ -91,7 +91,8 @@ Description
maxDiameter | maximum region equivalent diameter | yes |
minDiameter | minimum region equivalent diameter | no | 0
setFormat | writing format | yes |
coordinateSystem | transformation for vector fields | no |
origin | origin of local co-ordinate system | yes |
coordinateRoation | orientation of local co-ordinate system | no |
log | Log to standard output | no | yes
\endtable

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

@ -219,7 +219,7 @@ Foam::forceCoeffs::forceCoeffs
CdBinFilePtr_(),
ClBinFilePtr_()
{
if (readFields)
if (active_ && readFields)
{
read(dict);
if (log_) Info << endl;
@ -310,6 +310,12 @@ void Foam::forceCoeffs::execute()
forces::calcForcesMoment();
// Need to re-check active_ flag - may have been reset in calcForcesMoment
if (!active_)
{
return;
}
createFiles();
scalar pDyn = 0.5*rhoRef_*magUInf_*magUInf_;

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

@ -279,8 +279,8 @@ void Foam::forces::initialiseBins()
// Allocate storage for forces and moments
forAll(force_, i)
{
force_[i].setSize(nBin_);
moment_[i].setSize(nBin_);
force_[i].setSize(nBin_, vector::zero);
moment_[i].setSize(nBin_, vector::zero);
}
}
}
@ -841,8 +841,8 @@ Foam::forces::forces
forAll(force_, i)
{
force_[i].setSize(nBin_);
moment_[i].setSize(nBin_);
force_[i].setSize(nBin_, vector::zero);
moment_[i].setSize(nBin_, vector::zero);
}
}
@ -944,8 +944,8 @@ void Foam::forces::read(const dictionary& dict)
// Allocate storage for forces and moments
forAll(force_, i)
{
force_[i].setSize(1);
moment_[i].setSize(1);
force_[i].setSize(1, vector::zero);
moment_[i].setSize(1, vector::zero);
}
}