From dd54ca1bbae9fb6ac65ff10da9e295097fe554ed Mon Sep 17 00:00:00 2001
From: danielque <daniel.queteschiner@jku.at>
Date: Thu, 11 May 2017 18:00:54 +0200
Subject: [PATCH] what has been allocated must be destroyed

new - delete
malloc - free
allocateArray - destroy
Programming 101: Don't mix them!
---
 .../subModels/chemistryModel/species/species.C            | 8 ++++----
 .../energyModel/heatTransferGunn/heatTransferGunn.C       | 8 ++++----
 .../heatTransferGunnImplicit/heatTransferGunnImplicit.C   | 2 +-
 .../subModels/energyModel/reactionHeat/reactionHeat.C     | 2 +-
 .../subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C  | 4 ++--
 .../subModels/forceModel/LaEuScalarTemp/LaEuScalarTemp.C  | 4 ++--
 .../cfdemParticle/subModels/forceModel/dSauter/dSauter.C  | 4 ++--
 .../forceModel/granKineticEnergy/granKineticEnergy.C      | 2 +-
 .../forceModel/virtualMassForce/virtualMassForce.C        | 2 +-
 .../subModels/regionModel/regionModel/regionModel.C       | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C
index fc27c319..9a869b54 100644
--- a/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C
+++ b/src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C
@@ -147,11 +147,11 @@ species::species
 
 species::~species()
 {
-    delete partTemp_;
-    delete partRho_;
+    particleCloud_.dataExchangeM().destroy(partTemp_,1);
+    particleCloud_.dataExchangeM().destroy(partRho_,1);
 
-    for (int i=0; i<speciesNames_.size();i++) delete [] concentrations_[i];
-    for (int i=0; i<speciesNames_.size();i++) delete [] changeOfSpeciesMass_[i];
+    for (int i=0; i<speciesNames_.size();i++) particleCloud_.dataExchangeM().destroy(concentrations_[i],1);
+    for (int i=0; i<speciesNames_.size();i++) particleCloud_.dataExchangeM().destroy(changeOfSpeciesMass_[i],1);
 
 }
 
diff --git a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
index 4959ca76..8cf09e07 100644
--- a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
+++ b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
@@ -155,10 +155,10 @@ heatTransferGunn::heatTransferGunn
 
 heatTransferGunn::~heatTransferGunn()
 {
-    delete partTemp_;
-    delete partHeatFlux_;
-    delete partRe_;
-    delete partNu_;
+    particleCloud_.dataExchangeM().destroy(partTemp_,1);
+    particleCloud_.dataExchangeM().destroy(partHeatFlux_,1);
+    particleCloud_.dataExchangeM().destroy(partRe_,1);
+    particleCloud_.dataExchangeM().destroy(partNu_,1);
 }
 
 // * * * * * * * * * * * * * * * private Member Functions  * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunnImplicit/heatTransferGunnImplicit.C b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunnImplicit/heatTransferGunnImplicit.C
index a204f6ca..832f7365 100644
--- a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunnImplicit/heatTransferGunnImplicit.C
+++ b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunnImplicit/heatTransferGunnImplicit.C
@@ -68,7 +68,7 @@ heatTransferGunnImplicit::heatTransferGunnImplicit
 
 heatTransferGunnImplicit::~heatTransferGunnImplicit()
 {
-    delete partHeatFluxCoeff_;
+    particleCloud_.dataExchangeM().destroy(partHeatFluxCoeff_,1);
 }
 
 // * * * * * * * * * * * * * * * private Member Functions  * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/energyModel/reactionHeat/reactionHeat.C b/src/lagrangian/cfdemParticle/subModels/energyModel/reactionHeat/reactionHeat.C
index a3cf1635..5ca1c6c6 100644
--- a/src/lagrangian/cfdemParticle/subModels/energyModel/reactionHeat/reactionHeat.C
+++ b/src/lagrangian/cfdemParticle/subModels/energyModel/reactionHeat/reactionHeat.C
@@ -77,7 +77,7 @@ reactionHeat::reactionHeat
 
 reactionHeat::~reactionHeat()
 {
-    delete reactionHeat_;
+    particleCloud_.dataExchangeM().destroy(reactionHeat_,1);
 }
 
 // * * * * * * * * * * * * * * * private Member Functions  * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C
index 083ae54d..26cb36e8 100755
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C
@@ -120,8 +120,8 @@ KochHillRWDrag::KochHillRWDrag
 
 KochHillRWDrag::~KochHillRWDrag()
 {
-    delete partTime_;
-    delete partUfluct_;
+    particleCloud_.dataExchangeM().destroy(partTime_, 1);
+    particleCloud_.dataExchangeM().destroy(partUfluct_, 3);
 }
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/LaEuScalarTemp/LaEuScalarTemp.C b/src/lagrangian/cfdemParticle/subModels/forceModel/LaEuScalarTemp/LaEuScalarTemp.C
index 09cb8c46..aaae4b04 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/LaEuScalarTemp/LaEuScalarTemp.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/LaEuScalarTemp/LaEuScalarTemp.C
@@ -105,8 +105,8 @@ LaEuScalarTemp::LaEuScalarTemp
 
 LaEuScalarTemp::~LaEuScalarTemp()
 {
-    delete partTemp_;
-    delete partHeatFlux_;
+    particleCloud_.dataExchangeM().destroy(partTemp_,1);
+    particleCloud_.dataExchangeM().destroy(partHeatFlux_,1);
 }
 
 // * * * * * * * * * * * * * * * private Member Functions  * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/dSauter/dSauter.C b/src/lagrangian/cfdemParticle/subModels/forceModel/dSauter/dSauter.C
index 0ccdfc56..7f91b8f3 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/dSauter/dSauter.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/dSauter/dSauter.C
@@ -113,8 +113,8 @@ dSauter::dSauter
 
 dSauter::~dSauter()
 {
-    delete d2_;
-    delete d3_;
+    particleCloud_.dataExchangeM().destroy(d2_,1);
+    particleCloud_.dataExchangeM().destroy(d3_,1);
 }
 
 // * * * * * * * * * * * * * * * private Member Functions  * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/granKineticEnergy/granKineticEnergy.C b/src/lagrangian/cfdemParticle/subModels/forceModel/granKineticEnergy/granKineticEnergy.C
index 350b20cb..6f6f1aa7 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/granKineticEnergy/granKineticEnergy.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/granKineticEnergy/granKineticEnergy.C
@@ -82,7 +82,7 @@ granKineticEnergy::granKineticEnergy
 
 granKineticEnergy::~granKineticEnergy()
 {
-    delete vfluc_;
+    particleCloud_.dataExchangeM().destroy(vfluc_,1);
 }
 
 // * * * * * * * * * * * * * * * private Member Functions  * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.C b/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.C
index 5443d948..94c3a886 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.C
@@ -119,7 +119,7 @@ virtualMassForce::virtualMassForce
 
 virtualMassForce::~virtualMassForce()
 {
-    delete UrelOld_;
+    particleCloud_.dataExchangeM().destroy(UrelOld_,3);
 }
 
 
diff --git a/src/lagrangian/cfdemParticle/subModels/regionModel/regionModel/regionModel.C b/src/lagrangian/cfdemParticle/subModels/regionModel/regionModel/regionModel.C
index 63b37478..b1770d07 100644
--- a/src/lagrangian/cfdemParticle/subModels/regionModel/regionModel/regionModel.C
+++ b/src/lagrangian/cfdemParticle/subModels/regionModel/regionModel/regionModel.C
@@ -83,8 +83,8 @@ regionModel::regionModel
 
 regionModel::~regionModel()
 {
-    free(inRegion_);
-    free(outRegion_);
+    particleCloud_.dataExchangeM().destroy(inRegion_,1);
+    particleCloud_.dataExchangeM().destroy(outRegion_,1);
 }