From ba9f28a5ff8495d77d4e07a9941b64e86bc0df50 Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 8 Oct 2018 15:40:35 +0200 Subject: [PATCH] fix order of construction / destruction dataExchangeModel is needed by the destructor of several models, thus should be destroyed last and in further consequence must be constructed first --- .../cfdemParticle/cfdemCloud/cfdemCloud.C | 16 ++++++++-------- .../cfdemParticle/cfdemCloud/cfdemCloud.H | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C index 4df83c86..2f382f19 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C @@ -155,6 +155,14 @@ cfdemCloud::cfdemCloud turbulenceModelType_ ) ), + dataExchangeModel_ + ( + dataExchangeModel::New + ( + couplingProperties_, + *this + ) + ), forceModel_(nrForceModels()), locateModel_ ( @@ -165,14 +173,6 @@ cfdemCloud::cfdemCloud ) ), momCoupleModel_(nrMomCoupleModels()), - dataExchangeModel_ - ( - dataExchangeModel::New - ( - couplingProperties_, - *this - ) - ), IOModel_ ( IOModel::New diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index 5b585395..ab0b76fd 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H @@ -180,14 +180,14 @@ protected: const turbulenceModel& turbulence_; + autoPtr dataExchangeModel_; + PtrList forceModel_; autoPtr locateModel_; PtrList momCoupleModel_; - autoPtr dataExchangeModel_; - autoPtr IOModel_; autoPtr probeModel_;