From a2f9772ce3389c978b17fc27426612f2729d0bc7 Mon Sep 17 00:00:00 2001 From: danielque Date: Wed, 1 Dec 2021 14:50:37 +0100 Subject: [PATCH] allow omission of diffCoeffModel in couplingProperties dict if 'diffCoeffModel' is not defined in couplingProperties, create an instance of noDiffCoeff ("off") and also do not try to read 'D' from transportProperties dict --- .../subModels/diffCoeffModel/diffCoeffModel/diffCoeffModel.C | 2 +- .../subModels/diffCoeffModel/diffCoeffModel/newDiffCoeffModel.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/cfdemParticle/subModels/diffCoeffModel/diffCoeffModel/diffCoeffModel.C b/src/lagrangian/cfdemParticle/subModels/diffCoeffModel/diffCoeffModel/diffCoeffModel.C index f216bc41..46ff5da2 100644 --- a/src/lagrangian/cfdemParticle/subModels/diffCoeffModel/diffCoeffModel/diffCoeffModel.C +++ b/src/lagrangian/cfdemParticle/subModels/diffCoeffModel/diffCoeffModel/diffCoeffModel.C @@ -73,7 +73,7 @@ diffCoeffModel::diffCoeffModel ) { // build constant fields for single phase case - if (!particleCloud_.multiphase()) + if (!particleCloud_.multiphase() && dict_.found("diffCoeffModel")) { D0Field_ = volScalarField ( diff --git a/src/lagrangian/cfdemParticle/subModels/diffCoeffModel/diffCoeffModel/newDiffCoeffModel.C b/src/lagrangian/cfdemParticle/subModels/diffCoeffModel/diffCoeffModel/newDiffCoeffModel.C index cb27e7e7..0102c59a 100644 --- a/src/lagrangian/cfdemParticle/subModels/diffCoeffModel/diffCoeffModel/newDiffCoeffModel.C +++ b/src/lagrangian/cfdemParticle/subModels/diffCoeffModel/diffCoeffModel/newDiffCoeffModel.C @@ -37,7 +37,7 @@ autoPtr diffCoeffModel::New { word diffCoeffModelType ( - dict.lookup("diffCoeffModel") + dict.lookupOrDefault("diffCoeffModel","off") ); Info<< "Selecting diffCoeffModel "