diff --git a/src/catalyst/catalystDict b/src/catalyst/catalystDict
index ff7bd1f9f8b60fbc0ff99070f6abb851d78fcf50..e07f0b89c7ac0b59b56f15040ded110131580092 100644
--- a/src/catalyst/catalystDict
+++ b/src/catalyst/catalystDict
@@ -1,58 +1,58 @@
// ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
-functions
+catalyst
{
- catalyst
+ type catalyst;
+ libs ("libcatalystFoam.so");
+
+ executeControl timeStep;
+ writeControl none;
+
+ // ^^^^^
+ // #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
+
+
+ // mkdir "<case>/someDir";
+
+ scripts
+ (
+ // "<etc>/caseDicts/insitu/catalyst/printChannels.py"
+ "<etc>/caseDicts/insitu/catalyst/writeAll.py"
+ );
+
+ inputs
{
- type catalyst;
- libs ("libcatalystFoam.so");
- executeControl timeStep;
- writeControl none;
+ // fvMesh
+ region
+ {
+ type default;
- // OR #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
+ // All regions
+ regions (".*");
- // mkdir "<case>/someDir";
+ // Selected fields (words or regex)
+ fields (T U p);
+ }
+
+ // faMesh
+ area
+ {
+ type area;
- scripts
- (
- // "<etc>/caseDicts/insitu/catalyst/printChannels.py"
- "<etc>/caseDicts/insitu/catalyst/writeAll.py"
- );
+ // Selected fields (words or regex)
+ fields ( ".*" );
+ }
- inputs
+ // lagrangian
+ cloud
{
- // fvMesh
- region
- {
- type default;
-
- // All regions
- regions (".*");
-
- // Selected fields (words or regex)
- fields (T U p);
- }
-
- // faMesh
- area
- {
- type area;
-
- // Selected fields (words or regex)
- fields ( ".*" );
- }
-
- // lagrangian
- cloud
- {
- type cloud;
-
- // Selected clouds (words or regex)
- clouds ( coalCloud1 limestoneCloud1 );
-
- // Selected fields (words or regex)
- fields ( T U p rho "Y.*" );
- }
+ type cloud;
+
+ // Selected clouds (words or regex)
+ clouds ( coalCloud1 limestoneCloud1 );
+
+ // Selected fields (words or regex)
+ fields ( T U p rho "Y.*" );
}
}
}
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/catalyst b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/catalyst
index 66b2730ddde0157737f3844fe3d427ee705c6963..67e90c7c7440d92a2b1035450e0369572cc9b48b 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/catalyst
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/catalyst
@@ -1,23 +1,22 @@
// ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
-functions
+catalyst
{
- catalyst
- {
- #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
- scripts
- (
- "<system>/scripts/writeArea.py"
- );
+ #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
+
+ scripts
+ (
+ "<system>/scripts/writeArea.py"
+ );
- inputs
+ inputs
+ {
+ // channel = area
+ area
{
- area
- {
- type area;
+ type area;
- fields ( ".*" );
- }
+ fields ( ".*" );
}
}
}
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/controlDict b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/controlDict
index 2887b91158bad70195b4fd02d5675f7e8c9264d2..074103594003610cee148cb5541a20020b071bb8 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/controlDict
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/controlDict
@@ -43,6 +43,9 @@ timePrecision 6;
runTimeModifiable yes;
-#include "catalyst"
+functions
+{
+ #include "catalyst"
+}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/catalyst b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/catalyst
index 45f1cbd7f41bd09bd9c2236a7136dc96fd4d9289..0823255e5c0eac0758b5bc8fb85703a904c408ae 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/catalyst
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/catalyst
@@ -1,29 +1,27 @@
// ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
-functions
+catalyst
{
- catalyst
- {
- #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
+ #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
- scripts
- (
- "<system>/scripts/slice1.py"
- "<system>/scripts/writePatches.py"
- // "<etc>/caseDicts/insitu/catalyst/printChannels.py"
- // "<etc>/caseDicts/insitu/catalyst/writeAll.py"
- );
+ scripts
+ (
+ "<system>/scripts/slice1.py"
+ "<system>/scripts/writePatches.py"
+ // "<etc>/caseDicts/insitu/catalyst/printChannels.py"
+ // "<etc>/caseDicts/insitu/catalyst/writeAll.py"
+ );
- inputs
+ inputs
+ {
+ // channel = region, region/mesh, region/patches
+ region
{
- region
- {
- // All regions
- regions (".*");
+ // All regions
+ regions (".*");
- // Selected fields (words or regex)
- fields (T U p);
- }
+ // Selected fields (words or regex)
+ fields (T U p);
}
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
index 3ab1df94e96d998573e20a50ff9f05c2df5d9f09..e2b860c598d7ea9021b16d813793ba02d0fb019c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
@@ -52,6 +52,9 @@ maxDi 10.0;
adjustTimeStep yes;
-#include "catalyst"
+functions
+{
+ #include "catalyst"
+}
// ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavity/system/catalyst b/tutorials/incompressible/icoFoam/cavity/system/catalyst
index ebb77626e199ee2e2373474f22b72ce311efd1e9..55aa9b2b7e585d47e20913164429d8367f516500 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/catalyst
+++ b/tutorials/incompressible/icoFoam/cavity/system/catalyst
@@ -1,31 +1,29 @@
// ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
-functions
+catalyst
{
- catalyst
- {
- #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
+ #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
- scripts
- (
- "<system>/scripts/slice1.py"
- "<system>/scripts/writeMesh.py"
- );
+ scripts
+ (
+ "<system>/scripts/slice1.py"
+ "<system>/scripts/writeMesh.py"
+ );
- // Calculate a few iterations before starting processing
- timeStart 0.05;
+ // Calculate a few iterations before starting processing
+ timeStart 0.05;
- // For testing: force endTime of catalyst and simulation
- // timeEnd 0.1;
- // "/endTime" 0.15;
+ // For testing: force endTime of catalyst and simulation
+ // timeEnd 0.1;
+ // "/endTime" 0.15;
- inputs
+ inputs
+ {
+ // channel = region, region/mesh, region/patches
+ region
{
- region
- {
- // Selected fields (words or regex)
- fields (U p);
- }
+ // Selected fields (words or regex)
+ fields (U p);
}
}
}
diff --git a/tutorials/incompressible/icoFoam/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/system/controlDict
index 121fc681e6827c62a28969dd425988fa03bb1912..2c89a6a6679cede125ce797f1ee2d1de25e798ef 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/system/controlDict
@@ -45,7 +45,9 @@ timePrecision 6;
runTimeModifiable true;
-#include "catalyst"
-
+functions
+{
+ #include "catalyst"
+}
// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/catalyst b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/catalyst
index 3a3aba32b637f2ede6ebfd3ee117d35114df15f2..48246a89f843646a54666ed64a5b7650ff65e4a9 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/catalyst
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/catalyst
@@ -1,37 +1,36 @@
// ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
-functions
+catalyst
{
- catalyst
- {
- #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
+ #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
- scripts
- (
- "<system>/scripts/writeCloud.py"
- "<system>/scripts/writePatches.py"
- );
+ scripts
+ (
+ "<system>/scripts/writeCloud.py"
+ "<system>/scripts/writePatches.py"
+ );
- inputs
+ inputs
+ {
+ // channel = region, region/mesh, region/patches
+ region
{
- region
- {
- type default;
+ type default;
- // Selected fields (words or regex)
- fields ( T U p rho );
- }
+ // Selected fields (words or regex)
+ fields ( T U p rho );
+ }
- cloud
- {
- type cloud;
+ // channel = cloud
+ cloud
+ {
+ type cloud;
- // Selected clouds (words or regex)
- clouds ( coalCloud1 limestoneCloud1 );
+ // Selected clouds (words or regex)
+ clouds ( coalCloud1 limestoneCloud1 );
- // Selected fields (words or regex)
- fields ( T U p rho "Y.*" );
- }
+ // Selected fields (words or regex)
+ fields ( T U p rho "Y.*" );
}
}
}
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
index 224ef164a53d1dbb7f4b5f5c6f0899feadd5bca4..ec0d86f0c504f92019e60b18b58cdc6bbb80d604 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
@@ -51,6 +51,10 @@ maxCo 1.0;
maxDeltaT 1;
-#include "catalyst"
+
+functions
+{
+ #include "catalyst"
+}
// ************************************************************************* //