zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

consistency update IntegrationResult->integrationResult

Browse Source
This commit is contained in:
andy
2008-08-19 18:05:46 +01:00
parent 839ea2c7cb
commit 53133e9c86
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C
View File

@ -50,7 +50,7 @@ Foam::Analytical<Type>::~Analytical()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type> template<class Type>
typename Foam::IntegrationScheme<Type>::IntegrationResult typename Foam::IntegrationScheme<Type>::integrationResult
Foam::Analytical<Type>::integrate Foam::Analytical<Type>::integrate
( (
const Type phi, const Type phi,
@ -59,7 +59,7 @@ Foam::Analytical<Type>::integrate
const scalar beta const scalar beta
) const ) const
{ {
typename IntegrationScheme<Type>::IntegrationResult retValue; typename IntegrationScheme<Type>::integrationResult retValue;
retValue.average() = alpha + (phi - alpha)*(1 - exp(-beta*dt))/(beta*dt); retValue.average() = alpha + (phi - alpha)*(1 - exp(-beta*dt))/(beta*dt);
retValue.value() = alpha + (phi - alpha)*exp(-beta*dt); retValue.value() = alpha + (phi - alpha)*exp(-beta*dt);

2
src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
View File

@ -74,7 +74,7 @@ public:
// Member Functions // Member Functions
//- Perform the integration //- Perform the integration
virtual typename IntegrationScheme<Type>::IntegrationResult integrate virtual typename IntegrationScheme<Type>::integrationResult integrate
( (
const Type phi, const Type phi,
const scalar dt, const scalar dt,

4
src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C
View File

@ -50,7 +50,7 @@ Foam::Euler<Type>::~Euler()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type> template<class Type>
typename Foam::IntegrationScheme<Type>::IntegrationResult typename Foam::IntegrationScheme<Type>::integrationResult
Foam::Euler<Type>::integrate Foam::Euler<Type>::integrate
( (
const Type phi, const Type phi,
@ -59,7 +59,7 @@ Foam::Euler<Type>::integrate
const scalar beta const scalar beta
) const ) const
{ {
typename IntegrationScheme<Type>::IntegrationResult retValue; typename IntegrationScheme<Type>::integrationResult retValue;
retValue.value() = (phi + beta*dt*alpha)/(1.0 + beta*dt); retValue.value() = (phi + beta*dt*alpha)/(1.0 + beta*dt);
retValue.average() = 0.5*(phi + retValue.value()); retValue.average() = 0.5*(phi + retValue.value());

2
src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
View File

@ -74,7 +74,7 @@ public:
// Member Functions // Member Functions
//- Perform the integration //- Perform the integration
virtual typename IntegrationScheme<Type>::IntegrationResult integrate virtual typename IntegrationScheme<Type>::integrationResult integrate
( (
const Type phi, const Type phi,
const scalar dt, const scalar dt,

6
src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
View File

@ -57,7 +57,7 @@ class IntegrationScheme
public: public:
//- Helper class to supply results of integration //- Helper class to supply results of integration
class IntegrationResult class integrationResult
{ {
//- Integration value //- Integration value
Type value_; Type value_;
@ -69,7 +69,7 @@ public:
public: public:
//- Constructor //- Constructor
IntegrationResult() integrationResult()
: :
value_(pTraits<Type>::zero), value_(pTraits<Type>::zero),
average_(pTraits<Type>::zero) average_(pTraits<Type>::zero)
@ -177,7 +177,7 @@ public:
// Member Functions // Member Functions
//- Perform the Integration //- Perform the Integration
virtual IntegrationResult integrate virtual integrationResult integrate
( (
const Type phi, const Type phi,
const scalar dt, const scalar dt,

2
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
View File

@ -204,7 +204,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Integrate to find the new parcel temperature // Integrate to find the new parcel temperature
IntegrationScheme<scalar>::IntegrationResult Tres = IntegrationScheme<scalar>::integrationResult Tres =
td.cloud().TIntegrator().integrate(T_, dt, ap, bp); td.cloud().TIntegrator().integrate(T_, dt, ap, bp);
// Using average parcel temperature for enthalpy transfer calculation // Using average parcel temperature for enthalpy transfer calculation