Commit e8d1fe02 authored by Mark Olesen's avatar Mark Olesen

STYLE: remove 'functions' dictionary scope from catalyst files

- relocate to controlDict, since more than a single function object
  is often used.
parent ae48c4a4
// ParaView Catalyst function object for OpenFOAM (-*- C++ -*-) // ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
functions catalyst
{ {
catalyst
{
type catalyst; type catalyst;
libs ("libcatalystFoam.so"); libs ("libcatalystFoam.so");
executeControl timeStep; executeControl timeStep;
writeControl none; writeControl none;
// OR #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg" // ^^^^^
// #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
// mkdir "<case>/someDir"; // mkdir "<case>/someDir";
...@@ -54,7 +55,6 @@ functions ...@@ -54,7 +55,6 @@ functions
fields ( T U p rho "Y.*" ); fields ( T U p rho "Y.*" );
} }
} }
}
} }
......
// ParaView Catalyst function object for OpenFOAM (-*- C++ -*-) // ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
functions catalyst
{ {
catalyst
{
#includeEtc "caseDicts/insitu/catalyst/catalyst.cfg" #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
scripts scripts
( (
"<system>/scripts/writeArea.py" "<system>/scripts/writeArea.py"
...@@ -12,6 +11,7 @@ functions ...@@ -12,6 +11,7 @@ functions
inputs inputs
{ {
// channel = area
area area
{ {
type area; type area;
...@@ -19,7 +19,6 @@ functions ...@@ -19,7 +19,6 @@ functions
fields ( ".*" ); fields ( ".*" );
} }
} }
}
} }
// ************************************************************************* // // ************************************************************************* //
...@@ -43,6 +43,9 @@ timePrecision 6; ...@@ -43,6 +43,9 @@ timePrecision 6;
runTimeModifiable yes; runTimeModifiable yes;
#include "catalyst" functions
{
#include "catalyst"
}
// ************************************************************************* // // ************************************************************************* //
// ParaView Catalyst function object for OpenFOAM (-*- C++ -*-) // ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
functions catalyst
{ {
catalyst
{
#includeEtc "caseDicts/insitu/catalyst/catalyst.cfg" #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
scripts scripts
...@@ -16,6 +14,7 @@ functions ...@@ -16,6 +14,7 @@ functions
inputs inputs
{ {
// channel = region, region/mesh, region/patches
region region
{ {
// All regions // All regions
...@@ -25,7 +24,6 @@ functions ...@@ -25,7 +24,6 @@ functions
fields (T U p); fields (T U p);
} }
} }
}
} }
// ************************************************************************* // // ************************************************************************* //
...@@ -52,6 +52,9 @@ maxDi 10.0; ...@@ -52,6 +52,9 @@ maxDi 10.0;
adjustTimeStep yes; adjustTimeStep yes;
#include "catalyst" functions
{
#include "catalyst"
}
// ************************************************************************* // // ************************************************************************* //
// ParaView Catalyst function object for OpenFOAM (-*- C++ -*-) // ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
functions catalyst
{ {
catalyst
{
#includeEtc "caseDicts/insitu/catalyst/catalyst.cfg" #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
scripts scripts
...@@ -21,13 +19,13 @@ functions ...@@ -21,13 +19,13 @@ functions
inputs inputs
{ {
// channel = region, region/mesh, region/patches
region region
{ {
// Selected fields (words or regex) // Selected fields (words or regex)
fields (U p); fields (U p);
} }
} }
}
} }
// ************************************************************************* // // ************************************************************************* //
...@@ -45,7 +45,9 @@ timePrecision 6; ...@@ -45,7 +45,9 @@ timePrecision 6;
runTimeModifiable true; runTimeModifiable true;
#include "catalyst" functions
{
#include "catalyst"
}
// ************************************************************************* // // ************************************************************************* //
// ParaView Catalyst function object for OpenFOAM (-*- C++ -*-) // ParaView Catalyst function object for OpenFOAM (-*- C++ -*-)
functions catalyst
{ {
catalyst
{
#includeEtc "caseDicts/insitu/catalyst/catalyst.cfg" #includeEtc "caseDicts/insitu/catalyst/catalyst.cfg"
scripts scripts
...@@ -14,6 +12,7 @@ functions ...@@ -14,6 +12,7 @@ functions
inputs inputs
{ {
// channel = region, region/mesh, region/patches
region region
{ {
type default; type default;
...@@ -22,6 +21,7 @@ functions ...@@ -22,6 +21,7 @@ functions
fields ( T U p rho ); fields ( T U p rho );
} }
// channel = cloud
cloud cloud
{ {
type cloud; type cloud;
...@@ -33,7 +33,6 @@ functions ...@@ -33,7 +33,6 @@ functions
fields ( T U p rho "Y.*" ); fields ( T U p rho "Y.*" );
} }
} }
}
} }
// ************************************************************************* // // ************************************************************************* //
...@@ -51,6 +51,10 @@ maxCo 1.0; ...@@ -51,6 +51,10 @@ maxCo 1.0;
maxDeltaT 1; maxDeltaT 1;
#include "catalyst"
functions
{
#include "catalyst"
}
// ************************************************************************* // // ************************************************************************* //
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment