zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into radiation

Browse Source 
Conflicts:
	applications/utilities/preProcessing/viewFactorsGen/shootRays.H
	src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
	src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
	src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
	src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
	src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
	tutorials/mesh/parallel/filter/0.org/T
This commit is contained in:
mattijs
2015-12-11 09:50:43 +00:00
parent 8b285d42f2 396169c108
commit 92b5ee3487
6811 changed files with 211130 additions and 50126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/preProcessing/viewFactorsGen/shootRays.H
View File

@ -60,10 +60,8 @@ for (label procI = 0; procI < Pstream::nProcs(); procI++)
endAgg.append(globalNumbering.toGlobal(procI, remAgg));
if (startIndex.size() > maxDynListLength)
{
FatalErrorIn
(
"shootRays"
) << "Dynamic list need from capacity."
FatalErrorInFunction
<< "Dynamic list need from capacity."
<< "Actual size maxDynListLength : "
<< maxDynListLength
<< abort(FatalError);
@ -89,8 +87,8 @@ for (label procI = 0; procI < Pstream::nProcs(); procI++)
DynamicList<label> dRayIs;
// Collect the rays which has not obstacle in bettween in rayStartFace
// and rayEndFace. If the ray hit itself get stored in dRayIs
// Collect the rays which have no obstacle in between rayStartFace
// and rayEndFace. If the ray hit itself, it gets stored in dRayIs
forAll(hitInfo, rayI)
{
if (!hitInfo[rayI].hit())