songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9cad906403
openfoam/tutorials/combustion/fireFoam/les/smallPoolFire2D
History
mattijs 92b5ee3487 Merge branch 'develop' into radiation 
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
2015-12-11 09:50:43 +00:00
..
0 Merge branch 'develop' into radiation 2015-12-11 09:50:43 +00:00
constant Merge branch 'develop' into radiation 2015-12-11 09:50:43 +00:00
system GIT: Resolved conflict 2015-12-09 16:19:28 +00:00
Allrun Minor change to comment 2014-12-14 21:50:14 +00:00