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

..

combustionModels

GIT: Resolved conflict

2015-12-09 09:32:38 +00:00

conversion

GIT: Resolved conflict

2015-12-09 16:19:28 +00:00

dummyThirdParty

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

dynamicFvMesh

BUG: dynamic refinement: unrefinement was not looking at protectedCell

2015-12-09 17:05:30 +00:00

dynamicMesh

ENH: Updated Info, Warning and Error messages

2015-12-08 11:15:39 +00:00

edgeMesh

ENH: Updated Info, Warning and Error messages

2015-12-08 11:15:39 +00:00

engine

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

fileFormats

GIT: Resolve conflict with upstream merge from Foundation

2015-12-07 17:07:20 +00:00

finiteVolume

GIT: Resolved conflict

2015-12-09 09:32:38 +00:00

fvAgglomerationMethods

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

fvMotionSolver

ENH: Updated notImplemented(...)->NotImplemented messages

2015-12-08 22:56:15 +00:00

fvOptions

ENH: Updated notImplemented(...)->NotImplemented messages

2015-12-08 22:56:15 +00:00

genericPatchFields

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

lagrangian

Update: Changing FatalErrorInFunction. Changing Emission for P1 and fvDOM.

2015-12-10 13:57:51 -08:00

mesh

COMP: autoHexMesh: fix pow(int, int) ambiguity

2015-12-10 11:25:53 +00:00

meshTools

GIT: Resolved conflict

2015-12-09 09:32:38 +00:00

ODE

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

OpenFOAM

BUG: polyMesh: test for up-to-date data w.r.t. points

2015-12-09 17:03:15 +00:00

OSspecific/POSIX

GIT: Resolve conflict with upstream merge from Foundation

2015-12-07 17:07:20 +00:00

parallel

ENH: Updated Info, Warning and Error messages

2015-12-08 11:15:39 +00:00

postProcessing

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-dev-OpenCFD into develop

2015-12-09 16:26:39 +00:00

Pstream

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

randomProcesses

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

regionCoupled

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

regionModels

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

renumber

GIT: Resolve conflict with upstream merge from Foundation

2015-12-07 17:07:20 +00:00

sampling

GIT: Resolved conflict

2015-12-09 16:19:28 +00:00

sixDoFRigidBodyMotion

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

surfMesh

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

thermophysicalModels

Merge branch 'develop' into radiation

2015-12-11 09:50:43 +00:00

topoChangerFvMesh

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

transportModels

Completed update ...ErrorIn -> ...ErrorInFunction

2015-11-11 09:03:39 +00:00

triSurface

GIT: Resolve conflict with upstream merge from Foundation

2015-12-07 17:07:20 +00:00

TurbulenceModels

ENH: Updated Info, Warning and Error messages

2015-12-08 11:15:39 +00:00

Allwmake

GIT: Resolve conflict with upstream merge from Foundation

2015-12-07 17:07:20 +00:00