From de638685bea95519d0efd8b35a3427cda3beea10 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 1 Aug 2012 15:55:41 +0100
Subject: [PATCH] BUG: foamToEnsight: detect moving/changing meshes

---
 .../foamToEnsight/checkMeshMoving.H           | 38 +++++++++++--------
 .../foamToEnsight/ensightMesh.C               |  5 ++-
 .../foamToEnsight/ensightMesh.H               |  3 +-
 .../foamToEnsight/foamToEnsight.C             | 12 +++++-
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
index 123036f63a..8657a9cc21 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
@@ -1,21 +1,27 @@
-// check for "points" in all of the result directories
+// check for "points" in any of the result directories
 
-bool meshMoving = true;
-if (Times.size() > 2)
+bool meshMoving = false;
+if (Times.size() > 1)
 {
-    for (label n1=2; n1<Times.size() && meshMoving; ++n1)
+    // We already loaded a mesh (usually from constant). See if any other
+    // points files
+    forAll(Times, timeI)
     {
-        meshMoving = IOobject
-        (
-            "points",
-            Times[n1].name(),
-            polyMesh::meshSubDir,
-            mesh,
-            IOobject::NO_READ
-        ).headerOk();
+        if (Times[timeI].name() != mesh.pointsInstance())
+        {
+            IOobject io
+            (
+                "points",
+                Times[timeI].name(),
+                polyMesh::meshSubDir,
+                mesh,
+                IOobject::NO_READ
+            );
+            if (io.headerOk())
+            {
+                meshMoving = true;
+                break;
+            }
+        }
     }
 }
-else
-{
-    meshMoving = false;
-}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index b8fe91fcfe..8a44c5411b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1014,6 +1014,7 @@ void Foam::ensightMesh::write
     const fileName& postProcPath,
     const word& prepend,
     const label timeIndex,
+    const bool meshMoving,
     Ostream& ensightCaseFile
 ) const
 {
@@ -1027,7 +1028,7 @@ void Foam::ensightMesh::write
     {
         timeFile += "000.";
     }
-    else if (mesh_.moving())
+    else if (meshMoving)
     {
         timeFile += itoa(timeIndex) + '.';
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
index 6d860dfc91..ffcbf61d66 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -380,6 +380,7 @@ public:
             const fileName& postProcPath,
             const word& prepend,
             const label timeIndex,
+            const bool meshMoving,
             Ostream& ensightCaseFile
         ) const;
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index e9a942f38a..05db6c0d05 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -228,6 +228,13 @@ int main(int argc, char *argv[])
 
 #   include "checkMeshMoving.H"
 
+    if (meshMoving)
+    {
+        Info<< "Detected a moving mesh (multiple polyMesh/points files)."
+            << " Writing meshes for every timestep." << endl;
+    }
+
+
     wordHashSet allCloudNames;
     if (Pstream::master())
     {
@@ -346,13 +353,14 @@ int main(int argc, char *argv[])
             eMesh.correct();
         }
 
-        if (timeIndex == 0 || (meshState != polyMesh::UNCHANGED))
+        if (timeIndex == 0 || meshMoving)
         {
             eMesh.write
             (
                 ensightDir,
                 prepend,
                 timeIndex,
+                meshMoving,
                 ensightCaseFile
             );
         }