Commit 73ef756c authored by Andrew Heather's avatar Andrew Heather
Browse files

Merge branch 'develop' into release

parents 18a93f98 b53738bf
...@@ -176,11 +176,16 @@ bool Foam::functionObjects::pressure::calc() ...@@ -176,11 +176,16 @@ bool Foam::functionObjects::pressure::calc()
{ {
const volScalarField& p = lookupObject<volScalarField>(fieldName_); const volScalarField& p = lookupObject<volScalarField>(fieldName_);
return store tmp<volScalarField> tp
( (
resultName_, new volScalarField
coeff(pRef(pDyn(p, rhoScale(p)))) (
resultName_,
coeff(pRef(pDyn(p, rhoScale(p))))
)
); );
return store(resultName_, tp);
} }
else else
{ {
......
...@@ -207,7 +207,7 @@ void pointNoise::calculate() ...@@ -207,7 +207,7 @@ void pointNoise::calculate()
pointNoise::pointNoise(const dictionary& dict, const bool readFields) pointNoise::pointNoise(const dictionary& dict, const bool readFields)
: :
noiseModel(dict) noiseModel(dict, false)
{ {
if (readFields) if (readFields)
{ {
......
...@@ -25,11 +25,11 @@ airDeflection ...@@ -25,11 +25,11 @@ airDeflection
selectionMode cellZone; selectionMode cellZone;
cellZone c1Zone; cellZone c1Zone;
fieldNames (U); fields (U);
flowDir (1 2 0); // flow direction flowDir (1 2 0); // flow direction
relaxationFactor 0.3; relaxationFactor 0.3;
faceZone f1Zone; faceZone f1Zone;
//Pressure drop model [Pa] //Pressure drop model [Pa]
model DarcyForchheimer;//volumetricFlowRateTable/constant model DarcyForchheimer;//volumetricFlowRateTable/constant
......
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