From 0d7916746ab834af414d6ed6f71a81882eceb76a Mon Sep 17 00:00:00 2001 From: Thomas Lichtenegger Date: Tue, 22 May 2018 15:23:35 +0200 Subject: [PATCH] Added return NULL to silence compiler. --- .../ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.C | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.C b/src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.C index e7647b7a..7e4ca613 100644 --- a/src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.C +++ b/src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.C @@ -181,6 +181,7 @@ tmp ZehnerSchluenderThermCond::thermCond() const tmp ZehnerSchluenderThermCond::thermDiff() const { FatalError << "ZehnerSchluenderThermCond does not provide thermal diffusivity." << abort(FatalError); + return tmp(NULL); } void ZehnerSchluenderThermCond::calcPartKsField() const