Commit c0e5f77e authored by Mark Olesen's avatar Mark Olesen Committed by Andrew Heather
Browse files

STYLE: avoid nullptr when writing fan RPM

parent b1bbd50f
...@@ -107,7 +107,6 @@ void Foam::swirlFanVelocityFvPatchField::calcFanJump() ...@@ -107,7 +107,6 @@ void Foam::swirlFanVelocityFvPatchField::calcFanJump()
} }
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::swirlFanVelocityFvPatchField::swirlFanVelocityFvPatchField Foam::swirlFanVelocityFvPatchField::swirlFanVelocityFvPatchField
...@@ -156,7 +155,6 @@ Foam::swirlFanVelocityFvPatchField::swirlFanVelocityFvPatchField ...@@ -156,7 +155,6 @@ Foam::swirlFanVelocityFvPatchField::swirlFanVelocityFvPatchField
this->cyclicPatch().owner() this->cyclicPatch().owner()
? Function1<scalar>::New("rpm", dict) ? Function1<scalar>::New("rpm", dict)
: nullptr : nullptr
), ),
rEff_(dict.lookupOrDefault<scalar>("rEff", 0)), rEff_(dict.lookupOrDefault<scalar>("rEff", 0)),
fanEff_(dict.lookupOrDefault<scalar>("fanEff", 1)), fanEff_(dict.lookupOrDefault<scalar>("fanEff", 1)),
...@@ -248,7 +246,11 @@ void Foam::swirlFanVelocityFvPatchField::write(Ostream& os) const ...@@ -248,7 +246,11 @@ void Foam::swirlFanVelocityFvPatchField::write(Ostream& os) const
os.writeEntryIfDifferent<word>("p", "p", pName_); os.writeEntryIfDifferent<word>("p", "p", pName_);
os.writeEntryIfDifferent<word>("rho", "rho", rhoName_); os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
os.writeEntry("origin", origin_); os.writeEntry("origin", origin_);
rpm_->writeData(os);
if (rpm_)
{
rpm_->writeData(os);
}
os.writeEntryIfDifferent<scalar>("rEff", 0.0, rEff_); os.writeEntryIfDifferent<scalar>("rEff", 0.0, rEff_);
os.writeEntryIfDifferent<bool>("useRealRadius", false, useRealRadius_); os.writeEntryIfDifferent<bool>("useRealRadius", false, useRealRadius_);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment