From 427f92215c70b2d07fa42637ffb2eb0f3698b71e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 18 Dec 2019 14:59:36 +0000
Subject: [PATCH] BUG: foamFormatConvert: missing 'faces' file. Fixes #1529.
---
.../miscellaneous/foamFormatConvert/foamFormatConvert.C | 6 ++++--
.../miscellaneous/foamFormatConvert/writeMeshObject.H | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
index 02a892e6b1e..bda610ef1d7 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -315,7 +315,8 @@ int main(int argc, char *argv[])
(
"cells",
meshDir,
- runTime
+ runTime,
+ false // do not check typeName since varies between binary/ascii
);
writeMeshObject<labelIOList>("owner", meshDir, runTime);
writeMeshObject<labelIOList>("neighbour", meshDir, runTime);
@@ -323,7 +324,8 @@ int main(int argc, char *argv[])
(
"faces",
meshDir,
- runTime
+ runTime,
+ false // do not check typeName since varies between binary/ascii
);
writeMeshObject<pointIOField>("points", meshDir, runTime);
// Write boundary in ascii. This is only needed for fileHandler to
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H b/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H
index d6c1350a2a1..cff97e54540 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H
+++ b/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H
@@ -47,7 +47,8 @@ inline bool writeMeshObject
const word& name,
const fileName& meshDir,
Time& runTime,
- bool disableHeaderChecking = false
+ const bool strictTypeChecking = true,
+ const bool disableHeaderChecking = false
)
{
IOobject io
@@ -63,7 +64,7 @@ inline bool writeMeshObject
bool writeOk = false;
- if (io.typeHeaderOk<CheckType>(true, true, false))
+ if (io.typeHeaderOk<CheckType>(strictTypeChecking, true, false))
{
Info<< " Reading " << io.headerClassName()
<< " : " << name << endl;
--
GitLab