Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry Weller
2019-08-09 16:57:16 +01:00

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -200,6 +200,13 @@ void Foam::MPPICCloud<CloudType>::motion
if (dampingModel_->active())
{
if (this->mesh().moving())
{
FatalErrorInFunction
<< "MPPIC damping modelling does not support moving meshes."
<< exit(FatalError);
}
// update averages
td.updateAverages(cloud);
@ -224,6 +231,13 @@ void Foam::MPPICCloud<CloudType>::motion
if (packingModel_->active())
{
if (this->mesh().moving())
{
FatalErrorInFunction
<< "MPPIC packing modelling does not support moving meshes."
<< exit(FatalError);
}
// same procedure as for damping
td.updateAverages(cloud);
packingModel_->cacheFields(true);