Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev (a5525778) · Commits · Development / openfoam

Commit a5525778 authored 15 years ago by

Andrew Heather

Browse files

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

parents c8bff967 6fb475b4

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/multiphase/settlingFoam/UEqn.H 1 addition, 2 deletions

applications/solvers/multiphase/settlingFoam/UEqn.H
applications/solvers/multiphase/settlingFoam/createFields.H 48 additions, 8 deletions

applications/solvers/multiphase/settlingFoam/createFields.H
applications/solvers/multiphase/settlingFoam/pmhEqn.H 52 additions, 0 deletions

applications/solvers/multiphase/settlingFoam/pmhEqn.H
applications/solvers/multiphase/settlingFoam/settlingFoam.C 12 additions, 10 deletions

applications/solvers/multiphase/settlingFoam/settlingFoam.C
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H 6 additions, 7 deletions

...AM/fields/GeometricFields/GeometricField/GeometricField.H
src/OpenFOAM/primitives/Scalar/Scalar.H 8 additions, 2 deletions

src/OpenFOAM/primitives/Scalar/Scalar.H
src/OpenFOAM/primitives/bools/bool/bool.H 11 additions, 2 deletions

src/OpenFOAM/primitives/bools/bool/bool.H
src/OpenFOAM/primitives/ints/label/label.H 11 additions, 2 deletions

src/OpenFOAM/primitives/ints/label/label.H
src/OpenFOAM/primitives/ints/uLabel/uLabel.H 10 additions, 2 deletions

src/OpenFOAM/primitives/ints/uLabel/uLabel.H
src/OpenFOAM/primitives/pTraits/pTraits.H 24 additions, 9 deletions

src/OpenFOAM/primitives/pTraits/pTraits.H
src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C 6 additions, 2 deletions

...rived/buoyantPressure/buoyantPressureFvPatchScalarField.C
src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C 21 additions, 19 deletions

...elds/derived/timeVaryingMappedFixedValue/AverageIOField.C
src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.H 13 additions, 11 deletions

...elds/derived/timeVaryingMappedFixedValue/AverageIOField.H
src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOFields.C 2 additions, 0 deletions

...lds/derived/timeVaryingMappedFixedValue/AverageIOFields.C
src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C 23 additions, 8 deletions

...appedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H 3 additions, 0 deletions

...appedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K 1 addition, 1 deletion

...als/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T 1 addition, 1 deletion

...als/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U 1 addition, 1 deletion

...als/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp 1 addition, 1 deletion

...ls/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp

with 255 additions and 88 deletions

Please register or to comment

Admin message

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev