From 040c1d727c22897798fe28d775cefeb5a546099f Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 15 Jun 2009 17:44:47 +0100
Subject: [PATCH] passing by reference instead of pointer
---
.../Templates/KinematicCloud/KinematicCloud.C | 6 +++---
.../Templates/KinematicCloud/KinematicCloud.H | 2 +-
.../Templates/ReactingCloud/ReactingCloud.C | 10 +++++-----
.../Templates/ReactingCloud/ReactingCloud.H | 2 +-
.../ReactingMultiphaseCloud.C | 16 ++++++++--------
.../ReactingMultiphaseCloud.H | 2 +-
.../clouds/Templates/ThermoCloud/ThermoCloud.C | 8 ++++----
.../clouds/Templates/ThermoCloud/ThermoCloud.H | 2 +-
.../InjectionModel/InjectionModel.C | 2 +-
9 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 2f96ae1418e..1a7ba970846 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -151,18 +151,18 @@ Foam::KinematicCloud<ParcelType>::~KinematicCloud()
template<class ParcelType>
void Foam::KinematicCloud<ParcelType>::checkParcelProperties
(
- ParcelType* pPtr,
+ ParcelType& parcel,
const scalar lagrangianDt,
const bool fullyDescribed
)
{
if (!fullyDescribed)
{
- pPtr->rho() = constProps_.rho0();
+ parcel.rho() = constProps_.rho0();
}
scalar carrierDt = this->db().time().deltaT().value();
- pPtr->stepFraction() = (carrierDt - lagrangianDt)/carrierDt;
+ parcel.stepFraction() = (carrierDt - lagrangianDt)/carrierDt;
}
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 2dcd277a1db..538975a912e 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -357,7 +357,7 @@ public:
//- Check parcel properties
void checkParcelProperties
(
- ParcelType* pPtr,
+ ParcelType& parcel,
const scalar lagrangianDt,
const bool fullyDescribed
);
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 88d5e8a8772..bebeab25a0d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -148,34 +148,34 @@ Foam::ReactingCloud<ParcelType>::~ReactingCloud()
template<class ParcelType>
void Foam::ReactingCloud<ParcelType>::checkParcelProperties
(
- ParcelType* pPtr,
+ ParcelType& parcel,
const scalar lagrangianDt,
const bool fullyDescribed
)
{
ThermoCloud<ParcelType>::checkParcelProperties
(
- pPtr,
+ parcel,
lagrangianDt,
fullyDescribed
);
if (!fullyDescribed)
{
- pPtr->Y() = composition().YMixture0();
+ parcel.Y() = composition().YMixture0();
}
else
{
checkSuppliedComposition
(
- pPtr->Y(),
+ parcel.Y(),
composition().YMixture0(),
"YMixture"
);
}
// derived information - store initial mass
- pPtr->mass0() = pPtr->mass();
+ parcel.mass0() = parcel.mass();
}
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index beeee65e6e8..da346d64ff9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -224,7 +224,7 @@ public:
//- Check parcel properties
void checkParcelProperties
(
- ParcelType* pPtr,
+ ParcelType& parcel,
const scalar lagrangianDt,
const bool fullyDescribed
);
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 379f12f341d..36521105b5d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -76,14 +76,14 @@ Foam::ReactingMultiphaseCloud<ParcelType>::~ReactingMultiphaseCloud()
template<class ParcelType>
void Foam::ReactingMultiphaseCloud<ParcelType>::checkParcelProperties
(
- ParcelType* pPtr,
+ ParcelType& parcel,
const scalar lagrangianDt,
const bool fullyDescribed
)
{
ReactingCloud<ParcelType>::checkParcelProperties
(
- pPtr,
+ parcel,
lagrangianDt,
fullyDescribed
);
@@ -94,27 +94,27 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::checkParcelProperties
if (!fullyDescribed)
{
- pPtr->YGas() = this->composition().Y0(idGas);
- pPtr->YLiquid() = this->composition().Y0(idLiquid);
- pPtr->YSolid() = this->composition().Y0(idSolid);
+ parcel.YGas() = this->composition().Y0(idGas);
+ parcel.YLiquid() = this->composition().Y0(idLiquid);
+ parcel.YSolid() = this->composition().Y0(idSolid);
}
else
{
this->checkSuppliedComposition
(
- pPtr->YGas(),
+ parcel.YGas(),
this->composition().Y0(idGas),
"YGas"
);
this->checkSuppliedComposition
(
- pPtr->YLiquid(),
+ parcel.YLiquid(),
this->composition().Y0(idLiquid),
"YLiquid"
);
this->checkSuppliedComposition
(
- pPtr->YSolid(),
+ parcel.YSolid(),
this->composition().Y0(idSolid),
"YSolid"
);
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 8a90d25ef75..e99375cf231 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -178,7 +178,7 @@ public:
//- Check parcel properties
void checkParcelProperties
(
- ParcelType* pPtr,
+ ParcelType& parcel,
const scalar lagrangianDt,
const bool fullyDescribed
);
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index bdde1bbdfe4..19428d38a19 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -113,22 +113,22 @@ Foam::ThermoCloud<ParcelType>::~ThermoCloud()
template<class ParcelType>
void Foam::ThermoCloud<ParcelType>::checkParcelProperties
(
- ParcelType* pPtr,
+ ParcelType& parcel,
const scalar lagrangianDt,
const bool fullyDescribed
)
{
KinematicCloud<ParcelType>::checkParcelProperties
(
- pPtr,
+ parcel,
lagrangianDt,
fullyDescribed
);
if (!fullyDescribed)
{
- pPtr->T() = constProps_.T0();
- pPtr->cp() = constProps_.cp0();
+ parcel.T() = constProps_.T0();
+ parcel.cp() = constProps_.cp0();
}
}
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 2660060baf2..aaebdff80ce 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -220,7 +220,7 @@ public:
//- Check parcel properties
void checkParcelProperties
(
- ParcelType* pPtr,
+ ParcelType& parcel,
const scalar lagrangianDt,
const bool fullyDescribed
);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index abbba2698d0..c102d87a3d7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -401,7 +401,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
setProperties(parcelI, newParcels, timeInj, *pPtr);
// Check new parcel properties
- td.cloud().checkParcelProperties(pPtr, dt, fullyDescribed());
+ td.cloud().checkParcelProperties(*pPtr, dt, fullyDescribed());
// Apply correction to velocity for 2-D cases
meshTools::constrainDirection
--
GitLab