From 63010615aee3818e40d935e6059ade2c858ec0fb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 16 Aug 2016 23:40:27 +0100
Subject: [PATCH] fvMesh,dynamicRefineFvMesh: Rename writeObjects ->
writeObject for consistency with regIOobject
---
.../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 2 +-
src/finiteVolume/fvMesh/fvMesh.C | 16 ++++++++--------
src/finiteVolume/fvMesh/fvMesh.H | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index a9022f0e58c..86d0b2c4b54 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -1415,7 +1415,7 @@ bool Foam::dynamicRefineFvMesh::writeObject
bool writeOk =
(
- dynamicFvMesh::writeObjects(fmt, ver, cmp)
+ dynamicFvMesh::writeObject(fmt, ver, cmp)
&& meshCutter_.write()
);
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 72a2d5fd80c..3342910ab19 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -856,18 +856,12 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
}
-bool Foam::fvMesh::writeObjects
+bool Foam::fvMesh::writeObject
(
IOstream::streamFormat fmt,
IOstream::versionNumber ver,
IOstream::compressionType cmp
) const
-{
- return polyMesh::writeObject(fmt, ver, cmp);
-}
-
-
-bool Foam::fvMesh::write() const
{
bool ok = true;
if (phiPtr_)
@@ -875,7 +869,13 @@ bool Foam::fvMesh::write() const
ok = phiPtr_->write();
}
- return ok && polyMesh::write();
+ return ok && polyMesh::writeObject(fmt, ver, cmp);
+}
+
+
+bool Foam::fvMesh::write() const
+{
+ return polyMesh::write();
}
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index d2e326dd350..3625af35f73 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -359,7 +359,7 @@ public:
// Write
//- Write the underlying polyMesh and other data
- virtual bool writeObjects
+ virtual bool writeObject
(
IOstream::streamFormat fmt,
IOstream::versionNumber ver,
--
GitLab