From eed1e9937811b52bfc28c649e5ba13ff69301106 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sat, 23 Jun 2018 13:41:20 +0200
Subject: [PATCH] TUT: remove 'functions' dictionary scope from catalyst files

- rename Allrun.parallel to Allrun-parallel (issue #899)
---
 .../twoSimpleRotors/system/catalyst           | 31 +++++++++----------
 .../twoSimpleRotors/system/controlDict        |  7 ++++-
 .../{Allrun.parallel => Allrun-parallel}      |  0
 3 files changed, 20 insertions(+), 18 deletions(-)
 rename tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/{Allrun.parallel => Allrun-parallel} (100%)

diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/catalyst b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/catalyst
index c70afe7d4e..9dd9712604 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/catalyst
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/catalyst
@@ -1,25 +1,22 @@
 // ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
 
-functions
+catalyst
 {
-    catalyst
+    #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
+
+    scripts
+    (
+        "<system>/scripts/pressure.py"
+        // "<system>/scripts/vorticity.py"
+        // "<etc>/caseDicts/insitu/catalyst/writeMesh.py"
+    );
+
+    inputs
     {
-        #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
-
-        scripts
-        (
-            "<system>/scripts/pressure.py"
-            // "<system>/scripts/vorticity.py"
-            // "<etc>/caseDicts/insitu/catalyst/writeMesh.py"
-        );
-
-        inputs
+        region
         {
-            region
-            {
-                // Selected fields (words or regex).
-                fields      ( U p );
-            }
+            // Selected fields (words or regex).
+            fields      ( U p );
         }
     }
 }
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/controlDict b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/controlDict
index 2f8660d6e2..ef91f4b820 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/controlDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/controlDict
@@ -50,6 +50,11 @@ adjustTimeStep  yes;
 
 maxCo           1;
 
-// #include "catalyst"
+
+functions
+{
+    // #include "catalyst"
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun.parallel b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun-parallel
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun.parallel
rename to tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun-parallel