Rebase

applications/utilities/mesh/manipulation/moveDyMEngineMesh/Make/options

@@ -1,14 +1,16 @@
 EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/engine/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    $(WM_DECOMP_INC) 
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -ldynamicMesh \
     -ldynamicFvMesh \
     -lmeshTools \
-    -ldynamicMesh \
     -lengine \
-    -lmeshTools
+    $(WM_DECOMP_LIBS) \
+    -llduSolvers

applications/utilities/mesh/manipulation/moveDyMEngineMesh/moveDyMEngineMesh.C

@@ -26,7 +26,7 @@ Application
     moveDynamicMesh
 
 Description
-    Mesh motion and topological mesh changes run for an engine geometry
+    Mesh motion and topological mesh changes utility for an engine geometry
 
 Author
     Hrvoje Jasak, Wikki Ltd.  All rights reserved
@@ -41,11 +41,11 @@ Author
 
 int main(int argc, char *argv[])
 {
-
 #   include "setRootCase.H"
 #   include "createEngineTime.H"
 #   include "createEngineDynamicMesh.H"
 
+<<<<<<< HEAD
     scalar totalVolume = sum(mesh.V()).value();
 
     Info<< "Reading field U\n" << endl;
@@ -76,15 +76,34 @@ int main(int argc, char *argv[])
         zeroGradientFvPatchScalarField::typeName
     );
 
+=======
+
+    fileName path = runTime.caseName();
+    OFstream volFile(path+"/totVol.Cyl");
+>>>>>>> Engine updates: parallelisation of topo changes
 
     while (runTime.loop())
     {
         Info<< "Time = " << runTime.timeName() << endl;
 
-        mesh.update();
+        volFile << runTime.timeName() << "\t" << sum(mesh.V()).value() << endl;
-//         mesh.checkMesh(true);
 
-#       include "checkTotalVolume.H"
+        if (isDir(runTime.path()/"VTK"))
+        {
+            Info << "Clear VTK directory" << endl;
+            rmDir(runTime.path()/"VTK");
+        }
+
+        mesh.update();
+
+#       include "checkVolContinuity.H"
+
+        if(checkEngineMesh)
+        {
+            mesh.checkMesh(true);
+        }
+
+        volFile << runTime.timeName() << tab << sum(mesh.V()).value() << endl;
 
         runTime.write();