Andrew Heather 9a864bdd85 GIT: Resolved merge conflict when merging develop branch

2017-05-24 12:30:09 +01:00

..

basic

ENH: Updated reading of dimensioned types from transportProperties dictionary to avoid the need to provide the dimension set

2017-05-18 14:44:52 +01:00

combustion

MRG: resolved merge conflicts from merge from develop branch

2017-05-19 16:29:54 +01:00

compressible

GIT: Resolved merge conflict when merging develop branch

2017-05-24 12:30:09 +01:00

discreteMethods

GIT: Initial state after latest Foundation merge

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

DNS

COMP: update lnInclude directories when building (issue #364)

2016-12-22 11:26:29 +01:00

doc

ENH: Solvers - updated group documentation

2015-12-03 22:05:55 +00:00

electromagnetics

MRG: Integrated Foundation code to commit ba4dbed

2017-03-23 12:11:49 +00:00

financial

GIT: Initial state after latest Foundation merge

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

heatTransfer

Integrated Foundation code to commit 104aac5

2017-05-17 16:35:18 +01:00

incompressible

ENH: Updated reading of dimensioned types from transportProperties dictionary to avoid the need to provide the dimension set

2017-05-18 14:44:52 +01:00

lagrangian

GIT: Resolved merge conflict when merging develop branch

2017-05-24 12:30:09 +01:00

multiphase

GIT: Resolved merge conflict when merging develop branch

2017-05-24 12:30:09 +01:00

stressAnalysis

GIT: Initial state after latest Foundation merge

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