what has been allocated must be destroyed

new - delete
malloc - free
allocateArray - destroy
Programming 101: Don't mix them!
This commit is contained in:
danielque
2017-05-11 18:00:54 +02:00
parent e265039fed
commit dd54ca1bba
10 changed files with 20 additions and 20 deletions

View File

@ -147,11 +147,11 @@ species::species
species::~species() species::~species()
{ {
delete partTemp_; particleCloud_.dataExchangeM().destroy(partTemp_,1);
delete partRho_; particleCloud_.dataExchangeM().destroy(partRho_,1);
for (int i=0; i<speciesNames_.size();i++) delete [] concentrations_[i]; for (int i=0; i<speciesNames_.size();i++) particleCloud_.dataExchangeM().destroy(concentrations_[i],1);
for (int i=0; i<speciesNames_.size();i++) delete [] changeOfSpeciesMass_[i]; for (int i=0; i<speciesNames_.size();i++) particleCloud_.dataExchangeM().destroy(changeOfSpeciesMass_[i],1);
} }

View File

@ -155,10 +155,10 @@ heatTransferGunn::heatTransferGunn
heatTransferGunn::~heatTransferGunn() heatTransferGunn::~heatTransferGunn()
{ {
delete partTemp_; particleCloud_.dataExchangeM().destroy(partTemp_,1);
delete partHeatFlux_; particleCloud_.dataExchangeM().destroy(partHeatFlux_,1);
delete partRe_; particleCloud_.dataExchangeM().destroy(partRe_,1);
delete partNu_; particleCloud_.dataExchangeM().destroy(partNu_,1);
} }
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //

View File

@ -68,7 +68,7 @@ heatTransferGunnImplicit::heatTransferGunnImplicit
heatTransferGunnImplicit::~heatTransferGunnImplicit() heatTransferGunnImplicit::~heatTransferGunnImplicit()
{ {
delete partHeatFluxCoeff_; particleCloud_.dataExchangeM().destroy(partHeatFluxCoeff_,1);
} }
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //

View File

@ -77,7 +77,7 @@ reactionHeat::reactionHeat
reactionHeat::~reactionHeat() reactionHeat::~reactionHeat()
{ {
delete reactionHeat_; particleCloud_.dataExchangeM().destroy(reactionHeat_,1);
} }
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //

View File

@ -120,8 +120,8 @@ KochHillRWDrag::KochHillRWDrag
KochHillRWDrag::~KochHillRWDrag() KochHillRWDrag::~KochHillRWDrag()
{ {
delete partTime_; particleCloud_.dataExchangeM().destroy(partTime_, 1);
delete partUfluct_; particleCloud_.dataExchangeM().destroy(partUfluct_, 3);
} }
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //

View File

@ -105,8 +105,8 @@ LaEuScalarTemp::LaEuScalarTemp
LaEuScalarTemp::~LaEuScalarTemp() LaEuScalarTemp::~LaEuScalarTemp()
{ {
delete partTemp_; particleCloud_.dataExchangeM().destroy(partTemp_,1);
delete partHeatFlux_; particleCloud_.dataExchangeM().destroy(partHeatFlux_,1);
} }
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //

View File

@ -113,8 +113,8 @@ dSauter::dSauter
dSauter::~dSauter() dSauter::~dSauter()
{ {
delete d2_; particleCloud_.dataExchangeM().destroy(d2_,1);
delete d3_; particleCloud_.dataExchangeM().destroy(d3_,1);
} }
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //

View File

@ -82,7 +82,7 @@ granKineticEnergy::granKineticEnergy
granKineticEnergy::~granKineticEnergy() granKineticEnergy::~granKineticEnergy()
{ {
delete vfluc_; particleCloud_.dataExchangeM().destroy(vfluc_,1);
} }
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //

View File

@ -119,7 +119,7 @@ virtualMassForce::virtualMassForce
virtualMassForce::~virtualMassForce() virtualMassForce::~virtualMassForce()
{ {
delete UrelOld_; particleCloud_.dataExchangeM().destroy(UrelOld_,3);
} }

View File

@ -83,8 +83,8 @@ regionModel::regionModel
regionModel::~regionModel() regionModel::~regionModel()
{ {
free(inRegion_); particleCloud_.dataExchangeM().destroy(inRegion_,1);
free(outRegion_); particleCloud_.dataExchangeM().destroy(outRegion_,1);
} }