zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lagrangian: Changed the field argument for source function SU, Sh and SYi to const

Browse Source 
for consistency with the rest of OpenFOAM
This commit is contained in:
Henry Weller
2021-05-10 13:49:55 +01:00
parent 643fbbd1d5
commit c55dceca80
10 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloud.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -487,7 +487,10 @@ public:
inline volScalarField::Internal& UCoeffRef(); inline volScalarField::Internal& UCoeffRef();
//- Return tmp momentum source term //- Return tmp momentum source term
inline tmp<fvVectorMatrix> SU(volVectorField& U) const; inline tmp<fvVectorMatrix> SU
(
const volVectorField& U
) const;
// Check // Check

4
src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloudI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -409,7 +409,7 @@ Foam::MomentumCloud<CloudType>::UCoeffRef()
template<class CloudType> template<class CloudType>
inline Foam::tmp<Foam::fvVectorMatrix> inline Foam::tmp<Foam::fvVectorMatrix>
Foam::MomentumCloud<CloudType>::SU(volVectorField& U) const Foam::MomentumCloud<CloudType>::SU(const volVectorField& U) const
{ {
if (debug) if (debug)
{ {

4
src/lagrangian/parcel/clouds/Templates/ReactingCloud/ReactingCloud.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -253,7 +253,7 @@ public:
inline tmp<fvScalarMatrix> SYi inline tmp<fvScalarMatrix> SYi
( (
const label i, const label i,
volScalarField& Yi const volScalarField& Yi
) const; ) const;
//- Return tmp mass source for field i - fully explicit //- Return tmp mass source for field i - fully explicit

4
src/lagrangian/parcel/clouds/Templates/ReactingCloud/ReactingCloudI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -104,7 +104,7 @@ template<class CloudType>
inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
( (
const label i, const label i,
volScalarField& Yi const volScalarField& Yi
) const ) const
{ {
if (this->solution().coupled()) if (this->solution().coupled())

7
src/lagrangian/parcel/clouds/Templates/ThermoCloud/ThermoCloud.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -301,7 +301,10 @@ public:
inline volScalarField::Internal& hsCoeffRef(); inline volScalarField::Internal& hsCoeffRef();
//- Return sensible enthalpy source term [J/kg/m^3/s] //- Return sensible enthalpy source term [J/kg/m^3/s]
inline tmp<fvScalarMatrix> Sh(volScalarField& hs) const; inline tmp<fvScalarMatrix> Sh
(
const volScalarField& hs
) const;
// Radiation - overrides thermoCloud virtual abstract members // Radiation - overrides thermoCloud virtual abstract members

4
src/lagrangian/parcel/clouds/Templates/ThermoCloud/ThermoCloudI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -222,7 +222,7 @@ Foam::ThermoCloud<CloudType>::hsCoeffRef()
template<class CloudType> template<class CloudType>
inline Foam::tmp<Foam::fvScalarMatrix> inline Foam::tmp<Foam::fvScalarMatrix>
Foam::ThermoCloud<CloudType>::Sh(volScalarField& hs) const Foam::ThermoCloud<CloudType>::Sh(const volScalarField& hs) const
{ {
if (debug) if (debug)
{ {

8
src/lagrangian/parcel/parcelCloud/ParcelCloudBase.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -135,7 +135,7 @@ public:
// Momentum // Momentum
//- Return momentum source term [kg m/s^2] //- Return momentum source term [kg m/s^2]
tmp<fvVectorMatrix> SU(volVectorField& U) const tmp<fvVectorMatrix> SU(const volVectorField& U) const
{ {
return tmp<fvVectorMatrix> return tmp<fvVectorMatrix>
( (
@ -169,7 +169,7 @@ public:
// Energy // Energy
//- Return sensible enthalpy source term [J/s] //- Return sensible enthalpy source term [J/s]
tmp<fvScalarMatrix> Sh(volScalarField& hs) const tmp<fvScalarMatrix> Sh(const volScalarField& hs) const
{ {
return tmp<fvScalarMatrix> return tmp<fvScalarMatrix>
( (
@ -239,7 +239,7 @@ public:
tmp<fvScalarMatrix> SYi tmp<fvScalarMatrix> SYi
( (
const label i, const label i,
volScalarField& Yi const volScalarField& Yi
) const ) const
{ {
return tmp<fvScalarMatrix> return tmp<fvScalarMatrix>

14
src/lagrangian/parcel/parcelCloud/parcelCloudBase.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -104,7 +104,10 @@ public:
// Momentum // Momentum
//- Return momentum source term [kg m/s^2] //- Return momentum source term [kg m/s^2]
virtual tmp<fvVectorMatrix> SU(volVectorField& U) const = 0; virtual tmp<fvVectorMatrix> SU
(
const volVectorField& U
) const = 0;
//- Momentum transfer [kg m/s] //- Momentum transfer [kg m/s]
virtual tmp<volVectorField::Internal> UTrans() const = 0; virtual tmp<volVectorField::Internal> UTrans() const = 0;
@ -116,7 +119,10 @@ public:
// Energy // Energy
//- Return sensible enthalpy source term [J/s] //- Return sensible enthalpy source term [J/s]
virtual tmp<fvScalarMatrix> Sh(volScalarField& hs) const = 0; virtual tmp<fvScalarMatrix> Sh
(
const volScalarField& hs
) const = 0;
//- Sensible enthalpy transfer [J] //- Sensible enthalpy transfer [J]
virtual tmp<volScalarField::Internal> hsTrans() const = 0; virtual tmp<volScalarField::Internal> hsTrans() const = 0;
@ -140,7 +146,7 @@ public:
virtual tmp<fvScalarMatrix> SYi virtual tmp<fvScalarMatrix> SYi
( (
const label i, const label i,
volScalarField& Yi const volScalarField& Yi
) const = 0; ) const = 0;
//- Return mass source for specie [kg/m^3/s] //- Return mass source for specie [kg/m^3/s]

8
src/lagrangian/parcel/parcelCloudList/parcelCloudList.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -149,7 +149,7 @@ const Foam::tmp<Foam::volScalarField> Foam::parcelCloudList::theta() const
Foam::tmp<Foam::fvVectorMatrix> Foam::parcelCloudList::SU Foam::tmp<Foam::fvVectorMatrix> Foam::parcelCloudList::SU
( (
volVectorField& U const volVectorField& U
) const ) const
{ {
tmp<fvVectorMatrix> tSU(new fvVectorMatrix(U, dimMass*dimAcceleration)); tmp<fvVectorMatrix> tSU(new fvVectorMatrix(U, dimMass*dimAcceleration));
@ -201,7 +201,7 @@ Foam::tmp<Foam::volScalarField::Internal> Foam::parcelCloudList::UCoeff() const
Foam::tmp<Foam::fvScalarMatrix> Foam::parcelCloudList::Sh Foam::tmp<Foam::fvScalarMatrix> Foam::parcelCloudList::Sh
( (
volScalarField& hs const volScalarField& hs
) const ) const
{ {
tmp<fvScalarMatrix> tSh(new fvScalarMatrix(hs, dimEnergy/dimTime)); tmp<fvScalarMatrix> tSh(new fvScalarMatrix(hs, dimEnergy/dimTime));
@ -312,7 +312,7 @@ Foam::tmp<Foam::volScalarField> Foam::parcelCloudList::sigmap() const
Foam::tmp<Foam::fvScalarMatrix> Foam::parcelCloudList::SYi Foam::tmp<Foam::fvScalarMatrix> Foam::parcelCloudList::SYi
( (
const label speciei, const label speciei,
volScalarField& Yi const volScalarField& Yi
) const ) const
{ {
tmp<fvScalarMatrix> tSYi(new fvScalarMatrix(Yi, dimMass/dimTime)); tmp<fvScalarMatrix> tSYi(new fvScalarMatrix(Yi, dimMass/dimTime));

8
src/lagrangian/parcel/parcelCloudList/parcelCloudList.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -114,7 +114,7 @@ public:
// Momentum // Momentum
//- Return momentum source term [kg m/s^2] //- Return momentum source term [kg m/s^2]
tmp<fvVectorMatrix> SU(volVectorField& U) const; tmp<fvVectorMatrix> SU(const volVectorField& U) const;
//- Momentum transfer [kg m/s] //- Momentum transfer [kg m/s]
tmp<volVectorField::Internal> UTrans() const; tmp<volVectorField::Internal> UTrans() const;
@ -126,7 +126,7 @@ public:
// Energy // Energy
//- Return sensible enthalpy source term [J/s] //- Return sensible enthalpy source term [J/s]
tmp<fvScalarMatrix> Sh(volScalarField& hs) const; tmp<fvScalarMatrix> Sh(const volScalarField& hs) const;
//- Sensible enthalpy transfer [J] //- Sensible enthalpy transfer [J]
tmp<volScalarField::Internal> hsTrans() const; tmp<volScalarField::Internal> hsTrans() const;
@ -150,7 +150,7 @@ public:
tmp<fvScalarMatrix> SYi tmp<fvScalarMatrix> SYi
( (
const label speciei, const label speciei,
volScalarField& Yi const volScalarField& Yi
) const; ) const;
//- Return mass source for specie [kg/m^3/s] //- Return mass source for specie [kg/m^3/s]