MRG: Resolve conflict with latest foundation merge

This commit is contained in:
Andrew Heather
2016-10-26 15:37:15 +01:00
243 changed files with 11116 additions and 28853 deletions

View File

@ -46,7 +46,7 @@ Foam::scalar Foam::solidRegionDiffNo
/ fvc::interpolate(Cprho)
);
DiNum = gMax(kapparhoCpbyDelta.primitiveField())*runTime.deltaT().value();
DiNum = max(kapparhoCpbyDelta).value()*runTime.deltaT().value();
meanDiNum = (average(kapparhoCpbyDelta)).value()*runTime.deltaT().value();