diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
deleted file mode 100644
index 6cf79a042de685bf716b96f02983a97ef0eae43b..0000000000000000000000000000000000000000
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
+++ /dev/null
@@ -1,154 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | www.openfoam.com
- \\/ M anipulation |
--------------------------------------------------------------------------------
- Copyright (C) 2011-2016 OpenFOAM Foundation
--------------------------------------------------------------------------------
-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/>.
-
-Class
- Foam::SubDimensionedField
-
-Description
- SubDimensionedField is a DimensionedField obtained as a section of another
- DimensionedField.
-
- Thus it is itself unallocated so that no storage is allocated or
- deallocated during its use. To achieve this behaviour,
- SubDimensionedField is derived from SubField rather than Field.
-
-SourceFiles
- SubDimensionedFieldI.H
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef SubDimensionedField_H
-#define SubDimensionedField_H
-
-#include "Field.H"
-#include "SubField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
- Class SubDimensionedField Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type, class GeoMesh>
-class SubDimensionedField
-:
- public regIOobject,
- public SubField<Type>
-{
-
-public:
-
- // Public typedefs
-
- typedef typename GeoMesh::Mesh Mesh;
- typedef typename Field<Type>::cmptType cmptType;
-
-
- // Constructors
-
- //- Construct from a SubField
- inline SubDimensionedField(const SubField<Type>& sfield);
-
- //- Construct from a UList and size
- inline SubDimensionedField
- (
- const UList<Type>& list,
- const label subSize
- );
-
- //- Construct from a UList start and end indices
- inline SubDimensionedField
- (
- const UList<Type>& list,
- const label subSize,
- const label startIndex
- );
-
- //- Construct from UList and a (start,size) range.
- // The range is subsetted with the list size itself to ensure that the
- // result always addresses a valid section of the list.
- inline SubDimensionedField
- (
- const UList<Type>& list,
- const labelRange& range
- );
-
- //- Construct from UList and a (start,size) range, but bypassing
- //- run-time range checking.
- inline SubDimensionedField
- (
- const labelRange& range,
- const UList<Type>& list
- );
-
-
- //- Construct as copy
- inline SubDimensionedField
- (
- const SubDimensionedField<cmptType, GeoMesh>& sfield
- );
-
-
- // Member functions
-
- //- Return a null SubDimensionedField
- static inline const SubDimensionedField<Type, GeoMesh>& null();
-
- //- Return a component field of the field
- inline tmp<DimensionedField<cmptType, GeoMesh>> component
- (
- const direction d
- ) const;
-
- //- Return the field transpose (only defined for second rank tensors)
- tmp<DimensionedField<Type, GeoMesh>> T() const;
-
-
- // Member operators
-
- //- Assignment
- inline void operator=(const SubDimensionedField<Type, GeoMesh>& rhs);
-
- //- Allow cast to a const DimensionedField<Type, GeoMesh>&
- inline operator const DimensionedField<Type, GeoMesh>&() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "SubDimensionedFieldI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
deleted file mode 100644
index 97881832cf2b14409902a7d70ae38f9fd2f3aee9..0000000000000000000000000000000000000000
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
+++ /dev/null
@@ -1,156 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | www.openfoam.com
- \\/ M anipulation |
--------------------------------------------------------------------------------
- Copyright (C) 2011-2016 OpenFOAM Foundation
--------------------------------------------------------------------------------
-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/>.
-
-\*---------------------------------------------------------------------------*/
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-template<class Type, class GeoMesh>
-inline Foam::SubDimensionedField<Type, GeoMesh>::SubDimensionedField
-(
- const SubField<Type>& sfield
-)
-:
- SubField<Type>(sfield)
-{}
-
-
-template<class Type, class GeoMesh>
-inline Foam::SubDimensionedField<Type, GeoMesh>::SubDimensionedField
-(
- const UList<Type>& list,
- const label subSize
-)
-:
- SubField<Type>(list, subSize)
-{}
-
-
-template<class Type, class GeoMesh>
-inline Foam::SubDimensionedField<Type, GeoMesh>::SubDimensionedField
-(
- const UList<Type>& list,
- const label subSize,
- const label startIndex
-)
-:
- SubField<Type>(list, subSize, startIndex)
-{}
-
-
-template<class Type, class GeoMesh>
-inline Foam::SubDimensionedField<Type, GeoMesh>::SubDimensionedField
-(
- const UList<Type>& list,
- const labelRange& range
-)
-:
- SubField<Type>(list, range)
-{}
-
-
-template<class Type, class GeoMesh>
-inline Foam::SubDimensionedField<Type, GeoMesh>::SubDimensionedField
-(
- const labelRange& range,
- const UList<Type>& list
-)
-:
- SubField<Type>(range, list)
-{}
-
-
-template<class Type, class GeoMesh>
-inline Foam::SubDimensionedField<Type, GeoMesh>::SubDimensionedField
-(
- const SubDimensionedField<Type, GeoMesh>& sfield
-)
-:
- refCount(),
- SubField<Type>(sfield)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-template<class Type, class GeoMesh>
-inline const Foam::SubDimensionedField<Type, GeoMesh>&
-Foam::SubDimensionedField<Type, GeoMesh>::null()
-{
- return NullObjectRef<SubDimensionedField<Type, GeoMesh>>();
-}
-
-
-template<class Type, class GeoMesh>
-inline
-Foam::tmp
-<
- Foam::Field<typename Foam::SubDimensionedField<Type, GeoMesh>::cmptType>
->
-Foam::SubDimensionedField<Type, GeoMesh>::component
-(
- const direction d
-) const
-{
- return
- (
- reinterpret_cast<const DimensionedField<Type, GeoMesh>&>(*this)
- ).component(d);
-}
-
-
-template<class Type, class GeoMesh>
-inline Foam::tmp<Foam::DimensionedField<Type, GeoMesh>>
-Foam::SubDimensionedField<Type, GeoMesh>::T() const
-{
- return
- (
- reinterpret_cast<const DimensionedField<Type, GeoMesh>&>(*this)
- ).T();
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-template<class Type, class GeoMesh>
-inline void Foam::SubDimensionedField<Type, GeoMesh>::operator=
-(
- const SubDimensionedField<Type, GeoMesh>& rhs
-)
-{
- dimensions() = rhs.dimensions();
- SubField<Type>::operator=(rhs);
-}
-
-
-template<class Type, class GeoMesh>
-inline Foam::SubDimensionedField<Type, GeoMesh>::operator
-const Foam::DimensionedField<Type, GeoMesh>&() const
-{
- return *(reinterpret_cast<const DimensionedField<Type, GeoMesh>*>(this));
-}
-
-
-// ************************************************************************* //