diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index c58eadb06..fc5d6a246 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -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. \*---------------------------------------------------------------------------*/ diff --git a/src/lagrangian/basic/particle/particle.C b/src/lagrangian/basic/particle/particle.C index 5e87f0ffd..36a70b92b 100644 --- a/src/lagrangian/basic/particle/particle.C +++ b/src/lagrangian/basic/particle/particle.C @@ -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; diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H index 4ad86711f..20fa4a211 100644 --- a/src/lagrangian/basic/particle/particle.H +++ b/src/lagrangian/basic/particle/particle.H @@ -275,7 +275,7 @@ private: ( const vector& position, const vector* direction, - const label celli, + label celli, const bool boundaryFail, const string boundaryMsg );