fvOptions: The "<type>Coeffs" sub-dictionary is now optional

For example the actuationDiskSource fvOption may now be specified

disk1
{
    type            actuationDiskSource;

    fields      (U);

    selectionMode   cellSet;
    cellSet         actuationDisk1;
    diskDir         (1 0 0);    // Orientation of the disk
    Cp              0.386;
    Ct              0.58;
    diskArea        40;
    upstreamPoint   (581849 4785810 1065);
}

rather than

disk1
{
    type            actuationDiskSource;
    active          on;

    actuationDiskSourceCoeffs
    {
        fields      (U);

        selectionMode   cellSet;
        cellSet         actuationDisk1;
        diskDir         (1 0 0);    // Orientation of the disk
        Cp              0.386;
        Ct              0.58;
        diskArea        40;
        upstreamPoint   (581849 4785810 1065);
    }
}

but this form is supported for backward compatibility.
This commit is contained in:
Henry Weller
2017-04-13 13:30:17 +01:00
parent e9ba8242ca
commit 8b55ea4fb1
39 changed files with 383 additions and 529 deletions

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -52,7 +52,12 @@ Foam::fv::option::option
modelType_(modelType), modelType_(modelType),
mesh_(mesh), mesh_(mesh),
dict_(dict), dict_(dict),
coeffs_(dict.subDict(modelType + "Coeffs")), coeffs_
(
dict.found(modelType + "Coeffs")
? dict.subDict(modelType + "Coeffs")
: dict
),
active_(dict_.lookupOrDefault<Switch>("active", true)), active_(dict_.lookupOrDefault<Switch>("active", true)),
fieldNames_(), fieldNames_(),
applied_() applied_()
@ -75,6 +80,13 @@ Foam::autoPtr<Foam::fv::option> Foam::fv::option::New
Info<< indent Info<< indent
<< "Selecting finite volume options model type " << modelType << endl; << "Selecting finite volume options model type " << modelType << endl;
const_cast<Time&>(mesh.time()).libs().open
(
coeffs,
"libs",
dictionaryConstructorTablePtr_
);
dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(modelType); dictionaryConstructorTablePtr_->find(modelType);

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -53,7 +53,15 @@ void Foam::fv::option::writeData(Ostream& os) const
bool Foam::fv::option::read(const dictionary& dict) bool Foam::fv::option::read(const dictionary& dict)
{ {
dict.readIfPresent("active", active_); dict.readIfPresent("active", active_);
if (dict.found(modelType_ + "Coeffs"))
{
coeffs_ = dict.subDict(modelType_ + "Coeffs"); coeffs_ = dict.subDict(modelType_ + "Coeffs");
}
else
{
coeffs_ = dict;
}
return true; return true;
} }

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,15 +31,12 @@ Description
type scalarExplicitSource // Source type type scalarExplicitSource // Source type
active on; // on/off switch active on; // on/off switch
scalarExplicitSourceCoeffs
{
timeStart 0.0; // Start time timeStart 0.0; // Start time
duration 1000.0; // Duration duration 1000.0; // Duration
selectionMode cellSet; // cellSet, points, cellZone selectionMode cellSet; // cellSet, points, cellZone
. .
. .
. .
}
\endverbatim \endverbatim
Note Note

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -34,8 +34,6 @@ Usage
type fixedTemperatureConstraint; type fixedTemperatureConstraint;
active yes; active yes;
fixedTemperatureConstraintCoeffs
{
mode uniform; // uniform or lookup mode uniform; // uniform or lookup
// For uniform option // For uniform option
@ -44,7 +42,6 @@ Usage
// For lookup option // For lookup option
// T <Tname>; // optional temperature field name // T <Tname>; // optional temperature field name
} }
}
\endverbatim \endverbatim
Note: Note:

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -35,8 +35,6 @@ Usage
type scalarFixedValueConstraint; type scalarFixedValueConstraint;
active yes; active yes;
scalarFixedValueConstraintCoeffs
{
selectionMode cellZone; selectionMode cellZone;
cellZone porosity; cellZone porosity;
fieldValues fieldValues
@ -45,7 +43,6 @@ Usage
epsilon 150; epsilon 150;
} }
} }
}
\endverbatim \endverbatim
See also See also

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,13 +36,10 @@ Usage
type limitTemperature; type limitTemperature;
active yes; active yes;
limitTemperatureCoeffs
{
selectionMode all; selectionMode all;
min 200; min 200;
max 500; max 500;
} }
}
\endverbatim \endverbatim
SourceFiles SourceFiles

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -35,12 +35,9 @@ Usage
type limitVelocity; type limitVelocity;
active yes; active yes;
limitVelocityCoeffs
{
selectionMode all; selectionMode all;
max 100; max 100;
} }
}
\endverbatim \endverbatim
SourceFiles SourceFiles

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -47,15 +47,12 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
actuationDiskSourceCoeffs
{
fields (U); // names of fields to apply source fields (U); // names of fields to apply source
diskDir (-1 0 0); // disk direction diskDir (-1 0 0); // disk direction
Cp 0.1; // power coefficient Cp 0.1; // power coefficient
Ct 0.5; // thrust coefficient Ct 0.5; // thrust coefficient
diskArea 5.0; // disk area diskArea 5.0; // disk area
upstreamPoint (0 0 0); // upstream point upstreamPoint (0 0 0); // upstream point
}
\endverbatim \endverbatim

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,10 +31,7 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
buoyancyEnergyCoeffs
{
fields (h); // Name of energy field fields (h); // Name of energy field
}
\endverbatim \endverbatim
SourceFiles SourceFiles

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,10 +31,7 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
buoyancyForceCoeffs
{
fields (U); // Name of velocity field fields (U); // Name of velocity field
}
\endverbatim \endverbatim
SourceFiles SourceFiles

View File

@ -67,8 +67,6 @@ Usage
type effectivenessHeatExchangerSource; type effectivenessHeatExchangerSource;
active yes; active yes;
effectivenessHeatExchangerSourceCoeffs
{
selectionMode cellZone; selectionMode cellZone;
cellZone porosity; cellZone porosity;
@ -79,7 +77,6 @@ Usage
outOfBounds clamp; outOfBounds clamp;
fileName "effTable"; fileName "effTable";
} }
}
\endverbatim \endverbatim
The effectiveness table is described in terms of the primary and secondary The effectiveness table is described in terms of the primary and secondary

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,13 +33,10 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
meanVelocityForceCoeffs
{
selectionMode all; // Apply force to all cells selectionMode all; // Apply force to all cells
fields (U); // Name of velocity field fields (U); // Name of velocity field
Ubar (10.0 0 0); // Desired mean velocity Ubar (10.0 0 0); // Desired mean velocity
relaxation 0.2; // Optional relaxation factor relaxation 0.2; // Optional relaxation factor
}
\endverbatim \endverbatim
SourceFiles SourceFiles

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,14 +33,11 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
patchMeanVelocityForceCoeffs
{
selectionMode all; // Apply force to all cells selectionMode all; // Apply force to all cells
fields (U); // Name of velocity field fields (U); // Name of velocity field
patch inlet; // Name of the patch patch inlet; // Name of the patch
Ubar (10.0 0 0); // Desired mean velocity Ubar (10.0 0 0); // Desired mean velocity
relaxation 0.2; // Optional relaxation factor relaxation 0.2; // Optional relaxation factor
}
\endverbatim \endverbatim
SourceFiles SourceFiles

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -53,8 +53,6 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
actuationDiskSourceCoeffs
{
fieldName U; // name of field to apply source fieldName U; // name of field to apply source
diskDir (-1 0 0); // disk direction diskDir (-1 0 0); // disk direction
Cp 0.1; // power coefficient Cp 0.1; // power coefficient
@ -62,7 +60,6 @@ Usage
diskArea 5.0; // disk area diskArea 5.0; // disk area
coeffs (0.1 0.5 0.01); // radial distribution coefficients coeffs (0.1 0.5 0.01); // radial distribution coefficients
upstreamPoint (0 0 0); // upstream point upstreamPoint (0 0 0); // upstream point
}
\endverbatim \endverbatim

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,8 +33,6 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
rotorDiskSourceCoeffs
{
fields (U); // names of fields on which to apply source fields (U); // names of fields on which to apply source
nBlades 3; // number of blades nBlades 3; // number of blades
tipEffect 0.96; // normalised radius above which lift = 0 tipEffect 0.96; // normalised radius above which lift = 0
@ -73,7 +71,6 @@ Usage
... ...
} }
} }
}
\endverbatim \endverbatim
Where: Where:

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -243,7 +243,7 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
} }
} }
applied_.setSize(2, false); applied_.setSize(fieldNames_.size(), false);
} }

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -53,8 +53,6 @@ Usage
type solidificationMeltingSource; type solidificationMeltingSource;
active yes; active yes;
solidificationMeltingSourceCoeffs
{
selectionMode cellZone; selectionMode cellZone;
cellZone iceZone; cellZone iceZone;
@ -64,7 +62,6 @@ Usage
beta 50e-6; beta 50e-6;
rhoRef 800; rhoRef 800;
} }
}
\endverbatim \endverbatim
Where: Where:

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -35,11 +35,8 @@ Usage
type tabulatedAccelerationSource; type tabulatedAccelerationSource;
active yes; active yes;
tabulatedAccelerationSourceCoeffs
{
timeDataFileName "constant/acceleration-terms.dat"; timeDataFileName "constant/acceleration-terms.dat";
} }
}
\endverbatim \endverbatim
SourceFiles SourceFiles

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -42,15 +42,12 @@ Description
Example of the source specification: Example of the source specification:
\verbatim \verbatim
<Type>SemiImplicitSourceCoeffs
{
volumeMode absolute; // specific volumeMode absolute; // specific
injectionRateSuSp injectionRateSuSp
{ {
k (30.7 0); k (30.7 0);
epsilon (1.5 0); epsilon (1.5 0);
} }
}
\endverbatim \endverbatim
Valid options for the \c volumeMode entry include: Valid options for the \c volumeMode entry include:

View File

@ -18,7 +18,6 @@ FoamFile
porosity1 porosity1
{ {
type explicitPorositySource; type explicitPorositySource;
active yes;
explicitPorositySourceCoeffs explicitPorositySourceCoeffs
{ {
@ -27,8 +26,6 @@ porosity1
type DarcyForchheimer; type DarcyForchheimer;
DarcyForchheimerCoeffs
{
d (7e5 -1000 -1000); d (7e5 -1000 -1000);
f (0 0 0); f (0 0 0);
@ -44,7 +41,6 @@ porosity1
} }
} }
} }
}
} }

View File

@ -18,7 +18,6 @@ FoamFile
porosity1 porosity1
{ {
type explicitPorositySource; type explicitPorositySource;
active yes;
explicitPorositySourceCoeffs explicitPorositySourceCoeffs
{ {
@ -27,8 +26,6 @@ porosity1
type DarcyForchheimer; type DarcyForchheimer;
DarcyForchheimerCoeffs
{
d (5e7 -1000 -1000); d (5e7 -1000 -1000);
f (0 0 0); f (0 0 0);
@ -44,7 +41,6 @@ porosity1
} }
} }
} }
}
} }

View File

@ -18,7 +18,6 @@ FoamFile
porosity1 porosity1
{ {
type explicitPorositySource; type explicitPorositySource;
active yes;
explicitPorositySourceCoeffs explicitPorositySourceCoeffs
{ {
@ -27,8 +26,6 @@ porosity1
type DarcyForchheimer; type DarcyForchheimer;
DarcyForchheimerCoeffs
{
d (1e5 -1000 -1000); d (1e5 -1000 -1000);
f (0 0 0); f (0 0 0);
@ -44,7 +41,6 @@ porosity1
} }
} }
} }
}
} }

View File

@ -18,16 +18,12 @@ FoamFile
source1 source1
{ {
type fixedTemperatureConstraint; type fixedTemperatureConstraint;
active yes;
fixedTemperatureConstraintCoeffs
{
selectionMode cellZone; selectionMode cellZone;
cellZone porosity; cellZone porosity;
mode uniform; mode uniform;
temperature 350; temperature 350;
}
} }

View File

@ -18,7 +18,6 @@ FoamFile
porosity porosity
{ {
type explicitPorositySource; type explicitPorositySource;
active yes;
explicitPorositySourceCoeffs explicitPorositySourceCoeffs
{ {
@ -53,25 +52,18 @@ porosity
fixedTemperature fixedTemperature
{ {
type fixedTemperatureConstraint; type fixedTemperatureConstraint;
active yes;
fixedTemperatureConstraintCoeffs
{
selectionMode cellZone; selectionMode cellZone;
cellZone porosity; cellZone porosity;
mode uniform; mode uniform;
temperature 350; temperature 350;
}
} }
porosityTurbulence porosityTurbulence
{ {
type scalarFixedValueConstraint; type scalarFixedValueConstraint;
active yes;
scalarFixedValueConstraintCoeffs
{
selectionMode cellZone; selectionMode cellZone;
cellZone porosity; cellZone porosity;
fieldValues fieldValues
@ -79,7 +71,6 @@ porosityTurbulence
k 1; k 1;
epsilon 150; epsilon 150;
} }
}
} }

View File

@ -18,10 +18,7 @@ FoamFile
airToporous airToporous
{ {
type constantHeatTransfer; type constantHeatTransfer;
active yes;
constantHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight; interpolationMethod cellVolumeWeight;
nbrRegionName porous; nbrRegionName porous;
master false; master false;
@ -29,13 +26,11 @@ airToporous
nbrModel porousToair; nbrModel porousToair;
fields (h); fields (h);
semiImplicit no; semiImplicit no;
}
} }
porosityBlockage porosityBlockage
{ {
type interRegionExplicitPorositySource; type interRegionExplicitPorositySource;
active yes;
interRegionExplicitPorositySourceCoeffs interRegionExplicitPorositySourceCoeffs
{ {
@ -44,8 +39,6 @@ porosityBlockage
type DarcyForchheimer; type DarcyForchheimer;
DarcyForchheimerCoeffs
{
d (-1000 -1000 1e4); d (-1000 -1000 1e4);
f (0 0 0); f (0 0 0);
@ -61,7 +54,6 @@ porosityBlockage
} }
} }
} }
}
} }

View File

@ -18,10 +18,7 @@ FoamFile
porousToair porousToair
{ {
type constantHeatTransfer; type constantHeatTransfer;
active yes;
constantHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight; interpolationMethod cellVolumeWeight;
nbrRegionName air; nbrRegionName air;
master true; master true;
@ -29,7 +26,6 @@ porousToair
nbrModel airToporous; nbrModel airToporous;
fields (h); fields (h);
semiImplicit no; semiImplicit no;
}
} }

View File

@ -18,15 +18,11 @@ FoamFile
momentumSource momentumSource
{ {
type meanVelocityForce; type meanVelocityForce;
active yes;
meanVelocityForceCoeffs
{
selectionMode all; selectionMode all;
fields (U); fields (U);
Ubar (0.1335 0 0); Ubar (0.1335 0 0);
}
} }

View File

@ -18,10 +18,7 @@ FoamFile
momentumSource momentumSource
{ {
type vectorSemiImplicitSource; type vectorSemiImplicitSource;
active yes;
vectorSemiImplicitSourceCoeffs
{
timeStart 0.0; timeStart 0.0;
duration 1000; duration 1000;
selectionMode all; selectionMode all;
@ -31,7 +28,6 @@ momentumSource
{ {
U ((5 0 0) 0); U ((5 0 0) 0);
} }
}
} }

View File

@ -50,13 +50,7 @@ IOdictionary fvOptions
) )
); );
const dictionary& gradPDict = const dictionary& gradPDict =
fvOptions.subDict("momentumSource").subDict fvOptions.subDict("momentumSource").subDict("injectionRateSuSp");
(
"vectorSemiImplicitSourceCoeffs"
).subDict
(
"injectionRateSuSp"
);
const scalar K = const scalar K =
Tuple2<vector, scalar>(gradPDict.lookup("U")).first().x(); Tuple2<vector, scalar>(gradPDict.lookup("U")).first().x();

View File

@ -18,7 +18,6 @@ FoamFile
porosity1 porosity1
{ {
type explicitPorositySource; type explicitPorositySource;
active yes;
explicitPorositySourceCoeffs explicitPorositySourceCoeffs
{ {
@ -32,8 +31,6 @@ porosity1
// D 500; // Slight waviness in the far wake // D 500; // Slight waviness in the far wake
D 1000; // Fully shedding behavior D 1000; // Fully shedding behavior
DarcyForchheimerCoeffs
{
d ($D $D $D); d ($D $D $D);
f (0 0 0); f (0 0 0);
@ -49,7 +46,6 @@ porosity1
} }
} }
} }
}
} }

View File

@ -17,10 +17,7 @@ FoamFile
disk disk
{ {
type rotorDisk; type rotorDisk;
active on;
rotorDiskCoeffs
{
selectionMode cellZone; selectionMode cellZone;
cellZone rotatingZone; cellZone rotatingZone;
@ -100,7 +97,6 @@ disk
); );
} }
} }
}
} }
// ************************************************************************* // // ************************************************************************* //

View File

@ -18,10 +18,7 @@ FoamFile
disk1 disk1
{ {
type actuationDiskSource; type actuationDiskSource;
active on;
actuationDiskSourceCoeffs
{
fields (U); fields (U);
selectionMode cellSet; selectionMode cellSet;
@ -31,16 +28,12 @@ disk1
Ct 0.58; Ct 0.58;
diskArea 40; diskArea 40;
upstreamPoint (581849 4785810 1065); upstreamPoint (581849 4785810 1065);
}
} }
disk2 disk2
{ {
type actuationDiskSource; type actuationDiskSource;
active on;
actuationDiskSourceCoeffs
{
fields (U); fields (U);
selectionMode cellSet; selectionMode cellSet;
@ -50,7 +43,6 @@ disk2
Ct 0.58; Ct 0.58;
diskArea 40; diskArea 40;
upstreamPoint (581753 4785663 1070); upstreamPoint (581753 4785663 1070);
}
} }

View File

@ -18,10 +18,7 @@ FoamFile
source1 source1
{ {
type fixedTemperatureConstraint; type fixedTemperatureConstraint;
active yes;
fixedTemperatureConstraintCoeffs
{
timeStart 0.1; timeStart 0.1;
duration 0.4; duration 0.4;
selectionMode cellSet; selectionMode cellSet;
@ -29,7 +26,6 @@ source1
mode uniform; mode uniform;
temperature 2000; temperature 2000;
}
} }

View File

@ -18,7 +18,6 @@ FoamFile
filter1 filter1
{ {
type explicitPorositySource; type explicitPorositySource;
active yes;
explicitPorositySourceCoeffs explicitPorositySourceCoeffs
{ {
@ -27,8 +26,6 @@ filter1
type DarcyForchheimer; type DarcyForchheimer;
DarcyForchheimerCoeffs
{
d (500000 -1000 -1000); d (500000 -1000 -1000);
f (0 0 0); f (0 0 0);
@ -44,17 +41,13 @@ filter1
} }
} }
} }
}
} }
massSource1 massSource1
{ {
type scalarSemiImplicitSource; type scalarSemiImplicitSource;
active yes;
scalarSemiImplicitSourceCoeffs
{
timeStart 0.2; timeStart 0.2;
duration 2.0; duration 2.0;
selectionMode points; selectionMode points;
@ -69,17 +62,13 @@ massSource1
rho (1e-4 0); // kg/s rho (1e-4 0); // kg/s
H2O (1e-4 0); // kg/s H2O (1e-4 0); // kg/s
} }
}
} }
momentumSource1 momentumSource1
{ {
type vectorSemiImplicitSource; type vectorSemiImplicitSource;
active yes;
vectorSemiImplicitSourceCoeffs
{
timeStart 0.2; timeStart 0.2;
duration 2.0; duration 2.0;
selectionMode points; selectionMode points;
@ -93,17 +82,13 @@ momentumSource1
{ {
U ((0 0.005 0) 0); U ((0 0.005 0) 0);
} }
}
} }
energySource1 energySource1
{ {
type scalarSemiImplicitSource; type scalarSemiImplicitSource;
active yes;
scalarSemiImplicitSourceCoeffs
{
timeStart 0.2; timeStart 0.2;
duration 2.0; duration 2.0;
selectionMode points; selectionMode points;
@ -117,7 +102,6 @@ energySource1
{ {
h (10 0); h (10 0);
} }
}
} }

View File

@ -18,7 +18,6 @@ FoamFile
porosity1 porosity1
{ {
type explicitPorositySource; type explicitPorositySource;
active yes;
explicitPorositySourceCoeffs explicitPorositySourceCoeffs
{ {
@ -27,8 +26,6 @@ porosity1
type DarcyForchheimer; type DarcyForchheimer;
DarcyForchheimerCoeffs
{
d (2e8 -1000 -1000); d (2e8 -1000 -1000);
f (0 0 0); f (0 0 0);
@ -44,7 +41,6 @@ porosity1
} }
} }
} }
}
} }

View File

@ -32,8 +32,6 @@ options
{ {
type scalarSemiImplicitSource; type scalarSemiImplicitSource;
scalarSemiImplicitSourceCoeffs
{
$injector1; $injector1;
volumeMode absolute; volumeMode absolute;
@ -42,14 +40,11 @@ options
thermo:rho.air (1e-3 0); // kg/s thermo:rho.air (1e-3 0); // kg/s
} }
} }
}
momentumSource1 momentumSource1
{ {
type vectorSemiImplicitSource; type vectorSemiImplicitSource;
vectorSemiImplicitSourceCoeffs
{
$injector1; $injector1;
volumeMode absolute; volumeMode absolute;
@ -58,14 +53,11 @@ options
U.air ((0 -1e-2 0) 0); // kg*m/s^2 U.air ((0 -1e-2 0) 0); // kg*m/s^2
} }
} }
}
energySource1 energySource1
{ {
type scalarSemiImplicitSource; type scalarSemiImplicitSource;
scalarSemiImplicitSourceCoeffs
{
$injector1; $injector1;
volumeMode absolute; volumeMode absolute;
@ -74,7 +66,6 @@ options
e.air (500 0); // kg*m^2/s^3 e.air (500 0); // kg*m^2/s^3
} }
} }
}
} }

View File

@ -32,8 +32,6 @@ options
{ {
type scalarSemiImplicitSource; type scalarSemiImplicitSource;
scalarSemiImplicitSourceCoeffs
{
$injector1; $injector1;
volumeMode absolute; volumeMode absolute;
@ -42,14 +40,11 @@ options
thermo:rho.steam (1.0e-3 0); // kg/s thermo:rho.steam (1.0e-3 0); // kg/s
} }
} }
}
momentumSource1 momentumSource1
{ {
type vectorSemiImplicitSource; type vectorSemiImplicitSource;
vectorSemiImplicitSourceCoeffs
{
$injector1; $injector1;
volumeMode absolute; volumeMode absolute;
@ -58,14 +53,11 @@ options
U.steam ((0 1e-1 0) 0); // kg*m/s^2 U.steam ((0 1e-1 0) 0); // kg*m/s^2
} }
} }
}
energySource1 energySource1
{ {
type scalarSemiImplicitSource; type scalarSemiImplicitSource;
scalarSemiImplicitSourceCoeffs
{
$injector1; $injector1;
volumeMode absolute; volumeMode absolute;
@ -74,7 +66,6 @@ options
h.steam (3700 0); // kg*m^2/s^3 h.steam (3700 0); // kg*m^2/s^3
} }
} }
}
} }

View File

@ -32,8 +32,6 @@ options
{ {
type scalarSemiImplicitSource; type scalarSemiImplicitSource;
scalarSemiImplicitSourceCoeffs
{
$injector1; $injector1;
volumeMode absolute; volumeMode absolute;
@ -42,14 +40,11 @@ options
thermo:rho.air (1e-3 0); // kg/s thermo:rho.air (1e-3 0); // kg/s
} }
} }
}
momentumSource1 momentumSource1
{ {
type vectorSemiImplicitSource; type vectorSemiImplicitSource;
vectorSemiImplicitSourceCoeffs
{
$injector1; $injector1;
volumeMode absolute; volumeMode absolute;
@ -58,14 +53,11 @@ options
U.air ((0 -1e-2 0) 0); // kg*m/s^2 U.air ((0 -1e-2 0) 0); // kg*m/s^2
} }
} }
}
energySource1 energySource1
{ {
type scalarSemiImplicitSource; type scalarSemiImplicitSource;
scalarSemiImplicitSourceCoeffs
{
$injector1; $injector1;
volumeMode absolute; volumeMode absolute;
@ -74,7 +66,6 @@ options
e.air (500 0); // kg*m^2/s^3 e.air (500 0); // kg*m^2/s^3
} }
} }
}
} }