fvOptions: Separate options for all cells, cellSets and inter-region coupling

by introducing rational base-classes rather than using the hideous 'switch' statement. Further rationalization of the cell-selection mechanism will be implemented via an appropriate class hierarchy to replace the remaining 'switch' statement. Mesh-motion is currently handled very inefficiently for cellSets and not at all for inter-region coupling. The former will be improved when the cell-selection classes are written and the latter by making the meshToMesh class a MeshObject after it has been corrected for mapFields.
2015-05-31 16:38:01 +01:00
parent 2b9a2adf8c
commit b8d15ba459
75 changed files with 1647 additions and 1068 deletions
--- a/src/fvOptions/cellSetOption/cellSetOptionIO.C
+++ b/src/fvOptions/cellSetOption/cellSetOptionIO.C
@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 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 "cellSetOption.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fv::cellSetOption::writeHeader(Ostream& os) const
+{
+    os  << indent << name_ << nl
+        << indent << token::BEGIN_BLOCK << incrIndent << nl;
+}
+
+
+void Foam::fv::cellSetOption::writeFooter(Ostream& os) const
+{
+    os  << decrIndent << indent << token::END_BLOCK << endl;
+}
+
+
+void Foam::fv::cellSetOption::writeData(Ostream& os) const
+{
+    option::writeData(os);
+
+    os.writeKeyword("timeStart") << timeStart_ << token::END_STATEMENT << nl;
+    os.writeKeyword("duration") << duration_ << token::END_STATEMENT << nl;
+    os.writeKeyword("selectionMode")
+        << selectionModeTypeNames_[selectionMode_] << nl;
+
+    switch (selectionMode_)
+    {
+        case smPoints:
+        {
+            os.writeKeyword("points") << points_
+                << token::END_STATEMENT << nl;
+            break;
+        }
+        case smCellSet:
+        {
+            os.writeKeyword("cellSet") << cellSetName_
+                << token::END_STATEMENT << nl;
+            break;
+        }
+        case smCellZone:
+        {
+            os.writeKeyword("cellZone") << cellSetName_
+                << token::END_STATEMENT << nl;
+            break;
+        }
+        case smAll:
+        {
+            break;
+        }
+        default:
+        {
+            FatalErrorIn("option::writeData(Ostream&) const")
+                << "Unknown selectionMode "
+                << selectionMode_
+                << abort(FatalError);
+        }
+    }
+}
+
+
+bool Foam::fv::cellSetOption::read(const dictionary& dict)
+{
+    if (option::read(dict))
+    {
+        if (coeffs_.readIfPresent("timeStart", timeStart_))
+        {
+            coeffs_.lookup("duration") >> duration_;
+        }
+    }
+
+    return true;
+}
+
+
+// ************************************************************************* //