COMP: Multiple changes - first clean build after latest merge - UNTESTED

This commit is contained in:
Andrew Heather
2016-09-23 15:36:53 +01:00
parent 9fbd612672
commit b9940cbbb1
311 changed files with 4119 additions and 6540 deletions

View File

@ -334,13 +334,10 @@ Foam::functionObjects::regionSizeDistribution::regionSizeDistribution
)
:
fvMeshFunctionObject(name, runTime, dict),
file_(obr_, name),
writeFile(obr_, name),
alphaName_(dict.lookup("field")),
patchNames_(dict.lookup("patches")),
isoPlanes_(dict.lookupOrDefault<bool>("isoPlanes", false))
{
// Check if the available mesh is an fvMesh, otherwise deactivate
if (isA<fvMesh>(obr_))
{
read(dict);
}
@ -372,7 +369,7 @@ bool Foam::functionObjects::regionSizeDistribution::read(const dictionary& dict)
{
coordSysPtr_.reset(new coordinateSystem(obr_, dict));
Log < "Transforming all vectorFields with coordinate system "
Log << "Transforming all vectorFields with coordinate system "
<< coordSysPtr_().name() << endl;
}
@ -390,18 +387,6 @@ bool Foam::functionObjects::regionSizeDistribution::read(const dictionary& dict)
}
void Foam::regionSizeDistribution::execute()
{
// Do nothing - only valid on write
}
void Foam::regionSizeDistribution::end()
{
// Do nothing - only valid on write
}
bool Foam::functionObjects::regionSizeDistribution::execute()
{
return true;
@ -723,8 +708,8 @@ bool Foam::functionObjects::regionSizeDistribution::write()
{
vectorField alphaDistance
(
(alpha.primitiveField()*mesh.V())
* (mesh.C().primitiveField() - origin_)()
(alpha.primitiveField()*mesh_.V())
*(mesh_.C().primitiveField() - origin_)()
);
Map<vector> allRegionAlphaDistance

View File

@ -158,12 +158,11 @@ namespace functionObjects
class regionSizeDistribution
:
public fvMeshFunctionObject
public fvMeshFunctionObject,
public writeFile
{
// Private data
writeFile file_;
//- Name of field
word alphaName_;