Commit Graph

5 Commits

Author SHA1 Message Date
99a7669440 Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev
Conflicts:
	src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
	src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
	src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
	src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
2012-02-03 12:44:17 +00:00
100ba9c0c4 BUG: DataEntry: corrected external, file based tables 2012-02-03 12:39:48 +00:00
1da5da2a0f BUG/ENH: Added use of engine time to cloud injection models - mantis #407 2012-02-02 18:58:17 +00:00
e9e9dcbd08 ENH: Refactored DataEntry table-types to make use of new table base class 2011-11-22 13:14:48 +00:00
5763b7e404 ENH: Added CSV table DataEntry 2011-11-21 17:12:59 +00:00