openfoam/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant
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
..
additionalControls STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00
boundaryRadiationProperties ENH: Adding solar radiation modelling and tutorial changes 2015-11-02 11:54:27 -08:00
chemistryProperties STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00
combustionProperties STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00
g STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00
hRef GIT: Resolved conflict 2015-12-09 16:19:28 +00:00
pyrolysisZones STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00
radiationProperties Merge branch 'develop' into radiation 2015-12-11 09:50:43 +00:00
reactingCloud1Properties STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00
reactions ENH: Adding diffusionMulticomponent combustion model. 2015-12-07 17:02:18 -08:00
reactions.twoSteps ENH: Adding diffusionMulticomponent combustion model. 2015-12-07 17:02:18 -08:00
surfaceFilmProperties STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00
thermo.compressibleGas STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00
thermophysicalProperties STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00
thermophysicalProperties.twoSteps STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00
turbulenceProperties STYLE: Updated links from openfoam.org to openfoam.com 2015-12-09 15:03:05 +00:00