diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/pU/pEqn.H index 34ee2caf3a..c6762e29bd 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/pU/pEqn.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/pU/pEqn.H @@ -174,7 +174,7 @@ while (pimple.correct()) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar(dimArea*dimVelocity, 0) + dimensionedScalar(dimFlux, 0) ); forAll(phases, phasei) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/pUf/pEqn.H index 100da22406..b4a0f01e0b 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/pUf/pEqn.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/pUf/pEqn.H @@ -165,7 +165,7 @@ while (pimple.correct()) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar(dimArea*dimVelocity, 0) + dimensionedScalar(dimFlux, 0) ); forAll(phases, phasei) diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C index 226581d144..5a4d1c8552 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -115,7 +115,7 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs() scalarField Un(phip/patch().magSf()); - if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { Un /= patch().lookupPatchField(rhoName_); } diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C index 7814ad74a7..1912cda58f 100644 --- a/src/OpenFOAM/dimensionSet/dimensionSets.C +++ b/src/OpenFOAM/dimensionSet/dimensionSets.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -165,6 +165,9 @@ const Foam::dimensionSet Foam::dimSpecificHeatCapacity(dimGasConstant); const Foam::dimensionSet Foam::dimViscosity(dimArea/dimTime); const Foam::dimensionSet Foam::dimDynamicViscosity(dimDensity*dimViscosity); +const Foam::dimensionSet Foam::dimFlux(dimArea*dimVelocity); +const Foam::dimensionSet Foam::dimMassFlux(dimDensity*dimFlux); + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.H b/src/OpenFOAM/dimensionSet/dimensionSets.H index 51bb8d1ef6..996b6ffcae 100644 --- a/src/OpenFOAM/dimensionSet/dimensionSets.H +++ b/src/OpenFOAM/dimensionSet/dimensionSets.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,6 +75,9 @@ extern const dimensionSet dimSpecificHeatCapacity; extern const dimensionSet dimViscosity; extern const dimensionSet dimDynamicViscosity; +extern const dimensionSet dimFlux; +extern const dimensionSet dimMassFlux; + class dimensionSets { diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C index 047e699ed8..8c0b0457f8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C @@ -151,7 +151,7 @@ Foam::advectiveFvPatchField::advectionSpeed() const phiName_ ); - if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { const fvPatchScalarField& rhop = this->patch().template lookupPatchField diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C index 4b754be5ad..d15791ef85 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -122,13 +122,13 @@ void Foam::fanPressureFvPatchScalarField::updateCoeffs() // Get the volumetric flow rate scalar volFlowRate = 0; - if (phip.internalField().dimensions() == dimVelocity*dimArea) + if (phip.internalField().dimensions() == dimFlux) { volFlowRate = sign*gSum(phip); } else if ( - phip.internalField().dimensions() == dimVelocity*dimArea*dimDensity + phip.internalField().dimensions() == dimMassFlux ) { const scalarField& rhop = diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C index 781f871491..9e62ced6dc 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,13 +43,13 @@ void Foam::fanPressureJumpFvPatchScalarField::calcFanJump() scalar volFlowRate = 0; - if (phip.internalField().dimensions() == dimVelocity*dimArea) + if (phip.internalField().dimensions() == dimFlux) { volFlowRate = gSum(phip); } else if ( - phip.internalField().dimensions() == dimVelocity*dimArea*dimDensity + phip.internalField().dimensions() == dimMassFlux ) { const scalarField& rhop = @@ -75,13 +75,13 @@ void Foam::fanPressureJumpFvPatchScalarField::calcFanJump() scalarField Un(max(sign*phip/patch().magSf(), scalar(0))); - if (phip.internalField().dimensions() == dimVelocity*dimArea) + if (phip.internalField().dimensions() == dimFlux) { // Do nothing } else if ( - phip.internalField().dimensions() == dimVelocity*dimArea*dimDensity + phip.internalField().dimensions() == dimMassFlux ) { const fvPatchField& rhop = diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C index ab73f49a05..25a630dab1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C @@ -111,11 +111,11 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate const vectorField n(patch().nf()); const Field& magS = patch().magSf(); - if (phi.dimensions() == dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { operator==(*this - n*(n & *this) + n*phip/magS); } - else if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + else if (phi.dimensions() == dimFlux) { const fvPatchField& rhop = patch().lookupPatchField(rhoName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C index dc82aa8cc0..de197052e7 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C @@ -125,12 +125,12 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs() vectorField n(patch().nf()); - if (phiName.dimensions() == dimVelocity*dimArea) + if (phiName.dimensions() == dimFlux) { // volumetric flow-rate operator==(n*U); } - else if (phiName.dimensions() == dimDensity*dimVelocity*dimArea) + else if (phiName.dimensions() == dimFlux) { const fvPatchField& rhop = patch().lookupPatchField(rhoName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C index 0f5ad95c5a..9f6fb5a7dd 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -180,7 +180,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs() // Calculate the current mass flow rate scalar massFlowRate(1.0); - if (phi.internalField().dimensions() == dimVelocity*dimArea) + if (phi.internalField().dimensions() == dimFlux) { if (hasRho_) { @@ -196,7 +196,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs() else if ( phi.internalField().dimensions() - == dimDensity*dimVelocity*dimArea + == dimFlux ) { if (hasRho_) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C index 0ac6df6e40..fd3f3679a6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C @@ -143,11 +143,11 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs() tmp n = patch().nf(); tmp ndmagS = (n & inletDir_)*patch().magSf(); - if (phi.dimensions() == dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { refValue() = inletDir_*phip/ndmagS; } - else if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + else if (phi.dimensions() == dimFlux) { const fvPatchField& rhop = patch().lookupPatchField(rhoName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C index 415371bc6b..348722362e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C @@ -134,11 +134,11 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs() tmp n = patch().nf(); tmp ndmagS = (n & inletDir_)*patch().magSf(); - if (phi.dimensions() == dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { operator==(inletDir_*phip/ndmagS); } - else if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + else if (phi.dimensions() == dimFlux) { const fvPatchField& rhop = patch().lookupPatchField(rhoName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C index 77afb62ca3..ab54c8d910 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C @@ -118,11 +118,11 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs() vectorField Ut(patchInternalField()); Ut -= n()*(Ut & n()); - if (phi.dimensions() == dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { refValue() = Ut + n*phip/magSf; } - else if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + else if (phi.dimensions() == dimFlux) { const fvPatchField& rhop = patch().lookupPatchField(rhoName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C index c1ffa87df2..bb190bb3f9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C @@ -103,11 +103,11 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs() tmp n = patch().nf(); const Field& magS = patch().magSf(); - if (phi.dimensions() == dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { operator==(n*phip/magS); } - else if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + else if (phi.dimensions() == dimFlux) { const fvPatchField& rhop = patch().lookupPatchField(rhoName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C index 4dca9f19a2..f5141e65a0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C @@ -114,11 +114,11 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs() tmp n = patch().nf(); const Field& magS = patch().magSf(); - if (phi.dimensions() == dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { refValue() = n*phip/magS; } - else if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + else if (phi.dimensions() == dimFlux) { const fvPatchField& rhop = patch().lookupPatchField(rhoName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C index 468d1fb685..4f8f08f797 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -150,12 +150,12 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs() const surfaceScalarField& phi = db().lookupObject(phiName_); - if (phi.dimensions() == dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { // volumetric flow-rate operator==(tangentialVelocity + n*avgU); } - else if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + else if (phi.dimensions() == dimFlux) { const fvPatchField& rhop = patch().lookupPatchField(rhoName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C index 69ee0cdca2..fb89f461bc 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -181,11 +181,11 @@ void Foam::syringePressureFvPatchScalarField::updateCoeffs() const fvsPatchField& phip = patch().patchField(phi); - if (phi.dimensions() == dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { ams_ = ams0_ + deltaT*sum((*this*psi_)*phip); } - else if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + else if (phi.dimensions() == dimFlux) { ams_ = ams0_ + deltaT*sum(phip); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C index 1129f85fd8..bb36a12ce4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -150,7 +150,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs() // Change in zeta due to flux vectorField dZetap(dt*nf()*phi.boundaryField()[patchi]/patch().magSf()); - if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { const scalarField& rhop = patch().lookupPatchField(rhoName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C index 3c09e6dc66..c5944a0e00 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C @@ -108,7 +108,7 @@ Foam::waveTransmissiveFvPatchField::advectionSpeed() const lookupPatchField(this->phiName_) ); - if (phi.dimensions() == dimDensity*dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { const fvPatchScalarField& rhop = this->patch().template diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C index 1a31a81d46..d78a478912 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -677,7 +677,7 @@ CoEulerDdtScheme::fvcDdtPhiCorr if ( U.dimensions() == dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { GeometricField rhoU0 @@ -705,7 +705,7 @@ CoEulerDdtScheme::fvcDdtPhiCorr else if ( U.dimensions() == rho.dimensions()*dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { fluxFieldType phiCorr diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C index 110207f0c6..02ed57bad1 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -1370,7 +1370,7 @@ CrankNicolsonDdtScheme::fvcDdtPhiCorr if ( U.dimensions() == dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { DDt0Field>& ddt0 = @@ -1427,7 +1427,7 @@ CrankNicolsonDdtScheme::fvcDdtPhiCorr else if ( U.dimensions() == rho.dimensions()*dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { DDt0Field>& ddt0 = diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C index 65a6612e94..343e617a9b 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -567,7 +567,7 @@ EulerDdtScheme::fvcDdtPhiCorr if ( U.dimensions() == dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { GeometricField rhoU0 @@ -595,7 +595,7 @@ EulerDdtScheme::fvcDdtPhiCorr else if ( U.dimensions() == rho.dimensions()*dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { fluxFieldType phiCorr diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C index 05b1a1b856..d00fe9d773 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -667,7 +667,7 @@ SLTSDdtScheme::fvcDdtPhiCorr if ( U.dimensions() == dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { GeometricField rhoU0 @@ -695,7 +695,7 @@ SLTSDdtScheme::fvcDdtPhiCorr else if ( U.dimensions() == rho.dimensions()*dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { fluxFieldType phiCorr diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C index b65fc3324f..18ee6c0911 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -817,7 +817,7 @@ backwardDdtScheme::fvcDdtPhiCorr if ( U.dimensions() == dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { const GeometricField rhoU0 @@ -848,7 +848,7 @@ backwardDdtScheme::fvcDdtPhiCorr else if ( U.dimensions() == rho.dimensions()*dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { return fluxFieldType::New diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C index c40851b0cd..2998d87843 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -528,7 +528,7 @@ localEulerDdtScheme::fvcDdtPhiCorr if ( U.dimensions() == dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { GeometricField rhoU0 @@ -565,7 +565,7 @@ localEulerDdtScheme::fvcDdtPhiCorr else if ( U.dimensions() == rho.dimensions()*dimVelocity - && phi.dimensions() == rho.dimensions()*dimVelocity*dimArea + && phi.dimensions() == rho.dimensions()*dimFlux ) { fluxFieldType phiCorr diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C index c59392afd5..8c43e72ef0 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,7 +61,7 @@ Foam::PhiScheme::limiter tmp tUflux = this->faceFlux_; - if (this->faceFlux_.dimensions() == dimDensity*dimVelocity*dimArea) + if (this->faceFlux_.dimensions() == dimFlux) { const volScalarField& rho = phi.db().objectRegistry::template lookupObject @@ -69,7 +69,7 @@ Foam::PhiScheme::limiter tUflux = this->faceFlux_/fvc::interpolate(rho); } - else if (this->faceFlux_.dimensions() != dimVelocity*dimArea) + else if (this->faceFlux_.dimensions() != dimFlux) { FatalErrorInFunction << "dimensions of faceFlux are not correct" diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H index f6113b9521..2b8e386c5e 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -187,7 +187,7 @@ public: const fvMesh& mesh = this->mesh(); tmp tUflux = faceFlux_; - if (faceFlux_.dimensions() == dimDensity*dimVelocity*dimArea) + if (faceFlux_.dimensions() == dimFlux) { // Currently assume that the density field // corresponding to the mass-flux is named "rho" @@ -197,7 +197,7 @@ public: tUflux = faceFlux_/fvc::interpolate(rho); } - else if (faceFlux_.dimensions() != dimVelocity*dimArea) + else if (faceFlux_.dimensions() != dimFlux) { FatalErrorInFunction << "dimensions of faceFlux are not correct" diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H index e48c2ee952..a3ced6ce47 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -197,7 +197,7 @@ public: const fvMesh& mesh = this->mesh(); tmp tUflux = faceFlux_; - if (faceFlux_.dimensions() == dimDensity*dimVelocity*dimArea) + if (faceFlux_.dimensions() == dimFlux) { // Currently assume that the density field // corresponding to the mass-flux is named "rho" @@ -207,7 +207,7 @@ public: tUflux = faceFlux_/fvc::interpolate(rho); } - else if (faceFlux_.dimensions() != dimVelocity*dimArea) + else if (faceFlux_.dimensions() != dimFlux) { FatalErrorInFunction << "dimensions of faceFlux are not correct" diff --git a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C index d9d100d0ea..e826ce0a77 100644 --- a/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C +++ b/src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -128,7 +128,7 @@ Foam::scalar Foam::PatchFlowRateInjection::flowRate() const const scalarField& phip = phi.boundaryField()[patchId_]; scalar flowRateIn = 0.0; - if (phi.dimensions() == dimVelocity*dimArea) + if (phi.dimensions() == dimFlux) { flowRateIn = max(0.0, -sum(phip)); }