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++ -*-)
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.*" );
}
}
}
......
// 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 ( ".*" );
}
}
}
......
......@@ -43,6 +43,9 @@ timePrecision 6;
runTimeModifiable yes;
#include "catalyst"
functions
{
#include "catalyst"
}
// ************************************************************************* //
// 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);
}
}
}
......
......@@ -52,6 +52,9 @@ maxDi 10.0;
adjustTimeStep yes;
#include "catalyst"
functions
{
#include "catalyst"
}
// ************************************************************************* //
// 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);
}
}
}
......
......@@ -45,7 +45,9 @@ timePrecision 6;
runTimeModifiable true;
#include "catalyst"
functions
{
#include "catalyst"
}
// ************************************************************************* //
// 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.*" );
}
}
}
......
......@@ -51,6 +51,10 @@ maxCo 1.0;
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