BUG: functionObjectFile - updated parallel ops - mantis #1242

This commit is contained in:
andy
2014-05-12 15:12:10 +01:00
committed by Andrew Heather
parent 6b2de677d0
commit df099b7fb3

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -130,11 +130,11 @@ void Foam::functionObjectFile::write()
void Foam::functionObjectFile::resetNames(const wordList& names) void Foam::functionObjectFile::resetNames(const wordList& names)
{ {
if (Pstream::master())
{
names_.clear(); names_.clear();
names_.insert(names); names_.insert(names);
if (Pstream::master())
{
filePtrs_.clear(); filePtrs_.clear();
filePtrs_.setSize(names_.toc().size()); filePtrs_.setSize(names_.toc().size());
@ -145,11 +145,11 @@ void Foam::functionObjectFile::resetNames(const wordList& names)
void Foam::functionObjectFile::resetName(const word& name) void Foam::functionObjectFile::resetName(const word& name)
{ {
if (Pstream::master())
{
names_.clear(); names_.clear();
names_.insert(name); names_.insert(name);
if (Pstream::master())
{
filePtrs_.clear(); filePtrs_.clear();
filePtrs_.setSize(1); filePtrs_.setSize(1);
@ -191,11 +191,11 @@ Foam::functionObjectFile::functionObjectFile
names_(), names_(),
filePtrs_() filePtrs_()
{ {
if (Pstream::master())
{
names_.clear(); names_.clear();
names_.insert(name); names_.insert(name);
if (Pstream::master())
{
filePtrs_.clear(); filePtrs_.clear();
filePtrs_.setSize(1); filePtrs_.setSize(1);
@ -216,11 +216,11 @@ Foam::functionObjectFile::functionObjectFile
names_(names), names_(names),
filePtrs_() filePtrs_()
{ {
if (Pstream::master())
{
names_.clear(); names_.clear();
names_.insert(names); names_.insert(names);
if (Pstream::master())
{
filePtrs_.clear(); filePtrs_.clear();
filePtrs_.setSize(names_.size()); filePtrs_.setSize(names_.size());