From d21657c064af8503a1743818dae81c8ad3be82fc Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 15 Feb 2011 09:51:40 +0000
Subject: [PATCH] ENH: Updated cloud reset functions

---
 .../clouds/Templates/KinematicCloud/KinematicCloud.C | 12 ++++++------
 .../clouds/Templates/ReactingCloud/ReactingCloud.C   |  4 ++--
 .../ReactingMultiphaseCloud.C                        |  4 ++--
 .../clouds/Templates/ThermoCloud/ThermoCloud.C       |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 1c43f9e025..bc45544ad8 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -480,13 +480,13 @@ void Foam::KinematicCloud<ParcelType>::cloudReset(KinematicCloud<ParcelType>& c)
 
     forces_.transfer(c.forces_);
 
-    collisionModel_ = c.collisionModel_->clone();
-    dispersionModel_= c.dispersionModel_->clone();
-    injectionModel_ = c.injectionModel_->clone();
-    patchInteractionModel_ = c.patchInteractionModel_->clone();
-    postProcessingModel_ = c.postProcessingModel_->clone();
+    collisionModel_.reset(c.collisionModel_.ptr());
+    dispersionModel_.reset(c.dispersionModel_.ptr());
+    injectionModel_.reset(c.injectionModel_.ptr());
+    patchInteractionModel_.reset(c.patchInteractionModel_.ptr());
+    postProcessingModel_.reset(c.postProcessingModel_.ptr());
 
-    UIntegrator_ = c.UIntegrator_->clone();
+    UIntegrator_.reset(c.UIntegrator_.ptr());
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index a8bb92cb5a..e2d0d96fe2 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -85,8 +85,8 @@ void Foam::ReactingCloud<ParcelType>::cloudReset(ReactingCloud<ParcelType>& c)
 {
     ThermoCloud<ParcelType>::cloudReset(c);
 
-    compositionModel_ = c.compositionModel_->clone();
-    phaseChangeModel_ = c.phaseChangeModel_->clone();
+    compositionModel_.reset(c.compositionModel_.ptr());
+    phaseChangeModel_.reset(c.phaseChangeModel_.ptr());
 
     dMassPhaseChange_ = c.dMassPhaseChange_;
 }
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 06dc0c339b..7cd42b7355 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -61,8 +61,8 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::cloudReset
 {
     ReactingCloud<ParcelType>::cloudReset(c);
 
-    devolatilisationModel_ = c.devolatilisationModel_->clone();
-    surfaceReactionModel_ = c.surfaceReactionModel_->clone();
+    devolatilisationModel_.reset(c.devolatilisationModel_.ptr());
+    surfaceReactionModel_.reset(c.surfaceReactionModel_.ptr());
 
     dMassDevolatilisation_ = c.dMassDevolatilisation_;
     dMassSurfaceReaction_ = c.dMassSurfaceReaction_;
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index ae26e7999d..3224a8797c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -60,8 +60,8 @@ void Foam::ThermoCloud<ParcelType>::cloudReset(ThermoCloud<ParcelType>& c)
 {
     KinematicCloud<ParcelType>::cloudReset(c);
 
-    heatTransferModel_ = c.heatTransferModel_->clone();
-    TIntegrator_ = c.TIntegrator_->clone();
+    heatTransferModel_.reset(c.heatTransferModel_.ptr());
+    TIntegrator_.reset(c.TIntegrator_.ptr());
 
     radiation_ = c.radiation_;
 }