functionObjects::fieldAverage: Simplified the interface by the introduction of defaults

The mean, prime2Mean and base now have default values:

    {
        mean            on;   // (default = on)
        prime2Mean      on;   // (default = off)
        base            time; // time or iteration (default = time)
        window          200;  // optional averaging window
        windowName      w1;   // optional window name (default = "")
    }

so for the majority of cases for which these defaults are appropriate the
fieldAverage functionObject can now be specified in the functions entry in
controlDict thus:

functions
{
    fieldAverage1
    {
        #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg"

        fields
        (
            U.air
            U.water
            alpha.air
            p
        );
    }
}

also utilising the new fieldAverage.cfg file.

For cases in which these defaults are not appropriate, e.g. the prime2Mean is
also required the optional entries can be specified within sub-dictionaries for
each field, e.g.

    fieldAverage1
    {
        #includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg"

        fields
        (
            U
            {
                prime2Mean  yes;
            }

            p
            {
                prime2Mean  yes;
            }
        );
    }
This commit is contained in:
Henry Weller
2020-03-06 15:51:49 +00:00
parent 66397001c2
commit 46c790dd09
31 changed files with 102 additions and 845 deletions

View File

@ -51,68 +51,22 @@ functions
{
fieldAverage1
{
type fieldAverage;
libs ("libfieldFunctionObjects.so");
writeControl writeTime;
#includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg"
fields
(
rhoN
{
mean on;
prime2Mean off;
base time;
}
rhoM
{
mean on;
prime2Mean off;
base time;
}
dsmcRhoN
{
mean on;
prime2Mean off;
base time;
}
momentum
{
mean on;
prime2Mean off;
base time;
}
linearKE
{
mean on;
prime2Mean off;
base time;
}
internalE
{
mean on;
prime2Mean off;
base time;
}
iDof
{
mean on;
prime2Mean off;
base time;
}
q
{
mean on;
prime2Mean off;
base time;
}
fD
{
mean on;
prime2Mean off;
base time;
}
);
}
dsmcFields1
{
type dsmcFields;

View File

@ -51,69 +51,23 @@ functions
{
fieldAverage1
{
type fieldAverage;
libs ("libfieldFunctionObjects.so");
writeControl writeTime;
#includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg"
restartOnOutput off;
fields
(
rhoN
{
mean on;
prime2Mean off;
base time;
}
rhoM
{
mean on;
prime2Mean off;
base time;
}
dsmcRhoN
{
mean on;
prime2Mean off;
base time;
}
momentum
{
mean on;
prime2Mean off;
base time;
}
linearKE
{
mean on;
prime2Mean off;
base time;
}
internalE
{
mean on;
prime2Mean off;
base time;
}
iDof
{
mean on;
prime2Mean off;
base time;
}
q
{
mean on;
prime2Mean off;
base time;
}
fD
{
mean on;
prime2Mean off;
base time;
}
);
}
dsmcFields1
{
type dsmcFields;

View File

@ -51,66 +51,19 @@ functions
{
fieldAverage1
{
type fieldAverage;
libs ("libfieldFunctionObjects.so");
writeControl writeTime;
#includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg"
fields
(
rhoN
{
mean on;
prime2Mean off;
base time;
}
rhoM
{
mean on;
prime2Mean off;
base time;
}
dsmcRhoN
{
mean on;
prime2Mean off;
base time;
}
momentum
{
mean on;
prime2Mean off;
base time;
}
linearKE
{
mean on;
prime2Mean off;
base time;
}
internalE
{
mean on;
prime2Mean off;
base time;
}
iDof
{
mean on;
prime2Mean off;
base time;
}
q
{
mean on;
prime2Mean off;
base time;
}
fD
{
mean on;
prime2Mean off;
base time;
}
);
}

View File

@ -51,66 +51,19 @@ functions
{
fieldAverage1
{
type fieldAverage;
libs ("libfieldFunctionObjects.so");
writeControl writeTime;
#includeEtc "caseDicts/postProcessing/fields/fieldAverage.cfg"
fields
(
rhoN
{
mean on;
prime2Mean off;
base time;
}
rhoM
{
mean on;
prime2Mean off;
base time;
}
dsmcRhoN
{
mean on;
prime2Mean off;
base time;
}
momentum
{
mean on;
prime2Mean off;
base time;
}
linearKE
{
mean on;
prime2Mean off;
base time;
}
internalE
{
mean on;
prime2Mean off;
base time;
}
iDof
{
mean on;
prime2Mean off;
base time;
}
q
{
mean on;
prime2Mean off;
base time;
}
fD
{
mean on;
prime2Mean off;
base time;
}
);
}