mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
GIT: Resolve conflict
This commit is contained in:
@ -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_;
|
||||
|
||||
Reference in New Issue
Block a user