diff --git a/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
deleted file mode 100644
index 95914f3b56b64be1abdb66aeb92137d3c10d2156..0000000000000000000000000000000000000000
--- a/src/OpenFOAM/db/runTimeSelection/globalFunctions/addToGlobalFunctionSelectionTable.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Global
- Foam::addToGlobalFunctionSelectionTable
-
-Description
- Macros for easy insertion into global function selection tables
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef addToGlobalFunctionSelectionTable_H
-#define addToGlobalFunctionSelectionTable_H
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// add to hash-table of functions with 'lookup' as the key
-#define addNamedToGlobalFunctionSelectionTable\
-(memberFunction,argNames,lookup,functionPtr) \
- \
- /* Add to the table, find by lookup name */ \
- add##memberFunction##argNames##GlobalMemberFunctionToTable \
- add_##lookup##_##memberFunction##argNames##GlobalMemberFunctionTo##Table_ \
- (#lookup, functionPtr)
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
deleted file mode 100644
index 8e07ef50097c22f4abcabffbe4dcfb419125168d..0000000000000000000000000000000000000000
--- a/src/OpenFOAM/db/runTimeSelection/globalFunctions/globalFunctionSelectionTables.H
+++ /dev/null
@@ -1,144 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Global
- Foam::globalFunctionSelectionTables
-
-Description
- Macros to enable the easy declaration of global function selection tables.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef globalMemberFunctionSelectionTables_H
-#define globalMemberFunctionSelectionTables_H
-
-#include "memberFunctionSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// external use:
-// ~~~~~~~~~~~~~
-// declare a run-time selection:
-#define declareGlobalFunctionSelectionTable\
-(returnType,memberFunction,argNames,argList,parList) \
- \
- /* Construct from argList function pointer type */ \
- typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \
- \
- /* Construct from argList function table type */ \
- typedef HashTable \
- <memberFunction##argNames##MemberFunctionPtr, word, string::hash> \
- memberFunction##argNames##MemberFunctionTable; \
- \
- /* Construct from argList function pointer table pointer */ \
- extern memberFunction##argNames##MemberFunctionTable* \
- memberFunction##argNames##MemberFunctionTablePtr_; \
- \
- /* Table memberFunction called from the table add function */ \
- void construct##memberFunction##argNames##MemberFunctionTables(); \
- \
- /* Table destructor called from the table add function destructor */ \
- void destroy##memberFunction##argNames##MemberFunctionTables(); \
- \
- /* Class to add constructor from argList to table */ \
- class add##memberFunction##argNames##GlobalMemberFunctionToTable \
- { \
- public: \
- \
- add##memberFunction##argNames##GlobalMemberFunctionToTable \
- ( \
- const word& lookup, \
- memberFunction##argNames##MemberFunctionPtr function \
- ) \
- { \
- construct##memberFunction##argNames##MemberFunctionTables(); \
- memberFunction##argNames##MemberFunctionTablePtr_->insert \
- ( \
- lookup, \
- function \
- ); \
- } \
- \
- ~add##memberFunction##argNames##GlobalMemberFunctionToTable() \
- { \
- destroy##memberFunction##argNames##MemberFunctionTables(); \
- } \
- }
-
-
-// internal use:
-// constructor/destructor aid
-#define defineGlobalFunctionSelectionTableConstructDestruct\
-(memberFunction,argNames) \
- \
- /* Table constructor called from the table add function */ \
- void construct##memberFunction##argNames##MemberFunctionTables() \
- { \
- static bool constructed = false; \
- if (!constructed) \
- { \
- constructed = true; \
- memberFunction##argNames##MemberFunctionTablePtr_ \
- = new memberFunction##argNames##MemberFunctionTable; \
- } \
- } \
- \
- /* Table destructor called from the table add function destructor */ \
- void destroy##memberFunction##argNames##MemberFunctionTables() \
- { \
- if (memberFunction##argNames##MemberFunctionTablePtr_) \
- { \
- delete memberFunction##argNames##MemberFunctionTablePtr_; \
- memberFunction##argNames##MemberFunctionTablePtr_ = NULL; \
- } \
- }
-
-
-// internal use:
-// create pointer to hash-table of functions
-#define defineGlobalFunctionSelectionTablePtr\
-(memberFunction,argNames) \
- \
- /* Define the memberFunction table */ \
- memberFunction##argNames##MemberFunctionTable* \
- memberFunction##argNames##MemberFunctionTablePtr_ = NULL
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// external use:
-// ~~~~~~~~~~~~~
-// define run-time selection table
-#define defineGlobalFunctionSelectionTable\
-(memberFunction,argNames) \
- \
- defineGlobalFunctionSelectionTablePtr \
- (memberFunction,argNames); \
- defineGlobalFunctionSelectionTableConstructDestruct \
- (memberFunction,argNames)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
deleted file mode 100644
index 29976b04471d3fb2f6d1ff5129d7d1dc064237e6..0000000000000000000000000000000000000000
--- a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/addToStaticMemberFunctionSelectionTable.H
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Global
- Foam::addToStaticMemberFunctionSelectionTable
-
-Description
- Macros for easy insertion into member function selection tables
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef addToStaticMemberFunctionSelectionTable_H
-#define addToStaticMemberFunctionSelectionTable_H
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-// add to hash-table of functions with 'lookup' as the key
-#define addNamedToStaticMemberFunctionSelectionTable\
-(baseType,thisType,memberFunction,argNames,lookup,functionPtr) \
- \
- /* Add the thisType memberFunction to the table, find by lookup name */ \
- baseType::add##memberFunction##argNames## \
- StaticMemberFunctionToTable<thisType> \
- add_##lookup##_##thisType##memberFunction##argNames## \
- StaticMemberFunctionTo##baseType##Table_(#lookup, functionPtr)
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
deleted file mode 100644
index 4a634b2f3c3740b7ca87741ddd1bda906a23834a..0000000000000000000000000000000000000000
--- a/src/OpenFOAM/db/runTimeSelection/staticMemberFunctions/staticMemberFunctionSelectionTables.H
+++ /dev/null
@@ -1,145 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Global
- Foam::staticMemberFunctionSelectionTables
-
-Description
- Macros to enable the easy declaration of member function selection tables.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef staticMemberFunctionSelectionTables_H
-#define staticMemberFunctionSelectionTables_H
-
-#include "memberFunctionSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// external use:
-// ~~~~~~~~~~~~~
-// declare a run-time selection:
-#define declareStaticMemberFunctionSelectionTable\
-(returnType,baseType,memberFunction,argNames,argList,parList) \
- \
- /* Construct from argList function pointer type */ \
- typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \
- \
- /* Construct from argList function table type */ \
- typedef HashTable \
- <memberFunction##argNames##MemberFunctionPtr, word, string::hash> \
- memberFunction##argNames##MemberFunctionTable; \
- \
- /* Construct from argList function pointer table pointer */ \
- static memberFunction##argNames##MemberFunctionTable* \
- memberFunction##argNames##MemberFunctionTablePtr_; \
- \
- /* Table memberFunction called from the table add function */ \
- static void construct##memberFunction##argNames##MemberFunctionTables(); \
- \
- /* Table destructor called from the table add function destructor */ \
- static void destroy##memberFunction##argNames##MemberFunctionTables(); \
- \
- /* Class to add constructor from argList to table */ \
- template<class baseType##Type> \
- class add##memberFunction##argNames##StaticMemberFunctionToTable \
- { \
- public: \
- \
- add##memberFunction##argNames##StaticMemberFunctionToTable \
- ( \
- const word& lookup, \
- memberFunction##argNames##MemberFunctionPtr function \
- ) \
- { \
- construct##memberFunction##argNames##MemberFunctionTables(); \
- memberFunction##argNames##MemberFunctionTablePtr_->insert \
- ( \
- lookup, \
- function \
- ); \
- } \
- \
- ~add##memberFunction##argNames##StaticMemberFunctionToTable() \
- { \
- destroy##memberFunction##argNames##MemberFunctionTables(); \
- } \
- }
-
-
-// internal use:
-// constructor/destructor aid
-#define defineStaticMemberFunctionSelectionTableConstructDestruct\
-(baseType,memberFunction,argNames) \
- \
- /* Table constructor called from the table add function constructor */ \
- void baseType::construct##memberFunction##argNames##MemberFunctionTables()\
- { \
- static bool constructed = false; \
- if (!constructed) \
- { \
- constructed = true; \
- baseType::memberFunction##argNames##MemberFunctionTablePtr_ \
- = new baseType::memberFunction##argNames##MemberFunctionTable;\
- } \
- }; \
- \
- /* Table destructor called from the table add function destructor */ \
- void baseType::destroy##memberFunction##argNames##MemberFunctionTables() \
- { \
- if (baseType::memberFunction##argNames##MemberFunctionTablePtr_) \
- { \
- delete baseType::memberFunction##argNames##MemberFunctionTablePtr_;\
- baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL;\
- } \
- }
-
-
-// internal use:
-// create pointer to hash-table of functions
-#define defineStaticMemberFunctionSelectionTablePtr\
-(baseType,memberFunction,argNames) \
- \
- /* Define the memberFunction table */ \
- baseType::memberFunction##argNames##MemberFunctionTable* \
- baseType::memberFunction##argNames##MemberFunctionTablePtr_ = NULL
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// external use:
-// ~~~~~~~~~~~~~
-// define run-time selection table
-#define defineStaticMemberFunctionSelectionTable\
-(baseType,memberFunction,argNames) \
- \
- defineStaticMemberFunctionSelectionTablePtr \
- (baseType,memberFunction,argNames); \
- defineStaticMemberFunctionSelectionTableConstructDestruct \
- (baseType,memberFunction,argNames) \
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //