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

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -59,7 +59,7 @@ SourceFiles
#ifndef functionObjects_removeRegisteredObject_H
#define functionObjects_removeRegisteredObject_H
#include "functionObject.H"
#include "regionFunctionObject.H"
#include "wordList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -79,13 +79,10 @@ namespace functionObjects
class removeRegisteredObject
:
public functionObject
public regionFunctionObject
{
// Private data
//- Reference to the objectRegistry
const objectRegistry& obr_;
//- Names of objects to control
wordList objectNames_;