From 8b55ea4fb1ca12359c836e5cafd0a15a29f20273 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 13 Apr 2017 13:30:17 +0100 Subject: [PATCH] fvOptions: The "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. --- .../cfdTools/general/fvOptions/fvOption.C | 16 +- .../cfdTools/general/fvOptions/fvOption.H | 2 +- .../cfdTools/general/fvOptions/fvOptionIO.C | 12 +- src/fvOptions/cellSetOption/cellSetOption.H | 17 +-- .../fixedTemperatureConstraint.H | 15 +- .../FixedValueConstraint.H | 15 +- .../limitTemperature/limitTemperature.H | 11 +- .../corrections/limitVelocity/limitVelocity.H | 9 +- .../actuationDiskSource/actuationDiskSource.H | 17 +-- .../derived/buoyancyEnergy/buoyancyEnergy.H | 7 +- .../derived/buoyancyForce/buoyancyForce.H | 7 +- .../effectivenessHeatExchangerSource.H | 19 +-- .../meanVelocityForce/meanVelocityForce.H | 13 +- .../patchMeanVelocityForce.H | 15 +- .../radialActuationDiskSource.H | 19 +-- .../derived/rotorDiskSource/rotorDiskSource.H | 5 +- .../solidificationMeltingSource.C | 4 +- .../solidificationMeltingSource.H | 19 +-- .../tabulatedAccelerationSource.H | 7 +- .../semiImplicitSource/SemiImplicitSource.H | 13 +- .../RAS/angledDuct/constant/fvOptions | 24 ++- .../RAS/angledDuctLTS/constant/fvOptions | 24 ++- .../RAS/mixerVessel2D/constant/fvOptions | 24 ++- .../angledDuctImplicit/constant/fvOptions | 12 +- .../constant/fvOptions | 27 ++-- .../heatExchanger/constant/air/fvOptions | 40 ++--- .../heatExchanger/constant/porous/fvOptions | 16 +- .../LES/channel395/constant/fvOptions | 10 +- .../planarPoiseuille/constant/fvOptions | 18 +-- .../validation/WatersKing/createFields.H | 8 +- .../laminar/porousBlockage/constant/fvOptions | 24 ++- .../simpleFoam/rotorDisk/system/fvOptions | 142 +++++++++--------- .../turbineSiting/constant/fvOptions | 40 ++--- .../simplifiedSiwek/constant/fvOptions | 16 +- .../filter/constant/fvOptions | 104 ++++++------- .../RAS/angledDuct/constant/fvOptions | 24 ++- .../laminar/injection/constant/fvOptions | 39 ++--- .../laminar/steamInjection/constant/fvOptions | 39 ++--- .../laminar/injection/constant/fvOptions | 39 ++--- 39 files changed, 383 insertions(+), 529 deletions(-) diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C index d6ccd5c66b..be200396ea 100644 --- a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C +++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,7 +52,12 @@ Foam::fv::option::option modelType_(modelType), mesh_(mesh), dict_(dict), - coeffs_(dict.subDict(modelType + "Coeffs")), + coeffs_ + ( + dict.found(modelType + "Coeffs") + ? dict.subDict(modelType + "Coeffs") + : dict + ), active_(dict_.lookupOrDefault("active", true)), fieldNames_(), applied_() @@ -75,6 +80,13 @@ Foam::autoPtr Foam::fv::option::New Info<< indent << "Selecting finite volume options model type " << modelType << endl; + const_cast(mesh.time()).libs().open + ( + coeffs, + "libs", + dictionaryConstructorTablePtr_ + ); + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H index 506a868bc5..cab1112368 100644 --- a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H +++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionIO.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionIO.C index 0f6c453226..5308fa623b 100644 --- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionIO.C +++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,15 @@ void Foam::fv::option::writeData(Ostream& os) const bool Foam::fv::option::read(const dictionary& dict) { dict.readIfPresent("active", active_); - coeffs_ = dict.subDict(modelType_ + "Coeffs"); + + if (dict.found(modelType_ + "Coeffs")) + { + coeffs_ = dict.subDict(modelType_ + "Coeffs"); + } + else + { + coeffs_ = dict; + } return true; } diff --git a/src/fvOptions/cellSetOption/cellSetOption.H b/src/fvOptions/cellSetOption/cellSetOption.H index dd07b2e87f..ba7a99c324 100644 --- a/src/fvOptions/cellSetOption/cellSetOption.H +++ b/src/fvOptions/cellSetOption/cellSetOption.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,15 +31,12 @@ Description type scalarExplicitSource // Source type active on; // on/off switch - scalarExplicitSourceCoeffs - { - timeStart 0.0; // Start time - duration 1000.0; // Duration - selectionMode cellSet; // cellSet, points, cellZone - . - . - . - } + timeStart 0.0; // Start time + duration 1000.0; // Duration + selectionMode cellSet; // cellSet, points, cellZone + . + . + . \endverbatim Note diff --git a/src/fvOptions/constraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H index afab78ad52..404a035ceb 100644 --- a/src/fvOptions/constraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H +++ b/src/fvOptions/constraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,16 +34,13 @@ Usage type fixedTemperatureConstraint; active yes; - fixedTemperatureConstraintCoeffs - { - mode uniform; // uniform or lookup + mode uniform; // uniform or lookup - // For uniform option - temperature constant 500; // fixed temperature with time [K] + // For uniform option + temperature constant 500; // fixed temperature with time [K] - // For lookup option - // T ; // optional temperature field name - } + // For lookup option + // T ; // optional temperature field name } \endverbatim diff --git a/src/fvOptions/constraints/fixedValueConstraint/FixedValueConstraint.H b/src/fvOptions/constraints/fixedValueConstraint/FixedValueConstraint.H index dcd557f624..42d52160d4 100644 --- a/src/fvOptions/constraints/fixedValueConstraint/FixedValueConstraint.H +++ b/src/fvOptions/constraints/fixedValueConstraint/FixedValueConstraint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,15 +35,12 @@ Usage type scalarFixedValueConstraint; active yes; - scalarFixedValueConstraintCoeffs + selectionMode cellZone; + cellZone porosity; + fieldValues { - selectionMode cellZone; - cellZone porosity; - fieldValues - { - k 1; - epsilon 150; - } + k 1; + epsilon 150; } } \endverbatim diff --git a/src/fvOptions/corrections/limitTemperature/limitTemperature.H b/src/fvOptions/corrections/limitTemperature/limitTemperature.H index 609dac6686..956515eb60 100644 --- a/src/fvOptions/corrections/limitTemperature/limitTemperature.H +++ b/src/fvOptions/corrections/limitTemperature/limitTemperature.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,12 +36,9 @@ Usage type limitTemperature; active yes; - limitTemperatureCoeffs - { - selectionMode all; - min 200; - max 500; - } + selectionMode all; + min 200; + max 500; } \endverbatim diff --git a/src/fvOptions/corrections/limitVelocity/limitVelocity.H b/src/fvOptions/corrections/limitVelocity/limitVelocity.H index b1c3f1b048..15ff1a8b6a 100644 --- a/src/fvOptions/corrections/limitVelocity/limitVelocity.H +++ b/src/fvOptions/corrections/limitVelocity/limitVelocity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,11 +35,8 @@ Usage type limitVelocity; active yes; - limitVelocityCoeffs - { - selectionMode all; - max 100; - } + selectionMode all; + max 100; } \endverbatim diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H index 66a673ed3e..bec0446d96 100644 --- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H +++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,15 +47,12 @@ Description Usage Example usage: \verbatim - actuationDiskSourceCoeffs - { - fields (U); // names of fields to apply source - diskDir (-1 0 0); // disk direction - Cp 0.1; // power coefficient - Ct 0.5; // thrust coefficient - diskArea 5.0; // disk area - upstreamPoint (0 0 0); // upstream point - } + fields (U); // names of fields to apply source + diskDir (-1 0 0); // disk direction + Cp 0.1; // power coefficient + Ct 0.5; // thrust coefficient + diskArea 5.0; // disk area + upstreamPoint (0 0 0); // upstream point \endverbatim diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H index 6f6a79584c..a6bf15c191 100644 --- a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H +++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,10 +31,7 @@ Description Usage Example usage: \verbatim - buoyancyEnergyCoeffs - { - fields (h); // Name of energy field - } + fields (h); // Name of energy field \endverbatim SourceFiles diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H index c6203e0557..e50c5f3264 100644 --- a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H +++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,10 +31,7 @@ Description Usage Example usage: \verbatim - buoyancyForceCoeffs - { - fields (U); // Name of velocity field - } + fields (U); // Name of velocity field \endverbatim SourceFiles diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H index e21ce5b52d..75c7ad6295 100644 --- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H +++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H @@ -67,18 +67,15 @@ Usage type effectivenessHeatExchangerSource; active yes; - effectivenessHeatExchangerSourceCoeffs - { - selectionMode cellZone; - cellZone porosity; + selectionMode cellZone; + cellZone porosity; - secondaryMassFlowRate 1.0; - secondaryInletT 336; - primaryInletT 293; - faceZone facesZoneInletOriented; - outOfBounds clamp; - fileName "effTable"; - } + secondaryMassFlowRate 1.0; + secondaryInletT 336; + primaryInletT 293; + faceZone facesZoneInletOriented; + outOfBounds clamp; + fileName "effTable"; } \endverbatim diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H index fc12440bce..a115710fb2 100644 --- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H +++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,13 +33,10 @@ Description Usage Example usage: \verbatim - meanVelocityForceCoeffs - { - selectionMode all; // Apply force to all cells - fields (U); // Name of velocity field - Ubar (10.0 0 0); // Desired mean velocity - relaxation 0.2; // Optional relaxation factor - } + selectionMode all; // Apply force to all cells + fields (U); // Name of velocity field + Ubar (10.0 0 0); // Desired mean velocity + relaxation 0.2; // Optional relaxation factor \endverbatim SourceFiles diff --git a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H index 7413cd497e..75b175def6 100644 --- a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H +++ b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,14 +33,11 @@ Description Usage Example usage: \verbatim - patchMeanVelocityForceCoeffs - { - selectionMode all; // Apply force to all cells - fields (U); // Name of velocity field - patch inlet; // Name of the patch - Ubar (10.0 0 0); // Desired mean velocity - relaxation 0.2; // Optional relaxation factor - } + selectionMode all; // Apply force to all cells + fields (U); // Name of velocity field + patch inlet; // Name of the patch + Ubar (10.0 0 0); // Desired mean velocity + relaxation 0.2; // Optional relaxation factor \endverbatim SourceFiles diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H index 8fbcc2002a..4603e29295 100644 --- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H +++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,16 +53,13 @@ Description Usage Example usage: \verbatim - actuationDiskSourceCoeffs - { - fieldName U; // name of field to apply source - diskDir (-1 0 0); // disk direction - Cp 0.1; // power coefficient - Ct 0.5; // thrust coefficient - diskArea 5.0; // disk area - coeffs (0.1 0.5 0.01); // radial distribution coefficients - upstreamPoint (0 0 0); // upstream point - } + fieldName U; // name of field to apply source + diskDir (-1 0 0); // disk direction + Cp 0.1; // power coefficient + Ct 0.5; // thrust coefficient + diskArea 5.0; // disk area + coeffs (0.1 0.5 0.01); // radial distribution coefficients + upstreamPoint (0 0 0); // upstream point \endverbatim diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H index d928e2f2ca..889df73ba5 100644 --- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H +++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,8 +33,6 @@ Description Usage Example usage: \verbatim - rotorDiskSourceCoeffs - { fields (U); // names of fields on which to apply source nBlades 3; // number of blades tipEffect 0.96; // normalised radius above which lift = 0 @@ -73,7 +71,6 @@ Usage ... } } - } \endverbatim Where: diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C index 859ef24a2b..7867633b8d 100644 --- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C +++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -243,7 +243,7 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource } } - applied_.setSize(2, false); + applied_.setSize(fieldNames_.size(), false); } diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H index fe969d54ce..b91c94a95d 100644 --- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H +++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,17 +53,14 @@ Usage type solidificationMeltingSource; active yes; - solidificationMeltingSourceCoeffs - { - selectionMode cellZone; - cellZone iceZone; + selectionMode cellZone; + cellZone iceZone; - Tmelt 273; - L 334000; - thermoMode thermo; - beta 50e-6; - rhoRef 800; - } + Tmelt 273; + L 334000; + thermoMode thermo; + beta 50e-6; + rhoRef 800; } \endverbatim diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H index 6418ac7171..1ee054f63e 100644 --- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H +++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,10 +35,7 @@ Usage type tabulatedAccelerationSource; active yes; - tabulatedAccelerationSourceCoeffs - { - timeDataFileName "constant/acceleration-terms.dat"; - } + timeDataFileName "constant/acceleration-terms.dat"; } \endverbatim diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H index c6bf7ff777..bc06babeb1 100644 --- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H +++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,14 +42,11 @@ Description Example of the source specification: \verbatim - SemiImplicitSourceCoeffs + volumeMode absolute; // specific + injectionRateSuSp { - volumeMode absolute; // specific - injectionRateSuSp - { - k (30.7 0); - epsilon (1.5 0); - } + k (30.7 0); + epsilon (1.5 0); } \endverbatim diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions index 8d380de4a6..f5665a7a0d 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions +++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions @@ -18,7 +18,6 @@ FoamFile porosity1 { type explicitPorositySource; - active yes; explicitPorositySourceCoeffs { @@ -27,21 +26,18 @@ porosity1 type DarcyForchheimer; - DarcyForchheimerCoeffs - { - d (7e5 -1000 -1000); - f (0 0 0); + d (7e5 -1000 -1000); + f (0 0 0); - coordinateSystem + coordinateSystem + { + type cartesian; + origin (0 0 0); + coordinateRotation { - type cartesian; - origin (0 0 0); - coordinateRotation - { - type axesRotation; - e1 (0.70710678 0.70710678 0); - e3 (0 0 1); - } + type axesRotation; + e1 (0.70710678 0.70710678 0); + e3 (0 0 1); } } } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions index 045b7a7385..7b2d72be0a 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions +++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions @@ -18,7 +18,6 @@ FoamFile porosity1 { type explicitPorositySource; - active yes; explicitPorositySourceCoeffs { @@ -27,21 +26,18 @@ porosity1 type DarcyForchheimer; - DarcyForchheimerCoeffs - { - d (5e7 -1000 -1000); - f (0 0 0); + d (5e7 -1000 -1000); + f (0 0 0); - coordinateSystem + coordinateSystem + { + type cartesian; + origin (0 0 0); + coordinateRotation { - type cartesian; - origin (0 0 0); - coordinateRotation - { - type axesRotation; - e1 (0.70710678 0.70710678 0); - e2 (0 0 1); - } + type axesRotation; + e1 (0.70710678 0.70710678 0); + e2 (0 0 1); } } } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions index 446cbc45a9..17db7e16ad 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions +++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions @@ -18,7 +18,6 @@ FoamFile porosity1 { type explicitPorositySource; - active yes; explicitPorositySourceCoeffs { @@ -27,21 +26,18 @@ porosity1 type DarcyForchheimer; - DarcyForchheimerCoeffs - { - d (1e5 -1000 -1000); - f (0 0 0); + d (1e5 -1000 -1000); + f (0 0 0); - coordinateSystem + coordinateSystem + { + type cartesian; + origin (0 0 0); + coordinateRotation { - type cartesian; - origin (0 0 0); - coordinateRotation - { - type axesRotation; - e1 (1 0 0); - e2 (0 1 0); - } + type axesRotation; + e1 (1 0 0); + e2 (0 1 0); } } } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/fvOptions b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/fvOptions index d41d1e8b8d..41c0ca275c 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/fvOptions +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/fvOptions @@ -18,16 +18,12 @@ FoamFile source1 { type fixedTemperatureConstraint; - active yes; - fixedTemperatureConstraintCoeffs - { - selectionMode cellZone; - cellZone porosity; + selectionMode cellZone; + cellZone porosity; - mode uniform; - temperature 350; - } + mode uniform; + temperature 350; } diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions index bb431dc10a..85390e4e58 100644 --- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions +++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions @@ -18,7 +18,6 @@ FoamFile porosity { type explicitPorositySource; - active yes; explicitPorositySourceCoeffs { @@ -53,32 +52,24 @@ porosity fixedTemperature { type fixedTemperatureConstraint; - active yes; - fixedTemperatureConstraintCoeffs - { - selectionMode cellZone; - cellZone porosity; - mode uniform; - temperature 350; - } + selectionMode cellZone; + cellZone porosity; + mode uniform; + temperature 350; } porosityTurbulence { type scalarFixedValueConstraint; - active yes; - scalarFixedValueConstraintCoeffs + selectionMode cellZone; + cellZone porosity; + fieldValues { - selectionMode cellZone; - cellZone porosity; - fieldValues - { - k 1; - epsilon 150; - } + k 1; + epsilon 150; } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions index 34857576c1..fffcb80dc1 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions @@ -18,24 +18,19 @@ FoamFile airToporous { type constantHeatTransfer; - active yes; - constantHeatTransferCoeffs - { - interpolationMethod cellVolumeWeight; - nbrRegionName porous; - master false; + interpolationMethod cellVolumeWeight; + nbrRegionName porous; + master false; - nbrModel porousToair; - fields (h); - semiImplicit no; - } + nbrModel porousToair; + fields (h); + semiImplicit no; } porosityBlockage { type interRegionExplicitPorositySource; - active yes; interRegionExplicitPorositySourceCoeffs { @@ -44,21 +39,18 @@ porosityBlockage type DarcyForchheimer; - DarcyForchheimerCoeffs - { - d (-1000 -1000 1e4); - f (0 0 0); + d (-1000 -1000 1e4); + f (0 0 0); - coordinateSystem + coordinateSystem + { + type cartesian; + origin (0 0 0); + coordinateRotation { - type cartesian; - origin (0 0 0); - coordinateRotation - { - type axesRotation; - e1 (0 1 0); - e2 (0 0 1); - } + type axesRotation; + e1 (0 1 0); + e2 (0 0 1); } } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions index 6ccc6a529b..2c44772e9b 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions @@ -18,18 +18,14 @@ FoamFile porousToair { type constantHeatTransfer; - active yes; - constantHeatTransferCoeffs - { - interpolationMethod cellVolumeWeight; - nbrRegionName air; - master true; + interpolationMethod cellVolumeWeight; + nbrRegionName air; + master true; - nbrModel airToporous; - fields (h); - semiImplicit no; - } + nbrModel airToporous; + fields (h); + semiImplicit no; } diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395/constant/fvOptions b/tutorials/incompressible/pimpleFoam/LES/channel395/constant/fvOptions index b2b9fc33d4..a59794a17a 100644 --- a/tutorials/incompressible/pimpleFoam/LES/channel395/constant/fvOptions +++ b/tutorials/incompressible/pimpleFoam/LES/channel395/constant/fvOptions @@ -18,15 +18,11 @@ FoamFile momentumSource { type meanVelocityForce; - active yes; - meanVelocityForceCoeffs - { - selectionMode all; + selectionMode all; - fields (U); - Ubar (0.1335 0 0); - } + fields (U); + Ubar (0.1335 0 0); } diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/fvOptions b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/fvOptions index 5a267f51d2..bf9fb34042 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/fvOptions +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/fvOptions @@ -18,19 +18,15 @@ FoamFile momentumSource { type vectorSemiImplicitSource; - active yes; - vectorSemiImplicitSourceCoeffs + timeStart 0.0; + duration 1000; + selectionMode all; + + volumeMode specific; + injectionRateSuSp { - timeStart 0.0; - duration 1000; - selectionMode all; - - volumeMode specific; - injectionRateSuSp - { - U ((5 0 0) 0); - } + U ((5 0 0) 0); } } diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H index 4ae80853b4..67d0003134 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H @@ -50,13 +50,7 @@ IOdictionary fvOptions ) ); const dictionary& gradPDict = - fvOptions.subDict("momentumSource").subDict - ( - "vectorSemiImplicitSourceCoeffs" - ).subDict - ( - "injectionRateSuSp" - ); + fvOptions.subDict("momentumSource").subDict("injectionRateSuSp"); const scalar K = Tuple2(gradPDict.lookup("U")).first().x(); diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions index fcba4b2188..93ed91c9ee 100644 --- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions +++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions @@ -18,7 +18,6 @@ FoamFile porosity1 { type explicitPorositySource; - active yes; explicitPorositySourceCoeffs { @@ -32,21 +31,18 @@ porosity1 // D 500; // Slight waviness in the far wake D 1000; // Fully shedding behavior - DarcyForchheimerCoeffs - { - d ($D $D $D); - f (0 0 0); + d ($D $D $D); + f (0 0 0); - coordinateSystem + coordinateSystem + { + type cartesian; + origin (0 0 0); + coordinateRotation { - type cartesian; - origin (0 0 0); - coordinateRotation - { - type axesRotation; - e1 (1 0 0); - e2 (0 1 0); - } + type axesRotation; + e1 (1 0 0); + e2 (0 1 0); } } } diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions index 599f21065b..7107305c20 100644 --- a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions +++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions @@ -17,89 +17,85 @@ FoamFile disk { type rotorDisk; - active on; - rotorDiskCoeffs + selectionMode cellZone; + cellZone rotatingZone; + + fields (U); // Names of fields on which to apply source + nBlades 3; // Number of blades + tipEffect 0.96; // Normalised radius above which lift = 0 + + inletFlowType local; // Inlet flow type specification + inletVelocity (0 1 0); + + geometryMode specified; + + origin (0 0 0); + axis (0 1 0); + + refDirection (0 0 1); // Reference direction + // - used as reference for psi angle + rpm 1000; + //pointAbove (0 0 0.25); + + trimModel fixedTrim; // fixed || targetForce + + rhoRef 1000; + rhoInf 1; + + fixedTrimCoeffs { - selectionMode cellZone; - cellZone rotatingZone; + theta0 0; + theta1c 0; + theta1s 0; + } - fields (U); // Names of fields on which to apply source - nBlades 3; // Number of blades - tipEffect 0.96; // Normalised radius above which lift = 0 + flapCoeffs + { + beta0 0; // Coning angle [deg] + beta1c 0; // Lateral flapping coeff (cos coeff) + beta2s 0; // Longitudinal flapping coeff (sin coeff) + } - inletFlowType local; // Inlet flow type specification - inletVelocity (0 1 0); + blade + { + data + ( + (profile1 (0.1 -6 0.02)) + (profile1 (0.25 -6 0.02)) + ); + } - geometryMode specified; - - origin (0 0 0); - axis (0 1 0); - - refDirection (0 0 1); // Reference direction - // - used as reference for psi angle - rpm 1000; - //pointAbove (0 0 0.25); - - trimModel fixedTrim; // fixed || targetForce - - rhoRef 1000; - rhoInf 1; - - fixedTrimCoeffs - { - theta0 0; - theta1c 0; - theta1s 0; - } - - flapCoeffs - { - beta0 0; // Coning angle [deg] - beta1c 0; // Lateral flapping coeff (cos coeff) - beta2s 0; // Longitudinal flapping coeff (sin coeff) - } - - blade + profiles + { + profile1 { + type lookup; data ( - (profile1 (0.1 -6 0.02)) - (profile1 (0.25 -6 0.02)) + (-90 0.21 1.45) + (-18 0.21 1.45) + (-16 0.165 1.3) + (-14 0.125 1.1) + (-12 0.092 0.95) + (-10 0.07 0.8) + (-8 0.05 0.64) + (-6 0.04 0.5) + (-4 0.028 0.32) + (-2 0.022 0.18) + (0 0.02 0) + (2 0.022 0.18) + (4 0.028 0.32) + (6 0.04 0.5) + (8 0.05 0.64) + (10 0.07 0.8) + (12 0.092 0.95) + (14 0.125 1.1) + (16 0.165 1.3) + (18 0.21 1.45) + (90 0.21 1.45) ); } - - profiles - { - profile1 - { - type lookup; - data - ( - (-90 0.21 1.45) - (-18 0.21 1.45) - (-16 0.165 1.3) - (-14 0.125 1.1) - (-12 0.092 0.95) - (-10 0.07 0.8) - (-8 0.05 0.64) - (-6 0.04 0.5) - (-4 0.028 0.32) - (-2 0.022 0.18) - (0 0.02 0) - (2 0.022 0.18) - (4 0.028 0.32) - (6 0.04 0.5) - (8 0.05 0.64) - (10 0.07 0.8) - (12 0.092 0.95) - (14 0.125 1.1) - (16 0.165 1.3) - (18 0.21 1.45) - (90 0.21 1.45) - ); - } - } } } diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions b/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions index bf45c8c332..051544965a 100644 --- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions +++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions @@ -18,39 +18,31 @@ FoamFile disk1 { type actuationDiskSource; - active on; - actuationDiskSourceCoeffs - { - fields (U); + 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); - } + selectionMode cellSet; + cellSet actuationDisk1; + diskDir (1 0 0); // Orientation of the disk + Cp 0.386; + Ct 0.58; + diskArea 40; + upstreamPoint (581849 4785810 1065); } disk2 { type actuationDiskSource; - active on; - actuationDiskSourceCoeffs - { - fields (U); + fields (U); - selectionMode cellSet; - cellSet actuationDisk2; - diskDir (1 0 0); // Orientation of the disk - Cp 0.53; - Ct 0.58; - diskArea 40; - upstreamPoint (581753 4785663 1070); - } + selectionMode cellSet; + cellSet actuationDisk2; + diskDir (1 0 0); // Orientation of the disk + Cp 0.53; + Ct 0.58; + diskArea 40; + upstreamPoint (581753 4785663 1070); } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions index ee8ddad892..a8d67957cb 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions @@ -18,18 +18,14 @@ FoamFile source1 { type fixedTemperatureConstraint; - active yes; - fixedTemperatureConstraintCoeffs - { - timeStart 0.1; - duration 0.4; - selectionMode cellSet; - cellSet ignitionCells; + timeStart 0.1; + duration 0.4; + selectionMode cellSet; + cellSet ignitionCells; - mode uniform; - temperature 2000; - } + mode uniform; + temperature 2000; } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions index 0b6c185a6e..dd6336e10d 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions @@ -18,7 +18,6 @@ FoamFile filter1 { type explicitPorositySource; - active yes; explicitPorositySourceCoeffs { @@ -27,21 +26,18 @@ filter1 type DarcyForchheimer; - DarcyForchheimerCoeffs - { - d (500000 -1000 -1000); - f (0 0 0); + d (500000 -1000 -1000); + f (0 0 0); - coordinateSystem + coordinateSystem + { + type cartesian; + origin (0 0 0); + coordinateRotation { - type cartesian; - origin (0 0 0); - coordinateRotation - { - type axesRotation; - e1 (1 0 0); - e2 (0 1 0); - } + type axesRotation; + e1 (1 0 0); + e2 (0 1 0); } } } @@ -51,24 +47,20 @@ filter1 massSource1 { type scalarSemiImplicitSource; - active yes; - scalarSemiImplicitSourceCoeffs + timeStart 0.2; + duration 2.0; + selectionMode points; + points + ( + (2.75 0.5 0) + ); + + volumeMode absolute; + injectionRateSuSp { - timeStart 0.2; - duration 2.0; - selectionMode points; - points - ( - (2.75 0.5 0) - ); - - volumeMode absolute; - injectionRateSuSp - { - rho (1e-4 0); // kg/s - H2O (1e-4 0); // kg/s - } + rho (1e-4 0); // kg/s + H2O (1e-4 0); // kg/s } } @@ -76,23 +68,19 @@ massSource1 momentumSource1 { type vectorSemiImplicitSource; - active yes; - vectorSemiImplicitSourceCoeffs + timeStart 0.2; + duration 2.0; + selectionMode points; + points + ( + (2.75 0.5 0) + ); + + volumeMode absolute; + injectionRateSuSp { - timeStart 0.2; - duration 2.0; - selectionMode points; - points - ( - (2.75 0.5 0) - ); - - volumeMode absolute; - injectionRateSuSp - { - U ((0 0.005 0) 0); - } + U ((0 0.005 0) 0); } } @@ -100,23 +88,19 @@ momentumSource1 energySource1 { type scalarSemiImplicitSource; - active yes; - scalarSemiImplicitSourceCoeffs + timeStart 0.2; + duration 2.0; + selectionMode points; + points + ( + (2.75 0.5 0) + ); + + volumeMode absolute; + injectionRateSuSp { - timeStart 0.2; - duration 2.0; - selectionMode points; - points - ( - (2.75 0.5 0) - ); - - volumeMode absolute; - injectionRateSuSp - { - h (10 0); - } + h (10 0); } } diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions index 9811075885..2ea1d4f5d2 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions @@ -18,7 +18,6 @@ FoamFile porosity1 { type explicitPorositySource; - active yes; explicitPorositySourceCoeffs { @@ -27,21 +26,18 @@ porosity1 type DarcyForchheimer; - DarcyForchheimerCoeffs - { - d (2e8 -1000 -1000); - f (0 0 0); + d (2e8 -1000 -1000); + f (0 0 0); - coordinateSystem + coordinateSystem + { + type cartesian; + origin (0 0 0); + coordinateRotation { - type cartesian; - origin (0 0 0); - coordinateRotation - { - type axesRotation; - e1 (0.70710678 0.70710678 0); - e2 (0 0 1); - } + type axesRotation; + e1 (0.70710678 0.70710678 0); + e2 (0 0 1); } } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions index 5bc7e7ef87..653797ebf2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions @@ -32,15 +32,12 @@ options { type scalarSemiImplicitSource; - scalarSemiImplicitSourceCoeffs - { - $injector1; + $injector1; - volumeMode absolute; - injectionRateSuSp - { - thermo:rho.air (1e-3 0); // kg/s - } + volumeMode absolute; + injectionRateSuSp + { + thermo:rho.air (1e-3 0); // kg/s } } @@ -48,15 +45,12 @@ options { type vectorSemiImplicitSource; - vectorSemiImplicitSourceCoeffs - { - $injector1; + $injector1; - volumeMode absolute; - injectionRateSuSp - { - U.air ((0 -1e-2 0) 0); // kg*m/s^2 - } + volumeMode absolute; + injectionRateSuSp + { + U.air ((0 -1e-2 0) 0); // kg*m/s^2 } } @@ -64,15 +58,12 @@ options { type scalarSemiImplicitSource; - scalarSemiImplicitSourceCoeffs - { - $injector1; + $injector1; - volumeMode absolute; - injectionRateSuSp - { - e.air (500 0); // kg*m^2/s^3 - } + volumeMode absolute; + injectionRateSuSp + { + e.air (500 0); // kg*m^2/s^3 } } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions index c59177ebfc..2a07e89ca0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions @@ -32,15 +32,12 @@ options { type scalarSemiImplicitSource; - scalarSemiImplicitSourceCoeffs - { - $injector1; + $injector1; - volumeMode absolute; - injectionRateSuSp - { - thermo:rho.steam (1.0e-3 0); // kg/s - } + volumeMode absolute; + injectionRateSuSp + { + thermo:rho.steam (1.0e-3 0); // kg/s } } @@ -48,15 +45,12 @@ options { type vectorSemiImplicitSource; - vectorSemiImplicitSourceCoeffs - { - $injector1; + $injector1; - volumeMode absolute; - injectionRateSuSp - { - U.steam ((0 1e-1 0) 0); // kg*m/s^2 - } + volumeMode absolute; + injectionRateSuSp + { + U.steam ((0 1e-1 0) 0); // kg*m/s^2 } } @@ -64,15 +58,12 @@ options { type scalarSemiImplicitSource; - scalarSemiImplicitSourceCoeffs - { - $injector1; + $injector1; - volumeMode absolute; - injectionRateSuSp - { - h.steam (3700 0); // kg*m^2/s^3 - } + volumeMode absolute; + injectionRateSuSp + { + h.steam (3700 0); // kg*m^2/s^3 } } } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions index 5bc7e7ef87..653797ebf2 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions @@ -32,15 +32,12 @@ options { type scalarSemiImplicitSource; - scalarSemiImplicitSourceCoeffs - { - $injector1; + $injector1; - volumeMode absolute; - injectionRateSuSp - { - thermo:rho.air (1e-3 0); // kg/s - } + volumeMode absolute; + injectionRateSuSp + { + thermo:rho.air (1e-3 0); // kg/s } } @@ -48,15 +45,12 @@ options { type vectorSemiImplicitSource; - vectorSemiImplicitSourceCoeffs - { - $injector1; + $injector1; - volumeMode absolute; - injectionRateSuSp - { - U.air ((0 -1e-2 0) 0); // kg*m/s^2 - } + volumeMode absolute; + injectionRateSuSp + { + U.air ((0 -1e-2 0) 0); // kg*m/s^2 } } @@ -64,15 +58,12 @@ options { type scalarSemiImplicitSource; - scalarSemiImplicitSourceCoeffs - { - $injector1; + $injector1; - volumeMode absolute; - injectionRateSuSp - { - e.air (500 0); // kg*m^2/s^3 - } + volumeMode absolute; + injectionRateSuSp + { + e.air (500 0); // kg*m^2/s^3 } } }