sergio dfbb9d0900 Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop ...

Conflicts:
	tutorials/combustion/fireFoam/LES/compartmentFire/Allclean

2016-11-21 07:39:46 -08:00

..

combustionModels

Merge branch 'merge-foundation' of develop.openfoam.com:Development/OpenFOAM-plus into merge-foundation

2016-10-07 10:20:45 -07:00

conversion

GIT: Resolved conflicts arising from merge with develop branch

2016-09-26 10:57:34 +01:00

dummyThirdParty

GIT: Resolved conflicts arising from merge with develop branch

2016-09-26 10:57:34 +01:00

dynamicFvMesh

GIT: Initial state after latest Foundation merge

2016-09-20 14:49:08 +01:00

dynamicMesh

ENH: Code clean-up

2016-09-30 12:30:02 +01:00

edgeMesh

GIT: Initial state after latest Foundation merge

2016-09-20 14:49:08 +01:00

engine

boundaryField() -> boundaryFieldRef()

2016-04-23 23:16:30 +01:00

fileFormats

ENH: surfMesh support for reading compressed binary stl files (issue #294)

2016-11-13 23:04:38 +01:00

finiteVolume

STYLE: consistent naming of 'kappa' instead of 'kappaName' etc (issue #305)

2016-11-20 11:41:52 +01:00

functionObjects

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

2016-11-21 07:39:46 -08:00

fvAgglomerationMethods

MRG: Initial commit after latest Foundation merge

2016-09-30 11:16:28 +01:00

fvMotionSolver

MRG: Initial commit after latest Foundation merge

2016-09-30 11:16:28 +01:00

fvOptions

MRG: Resolved git conflict

2016-10-27 10:06:35 +01:00

genericPatchFields

MRG: Initial commit after latest Foundation merge

2016-09-30 11:16:28 +01:00

lagrangian

ENH: Check if the Lagragian cloud is active before reading massTotal & SOI in InjectionModel.C

2016-11-17 11:48:13 -08:00

mesh

MRG: Resolve conflict with latest foundation merge

2016-10-26 15:37:15 +01:00

meshTools

MRG: Resolve conflict with latest foundation merge

2016-10-26 15:37:15 +01:00

ODE

GIT: Initial state after latest Foundation merge

2016-09-20 14:49:08 +01:00

OpenFOAM

ENH: make search of instances in IOobject::typeHeaderOk optional (issue #245)

2016-11-21 14:28:40 +01:00

OSspecific/POSIX

Cleanup endian support (closes #271)

2016-10-17 12:02:01 +02:00

parallel

GIT: Resolved conflict

2016-10-04 09:45:46 +01:00

Pstream

src/Pstream: Added Allwclean consistent with the Allwmake

2016-08-25 08:25:12 +01:00

randomProcesses

MRG: Merged develop branch and resolved conflicts

2016-10-19 13:33:00 +01:00

regionCoupled

C++11: Replaced the C NULL with the safer C++11 nullptr

2016-08-05 17:19:38 +01:00

regionModels

STYLE: consistent naming of 'kappa' instead of 'kappaName' etc (issue #305)

2016-11-20 11:41:52 +01:00

renumber

MRG: Initial commit after latest Foundation merge

2016-09-30 11:16:28 +01:00

rigidBodyDynamics

MRG: Initial commit after latest Foundation merge

2016-09-30 11:16:28 +01:00

rigidBodyMeshMotion

ENH: Code clean-up

2016-09-30 12:30:02 +01:00

sampling

Merge branch 'merge-foundation' of develop.openfoam.com:Development/OpenFOAM-plus into merge-foundation

2016-10-07 10:20:45 -07:00

sixDoFRigidBodyMotion

Merge branch 'master' into 'develop'

2016-11-20 09:48:38 +00:00

surfMesh

ENH: provide ModifiableMeshedSurface class

2016-11-14 00:45:41 +01:00

thermophysicalModels

STYLE: consistent naming of 'kappa' instead of 'kappaName' etc (issue #305)

2016-11-20 11:41:52 +01:00

topoChangerFvMesh

C++11: Replaced the C NULL with the safer C++11 nullptr

2016-08-05 17:19:38 +01:00

transportModels

BUG: Corrected assignment to reference object

2016-10-07 12:26:09 +01:00

triSurface

ENH: provide xfer methods for the meshed surface components.

2016-11-12 23:42:17 +01:00

TurbulenceModels

STYLE: consistent naming of 'kappa' instead of 'kappaName' etc (issue #305)

2016-11-20 11:41:52 +01:00

Allwmake

COMP: Multiple changes - first clean build after latest merge - UNTESTED

2016-09-23 15:36:53 +01:00