songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
b90cd04ce7
openfoam/applications/utilities/preProcessing
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
..
applyBoundaryLayer GIT: Resolved conflict 2015-12-09 09:32:38 +00:00
boxTurb ENH: Updating utilities based on internal development line 2015-12-02 10:17:28 +00:00
changeDictionary GIT: Resolved conflict 2015-12-09 16:19:28 +00:00
createExternalCoupledPatchGeometry applications: Added fvOptions library to link 2015-12-01 16:09:19 +00:00
createZeroDirectory ENH: Updated Info, Warning and Error messages 2015-12-08 11:15:39 +00:00
dsmcInitialise applications: Update ...ErrorIn -> ...ErrorInFunction 2015-11-10 17:53:31 +00:00
engineSwirl ENH: Updating utilities based on internal development line 2015-12-02 10:17:28 +00:00
faceAgglomerate GIT: Resolved conflict 2015-12-09 16:19:28 +00:00
foamUpgradeCyclics Formatting: Rationalized the indentation of #include 2015-02-10 20:35:50 +00:00
mapFields GIT: Resolved conflict 2015-12-09 16:19:28 +00:00
mapFieldsPar GIT: Resolved conflict 2015-12-09 16:19:28 +00:00
mdInitialise applications: Update ...ErrorIn -> ...ErrorInFunction 2015-11-10 17:53:31 +00:00
setFields GIT: Resolved conflict 2015-12-09 16:19:28 +00:00
viewFactorsGen Merge branch 'develop' into radiation 2015-12-11 09:50:43 +00:00
wallFunctionTable GIT: Resolved conflict 2015-12-09 16:19:28 +00:00