Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev (b53fff01) · Commits · Development / openfoam

Commit b53fff01 authored 11 years ago by

mattijs

Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Conflicts:
	doc/Doxygen/css/doxygen.css

parents a4d50f98 ef0a8e50

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H 2 additions, 1 deletion

...ions/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C 0 additions, 4 deletions

.../solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C 0 additions, 2 deletions

.../solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C
applications/solvers/multiphase/interFoam/alphaEqn.H 75 additions, 12 deletions

applications/solvers/multiphase/interFoam/alphaEqn.H
applications/solvers/multiphase/interFoam/createFields.H 3 additions, 0 deletions

applications/solvers/multiphase/interFoam/createFields.H
applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C 0 additions, 2 deletions

.../solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
applications/solvers/multiphase/interFoam/interFoam.C 0 additions, 2 deletions

applications/solvers/multiphase/interFoam/interFoam.C
applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C 0 additions, 2 deletions

...rs/multiphase/interFoam/interMixingFoam/interMixingFoam.C
applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C 0 additions, 2 deletions

...rs/multiphase/interFoam/porousInterFoam/porousInterFoam.C
applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H 1 addition, 0 deletions

...ations/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
doc/Doxygen/css/doxygen.css 155 additions, 155 deletions

doc/Doxygen/css/doxygen.css
src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C 8 additions, 4 deletions

...s/OutputFilterFunctionObject/OutputFilterFunctionObject.C
src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H 3 additions, 0 deletions

...s/OutputFilterFunctionObject/OutputFilterFunctionObject.H
src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C 55 additions, 0 deletions

...b/functionObjects/functionObjectFile/functionObjectFile.C
src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H 50 additions, 1 deletion

...b/functionObjects/functionObjectFile/functionObjectFile.H
src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFileTemplates.C 44 additions, 0 deletions

...nObjects/functionObjectFile/functionObjectFileTemplates.C
src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C 19 additions, 8 deletions

...cts/outputFilterOutputControl/outputFilterOutputControl.C
src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H 12 additions, 3 deletions

...cts/outputFilterOutputControl/outputFilterOutputControl.H
src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H 1 addition, 1 deletion

src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C 4 additions, 2 deletions

src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C

with 432 additions and 201 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev