zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Henry Weller
2018-06-08 23:02:33 +01:00
parent 8ab5b6152e 50a965f886
commit 338af65685
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
View File

@ -25,11 +25,9 @@ Application
chtMultiRegionFoam
Description
Transient solver for buoyant, turbulent fluid flow and solid heat
conduction with conjugate heat transfer between solid and fluid regions.
It handles secondary fluid or solid circuits which can be coupled
thermally with the main fluid region. i.e radiators, etc.
Solver for steady or transient fluid flow and solid heat conduction, with
conjugate heat transfer between regions, buoyancy effects, turbulence,
reactions and radiation modelling.
\*---------------------------------------------------------------------------*/

12
src/lagrangian/basic/particle/particle.C
View File

@ -390,24 +390,23 @@ void Foam::particle::locate
(
const vector& position,
const vector* direction,
const label celli,
label celli,
const bool boundaryFail,
const string boundaryMsg
)
{
celli_ = celli;
// Find the cell, if it has not been given
if (celli_ < 0)
if (celli < 0)
{
celli_ = mesh_.cellTree().findInside(position);
celli = mesh_.cellTree().findInside(position);
}
if (celli_ < 0)
if (celli < 0)
{
FatalErrorInFunction
<< "Cell not found for particle position " << position << "."
<< exit(FatalError);
}
celli_ = celli;
// Track from the centre of the cell to the desired position
const vector displacement = position - mesh_.cellCentres()[celli_];
@ -479,6 +478,7 @@ void Foam::particle::locate
const vector sT = displacement - sN;
coordinates_ = barycentric(1, 0, 0, 0);
celli_ = celli;
tetFacei_ = minTetFacei;
tetPti_ = minTetPti;
facei_ = -1;

2
src/lagrangian/basic/particle/particle.H
View File

@ -275,7 +275,7 @@ private:
(
const vector& position,
const vector* direction,
const label celli,
label celli,
const bool boundaryFail,
const string boundaryMsg
);