From cfc829dad9cf0cc71ef43968bb69b50f11a4d54f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 10 Feb 2016 09:43:45 +0000
Subject: [PATCH] Function1: Simplified files
---
.../primitives/functions/Function1/CSV/CSV.C | 40 ++++++++++-
.../functions/Function1/CSV/CSVIO.C | 69 -------------------
.../functions/Function1/Constant/Constant.C | 9 ++-
.../functions/Function1/Constant/ConstantIO.C | 39 -----------
.../functions/Function1/Function1/Function1.C | 27 +++++++-
.../Function1/Function1/Function1IO.C | 57 ---------------
.../PolynomialEntry/PolynomialEntry.C | 9 ++-
.../PolynomialEntry/PolynomialEntryIO.C | 39 -----------
.../functions/Function1/Sine/Sine.C | 16 ++++-
.../functions/Function1/Sine/SineIO.C | 46 -------------
.../functions/Function1/Table/TableBase.C | 25 ++++++-
.../functions/Function1/Table/TableBaseIO.C | 55 ---------------
.../functions/Function1/TableFile/TableFile.C | 20 +++++-
.../Function1/TableFile/TableFileIO.C | 48 -------------
.../{TimeFunction1 => }/TimeFunction1.C | 0
.../{TimeFunction1 => }/TimeFunction1.H | 0
16 files changed, 132 insertions(+), 367 deletions(-)
delete mode 100644 src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
delete mode 100644 src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
delete mode 100644 src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
delete mode 100644 src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
delete mode 100644 src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
delete mode 100644 src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
delete mode 100644 src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C
rename src/OpenFOAM/primitives/functions/TimeFunction1/{TimeFunction1 => }/TimeFunction1.C (100%)
rename src/OpenFOAM/primitives/functions/TimeFunction1/{TimeFunction1 => }/TimeFunction1.H (100%)
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
index 9ba3366732..513298f8c7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
@@ -259,9 +259,43 @@ const Foam::fileName& Foam::Function1Types::CSV<Type>::fName() const
}
-// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
-
-#include "CSVIO.C"
+template<class Type>
+void Foam::Function1Types::CSV<Type>::writeData(Ostream& os) const
+{
+ Function1<Type>::writeData(os);
+ os << token::END_STATEMENT << nl;
+ os << indent << word(this->name() + "Coeffs") << nl;
+ os << indent << token::BEGIN_BLOCK << incrIndent << nl;
+
+ // Note: for TableBase write the dictionary entries it needs but not
+ // the values themselves
+ TableBase<Type>::writeEntries(os);
+
+ os.writeKeyword("nHeaderLine") << nHeaderLine_ << token::END_STATEMENT
+ << nl;
+ os.writeKeyword("refColumn") << refColumn_ << token::END_STATEMENT << nl;
+
+ // Force writing labelList in ascii
+ os.writeKeyword("componentColumns");
+ if (os.format() == IOstream::BINARY)
+ {
+ os.format(IOstream::ASCII);
+ os << componentColumns_;
+ os.format(IOstream::BINARY);
+ }
+ else
+ {
+ os << componentColumns_;
+ }
+ os << token::END_STATEMENT << nl;
+
+ os.writeKeyword("separator") << string(separator_)
+ << token::END_STATEMENT << nl;
+ os.writeKeyword("mergeSeparators") << mergeSeparators_
+ << token::END_STATEMENT << nl;
+ os.writeKeyword("fileName") << fName_ << token::END_STATEMENT << nl;
+ os << decrIndent << indent << token::END_BLOCK << endl;
+}
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
deleted file mode 100644
index 106ed929cb..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSVIO.C
+++ /dev/null
@@ -1,69 +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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Function1.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::CSV<Type>::writeData(Ostream& os) const
-{
- Function1<Type>::writeData(os);
- os << token::END_STATEMENT << nl;
- os << indent << word(this->name() + "Coeffs") << nl;
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
-
- // Note: for TableBase write the dictionary entries it needs but not
- // the values themselves
- TableBase<Type>::writeEntries(os);
-
- os.writeKeyword("nHeaderLine") << nHeaderLine_ << token::END_STATEMENT
- << nl;
- os.writeKeyword("refColumn") << refColumn_ << token::END_STATEMENT << nl;
-
- // Force writing labelList in ascii
- os.writeKeyword("componentColumns");
- if (os.format() == IOstream::BINARY)
- {
- os.format(IOstream::ASCII);
- os << componentColumns_;
- os.format(IOstream::BINARY);
- }
- else
- {
- os << componentColumns_;
- }
- os << token::END_STATEMENT << nl;
-
- os.writeKeyword("separator") << string(separator_)
- << token::END_STATEMENT << nl;
- os.writeKeyword("mergeSeparators") << mergeSeparators_
- << token::END_STATEMENT << nl;
- os.writeKeyword("fileName") << fName_ << token::END_STATEMENT << nl;
- os << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
index ecc7ce732c..8b757e59bc 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
@@ -90,8 +90,13 @@ Type Foam::Function1Types::Constant<Type>::integrate
}
-// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+template<class Type>
+void Foam::Function1Types::Constant<Type>::writeData(Ostream& os) const
+{
+ Function1<Type>::writeData(os);
+
+ os << token::SPACE << value_ << token::END_STATEMENT << nl;
+}
-#include "ConstantIO.C"
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C b/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
deleted file mode 100644
index af9f5e439a..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantIO.C
+++ /dev/null
@@ -1,39 +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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Constant.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::Constant<Type>::writeData(Ostream& os) const
-{
- Function1<Type>::writeData(os);
-
- os << token::SPACE << value_ << token::END_STATEMENT << nl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index bfd21c2e30..b65c908f67 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -120,8 +120,33 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::integrate
}
+template<class Type>
+void Foam::Function1<Type>::writeData(Ostream& os) const
+{
+ os.writeKeyword(name_) << type();
+}
+
+
// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
-#include "Function1IO.C"
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+ Ostream& os,
+ const Function1<Type>& f1
+)
+{
+ // Check state of Ostream
+ os.check
+ (
+ "Ostream& operator<<(Ostream&, const Function1<Type>&)"
+ );
+
+ os << f1.name_;
+ f1.writeData(os);
+
+ return os;
+}
+
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
deleted file mode 100644
index 47f7ef9312..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1IO.C
+++ /dev/null
@@ -1,57 +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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Function1.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
- Ostream& os,
- const Function1<Type>& f1
-)
-{
- // Check state of Ostream
- os.check
- (
- "Ostream& operator<<(Ostream&, const Function1<Type>&)"
- );
-
- os << f1.name_;
- f1.writeData(os);
-
- return os;
-}
-
-
-template<class Type>
-void Foam::Function1<Type>::writeData(Ostream& os) const
-{
- os.writeKeyword(name_) << type();
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
index 67824da842..4859b50949 100644
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
@@ -198,8 +198,13 @@ Type Foam::Function1Types::Polynomial<Type>::integrate
}
-// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+template<class Type>
+void Foam::Function1Types::Polynomial<Type>::writeData(Ostream& os) const
+{
+ Function1<Type>::writeData(os);
+
+ os << nl << indent << coeffs_ << token::END_STATEMENT << nl;
+}
-#include "PolynomialEntryIO.C"
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
deleted file mode 100644
index 6aa58e405d..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntryIO.C
+++ /dev/null
@@ -1,39 +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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "PolynomialEntry.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::Polynomial<Type>::writeData(Ostream& os) const
-{
- Function1<Type>::writeData(os);
-
- os << nl << indent << coeffs_ << token::END_STATEMENT << nl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 820799d702..ae4d7e217c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -97,8 +97,20 @@ Type Foam::Function1Types::Sine<Type>::integrate
}
-// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+template<class Type>
+void Foam::Function1Types::Sine<Type>::writeData(Ostream& os) const
+{
+ Function1<Type>::writeData(os);
+ os << token::END_STATEMENT << nl;
+ os << indent << word(this->name() + "Coeffs") << nl;
+ os << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
+ amplitude_->writeData(os);
+ frequency_->writeData(os);
+ scale_->writeData(os);
+ level_->writeData(os);
+ os << decrIndent << indent << token::END_BLOCK << endl;
+}
-#include "SineIO.C"
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C b/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
deleted file mode 100644
index ea2bfadbdb..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/SineIO.C
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Sine.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::Sine<Type>::writeData(Ostream& os) const
-{
- Function1<Type>::writeData(os);
- os << token::END_STATEMENT << nl;
- os << indent << word(this->name() + "Coeffs") << nl;
- os << indent << token::BEGIN_BLOCK << incrIndent << nl;
- os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
- amplitude_->writeData(os);
- frequency_->writeData(os);
- scale_->writeData(os);
- level_->writeData(os);
- os << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 7c2755e59a..0d38c9f049 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -406,8 +406,29 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1Types::TableBase<Type>::y() const
}
-// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+template<class Type>
+void Foam::Function1Types::TableBase<Type>::writeEntries(Ostream& os) const
+{
+ if (boundsHandling_ != CLAMP)
+ {
+ os.writeKeyword("outOfBounds") << boundsHandlingToWord(boundsHandling_)
+ << token::END_STATEMENT << nl;
+ }
+ if (interpolationScheme_ != "linear")
+ {
+ os.writeKeyword("interpolationScheme") << interpolationScheme_
+ << token::END_STATEMENT << nl;
+ }
+}
+
+
+template<class Type>
+void Foam::Function1Types::TableBase<Type>::writeData(Ostream& os) const
+{
+ Function1<Type>::writeData(os);
+ os << nl << indent << table_ << token::END_STATEMENT << nl;
+ writeEntries(os);
+}
-#include "TableBaseIO.C"
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
deleted file mode 100644
index d607649ad5..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBaseIO.C
+++ /dev/null
@@ -1,55 +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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Function1.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::TableBase<Type>::writeData(Ostream& os) const
-{
- Function1<Type>::writeData(os);
- os << nl << indent << table_ << token::END_STATEMENT << nl;
- writeEntries(os);
-}
-
-
-template<class Type>
-void Foam::Function1Types::TableBase<Type>::writeEntries(Ostream& os) const
-{
- if (boundsHandling_ != CLAMP)
- {
- os.writeKeyword("outOfBounds") << boundsHandlingToWord(boundsHandling_)
- << token::END_STATEMENT << nl;
- }
- if (interpolationScheme_ != "linear")
- {
- os.writeKeyword("interpolationScheme") << interpolationScheme_
- << token::END_STATEMENT << nl;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
index 071eaf09cf..8551d1a84a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
@@ -72,8 +72,24 @@ Foam::Function1Types::TableFile<Type>::~TableFile()
{}
-// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1Types::TableFile<Type>::writeData(Ostream& os) const
+{
+ Function1<Type>::writeData(os);
+
+ os << token::END_STATEMENT << nl
+ << indent << word(this->name() + "Coeffs") << nl
+ << indent << token::BEGIN_BLOCK << nl << incrIndent;
+
+ // Note: for TableBase write the dictionary entries it needs but not
+ // the values themselves
+ TableBase<Type>::writeEntries(os);
+
+ os.writeKeyword("fileName")<< fName_ << token::END_STATEMENT << nl;
+ os << decrIndent << indent << token::END_BLOCK << endl;
+}
-#include "TableFileIO.C"
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C
deleted file mode 100644
index dbd39e21b5..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFileIO.C
+++ /dev/null
@@ -1,48 +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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Function1.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::TableFile<Type>::writeData(Ostream& os) const
-{
- Function1<Type>::writeData(os);
-
- os << token::END_STATEMENT << nl
- << indent << word(this->name() + "Coeffs") << nl
- << indent << token::BEGIN_BLOCK << nl << incrIndent;
-
- // Note: for TableBase write the dictionary entries it needs but not
- // the values themselves
- TableBase<Type>::writeEntries(os);
-
- os.writeKeyword("fileName")<< fName_ << token::END_STATEMENT << nl;
- os << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.C b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
similarity index 100%
rename from src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.C
rename to src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.H b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
similarity index 100%
rename from src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1/TimeFunction1.H
rename to src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
--
GitLab