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

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

Browse Source
This commit is contained in:
mattijs
2016-11-09 09:24:15 +00:00
parent 6be5816815 0c02a265a2
commit 66678267dc
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C
View File

@ -89,20 +89,23 @@ addGeometryToScene
return; return;
} }
const dictionary dict = dictionary dict;
geometryBase::parent_.getObjectProperty if (!geometryBase::parent_.getObjectDict(functionObject_, fieldName_, dict))
( {
functionObject_, WarningInFunction
fieldName_, << "Unable to find function object " << functionObject_
dictionary::null << " output for field " << fieldName_
); << ". Line will not be processed"
<< endl;
return;
}
fileName fName; fileName fName;
if (!dict.readIfPresent("file", fName)) if (!dict.readIfPresent("file", fName))
{ {
WarningInFunction WarningInFunction
<< "Unable to find function object " << functionObject_ << "Unable to read file name from function object "
<< " output for field " << fieldName_ << functionObject_ << " for field " << fieldName_
<< ". Line will not be processed" << ". Line will not be processed"
<< endl; << endl;
return; return;

23
src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C
View File

@ -93,21 +93,24 @@ addGeometryToScene
return; return;
} }
const dictionary dict = dictionary dict;
geometryBase::parent_.getObjectProperty if (!geometryBase::parent_.getObjectDict(functionObject_, fieldName_, dict))
( {
functionObject_, WarningInFunction
fieldName_, << "Unable to find function object " << functionObject_
dictionary::null << " output for field " << fieldName_
); << ". Surface will not be processed"
<< endl;
return;
}
fileName fName; fileName fName;
if (!dict.readIfPresent("file", fName)) if (!dict.readIfPresent("file", fName))
{ {
WarningInFunction WarningInFunction
<< "Unable to find function object " << functionObject_ << "Unable to read file name from function object "
<< " output for field " << fieldName_ << functionObject_ << " for field " << fieldName_
<< ". functionObjectSurface will not be processed" << ". Surface will not be processed"
<< endl; << endl;
return; return;
} }

6
src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C
View File

@ -67,9 +67,9 @@ Foam::functionObjects::thermoCoupleProbes::thermoCoupleProbes
} }
// Check if the property exist (resume old calculation) // Check if the property exist (resume old calculation)
// or of it is new. // or of it is new
dictionary probeDict; dictionary probeDict;
if (getDict(typeName, probeDict)) if (getDict(name, probeDict))
{ {
probeDict.lookup("Tc") >> Ttc_; probeDict.lookup("Tc") >> Ttc_;
} }
@ -172,7 +172,7 @@ bool Foam::functionObjects::thermoCoupleProbes::write()
dictionary probeDict; dictionary probeDict;
probeDict.add("Tc", Ttc_); probeDict.add("Tc", Ttc_);
setProperty(typeName, probeDict); setProperty(name(), probeDict);
return true; return true;
} }

2
src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
View File

@ -385,9 +385,9 @@ Foam::scalar surfaceNoise::surfaceAverage
} }
else else
{ {
const meshedSurface& surf = readerPtr_->geometry();
// TO BE VERIFIED: area-averaged values // TO BE VERIFIED: area-averaged values
// const meshedSurface& surf = readerPtr_->geometry();
// return sum(data*surf.magSf())/sum(surf.magSf()); // return sum(data*surf.magSf())/sum(surf.magSf());
return sum(data)/data.size(); return sum(data)/data.size();
} }