From bb8f7a286cafed6a46589e1c5e12baa29fd71ef8 Mon Sep 17 00:00:00 2001 From: andy <a.heather@opencfd.co.uk> Date: Fri, 22 May 2009 14:30:55 +0100 Subject: [PATCH] added function bodies for copy constructors --- src/lagrangian/basic/Particle/Particle.C | 11 ++++++++++ .../KinematicParcel/KinematicParcel.C | 22 +++++++++++++++++++ .../ReactingMultiphaseParcel.C | 15 +++++++++++++ .../Templates/ReactingParcel/ReactingParcel.C | 15 +++++++++++++ .../Templates/ThermoParcel/ThermoParcel.C | 16 ++++++++++++++ 5 files changed, 79 insertions(+) diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C index 6c8cbe4aa10..099c8cde01a 100644 --- a/src/lagrangian/basic/Particle/Particle.C +++ b/src/lagrangian/basic/Particle/Particle.C @@ -186,6 +186,17 @@ Foam::Particle<ParticleType>::Particle {} +template<class ParticleType> +Foam::Particle<ParticleType>::Particle(const Particle<ParticleType>& p) +: + cloud_(p.cloud_), + position_(p.position_), + celli_(p.celli_), + facei_(p.facei_), + stepFraction_(p.stepFraction_) +{} + + // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template<class ParticleType> diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C index cdc7e5e3b0d..cb18c182aec 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C @@ -167,6 +167,28 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity } +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template <class ParcelType> +Foam::KinematicParcel<ParcelType>::KinematicParcel +( + const KinematicParcel<ParcelType>& p +) +: + Particle<ParcelType>(p), + typeId_(p.typeId_), + nParticle_(p.nParticle_), + d_(p.d_), + U_(p.U_), + rho_(p.rho_), + tTurb_(p.tTurb_), + UTurb_(p.UTurb_), + rhoc_(p.rhoc_), + Uc_(p.Uc_), + muc_(p.muc_) +{} + + // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template<class ParcelType> diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C index e5d8e25d5f2..6b9b214a5a0 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C @@ -546,6 +546,21 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions } +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template <class ParcelType> +Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel +( + const ReactingMultiphaseParcel<ParcelType>& p +) +: + ReactingParcel<ParcelType>(p), + YGas_(p.YGas_), + YLiquid_(p.YLiquid_), + YSolid_(p.YSolid_) +{} + + // * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * // #include "ReactingMultiphaseParcelIO.C" diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index 39658fcf2f8..a1f58cc2236 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -298,6 +298,21 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange } +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template <class ParcelType> +Foam::ReactingParcel<ParcelType>::ReactingParcel +( + const ReactingParcel<ParcelType>& p +) +: + ThermoParcel<ParcelType>(p), + mass0_(p.mass0_), + Y_(p.Y_), + pc_(p.pc_) +{} + + // * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * // #include "ReactingParcelIO.C" diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C index 5885512511a..b2b444a888b 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C @@ -205,6 +205,22 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer } +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template <class ParcelType> +Foam::ThermoParcel<ParcelType>::ThermoParcel +( + const ThermoParcel<ParcelType>& p +) +: + KinematicParcel<ParcelType>(p), + T_(p.T_), + cp_(p.cp_), + Tc_(p.Tc_), + cpc_(p.cpc_) +{} + + // * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * // #include "ThermoParcelIO.C" -- GitLab