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

lagrangian: DevolatilisationModel: Added access to the parcel

Browse Source
This commit is contained in:
Will Bainbridge
2021-08-13 12:30:14 +01:00
parent 41b73ec578
commit f3454baa08
11 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
View File

@ -274,7 +274,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
cloud, cloud,
td, td,
dt, dt,
this->age_,
Ts, Ts,
d0, d0,
T0, T0,
@ -503,7 +502,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
TrackCloudType& cloud, TrackCloudType& cloud,
trackingData& td, trackingData& td,
const scalar dt, const scalar dt,
const scalar age,
const scalar Ts, const scalar Ts,
const scalar d, const scalar d,
const scalar T, const scalar T,
@ -557,12 +555,17 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
const CompositionModel<thermoCloudType>& composition = const CompositionModel<thermoCloudType>& composition =
cloud.composition(); cloud.composition();
const typename TrackCloudType::parcelType& p =
static_cast<const typename TrackCloudType::parcelType&>(*this);
typename TrackCloudType::parcelType::trackingData& ttd =
static_cast<typename TrackCloudType::parcelType::trackingData&>(td);
// Total mass of volatiles evolved // Total mass of volatiles evolved
cloud.devolatilisation().calculate cloud.devolatilisation().calculate
( (
p,
ttd,
dt, dt,
age,
mass0, mass0,
mass, mass,
T, T,

1
src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
View File

@ -225,7 +225,6 @@ protected:
TrackCloudType& cloud, TrackCloudType& cloud,
trackingData& td, trackingData& td,
const scalar dt, // timestep const scalar dt, // timestep
const scalar age, // age
const scalar Ts, // surface temperature const scalar Ts, // surface temperature
const scalar d, // diameter const scalar d, // diameter
const scalar T, // temperature const scalar T, // temperature

4
src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcel.C
View File

@ -93,8 +93,8 @@ template<class ParcelType>
template<class TrackCloudType> template<class TrackCloudType>
void Foam::ThermoParcel<ParcelType>::calcSurfaceValues void Foam::ThermoParcel<ParcelType>::calcSurfaceValues
( (
TrackCloudType& cloud, const TrackCloudType& cloud,
trackingData& td, const trackingData& td,
const scalar T, const scalar T,
scalar& Ts, scalar& Ts,
scalar& rhos, scalar& rhos,

4
src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcel.H
View File

@ -414,8 +414,8 @@ public:
template<class TrackCloudType> template<class TrackCloudType>
void calcSurfaceValues void calcSurfaceValues
( (
TrackCloudType& cloud, const TrackCloudType& cloud,
trackingData& td, const trackingData& td,
const scalar T, const scalar T,
scalar& Ts, scalar& Ts,
scalar& rhos, scalar& rhos,

5
src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.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) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -94,8 +94,9 @@ Foam::ConstantRateDevolatilisation<CloudType>::~ConstantRateDevolatilisation()
template<class CloudType> template<class CloudType>
void Foam::ConstantRateDevolatilisation<CloudType>::calculate void Foam::ConstantRateDevolatilisation<CloudType>::calculate
( (
const typename CloudType::parcelType& p,
const typename CloudType::parcelType::trackingData& td,
const scalar dt, const scalar dt,
const scalar age,
const scalar mass0, const scalar mass0,
const scalar mass, const scalar mass,
const scalar T, const scalar T,

5
src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.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
@ -103,8 +103,9 @@ public:
//- Update model //- Update model
virtual void calculate virtual void calculate
( (
const typename CloudType::parcelType& p,
const typename CloudType::parcelType::trackingData& td,
const scalar dt, const scalar dt,
const scalar age,
const scalar mass0, const scalar mass0,
const scalar mass, const scalar mass,
const scalar T, const scalar T,

5
src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.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
@ -119,8 +119,9 @@ public:
//- Update model //- Update model
virtual void calculate virtual void calculate
( (
const typename CloudType::parcelType& p,
const typename CloudType::parcelType::trackingData& td,
const scalar dt, const scalar dt,
const scalar age,
const scalar mass0, const scalar mass0,
const scalar mass, const scalar mass,
const scalar T, const scalar T,

3
src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
View File

@ -60,7 +60,8 @@ Foam::NoDevolatilisation<CloudType>::~NoDevolatilisation()
template<class CloudType> template<class CloudType>
void Foam::NoDevolatilisation<CloudType>::calculate void Foam::NoDevolatilisation<CloudType>::calculate
( (
const scalar, const typename CloudType::parcelType&,
const typename CloudType::parcelType::trackingData&,
const scalar, const scalar,
const scalar, const scalar,
const scalar, const scalar,

3
src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
View File

@ -82,8 +82,9 @@ public:
//- Update model //- Update model
virtual void calculate virtual void calculate
( (
const typename CloudType::parcelType& p,
const typename CloudType::parcelType::trackingData& td,
const scalar dt, const scalar dt,
const scalar age,
const scalar mass0, const scalar mass0,
const scalar mass, const scalar mass,
const scalar T, const scalar T,

5
src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.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) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -82,8 +82,9 @@ Foam::SingleKineticRateDevolatilisation<CloudType>::
template<class CloudType> template<class CloudType>
void Foam::SingleKineticRateDevolatilisation<CloudType>::calculate void Foam::SingleKineticRateDevolatilisation<CloudType>::calculate
( (
const typename CloudType::parcelType& p,
const typename CloudType::parcelType::trackingData& td,
const scalar dt, const scalar dt,
const scalar age,
const scalar mass0, const scalar mass0,
const scalar mass, const scalar mass,
const scalar T, const scalar T,

5
src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.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
@ -214,8 +214,9 @@ public:
//- Update model //- Update model
virtual void calculate virtual void calculate
( (
const typename CloudType::parcelType& p,
const typename CloudType::parcelType::trackingData& td,
const scalar dt, const scalar dt,
const scalar age,
const scalar mass0, const scalar mass0,
const scalar mass, const scalar mass,
const scalar T, const scalar T,