mirror of
https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git
synced 2025-12-08 06:37:44 +00:00
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
This commit is contained in:
@ -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
|
||||
|
||||
@ -180,14 +180,14 @@ protected:
|
||||
|
||||
const turbulenceModel& turbulence_;
|
||||
|
||||
autoPtr<dataExchangeModel> dataExchangeModel_;
|
||||
|
||||
PtrList<forceModel> forceModel_;
|
||||
|
||||
autoPtr<locateModel> locateModel_;
|
||||
|
||||
PtrList<momCoupleModel> momCoupleModel_;
|
||||
|
||||
autoPtr<dataExchangeModel> dataExchangeModel_;
|
||||
|
||||
autoPtr<IOModel> IOModel_;
|
||||
|
||||
autoPtr<probeModel> probeModel_;
|
||||
|
||||
Reference in New Issue
Block a user