Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev (fbe04b18) · Commits · Development / openfoam

Commit fbe04b18 authored 14 years ago by

mattijs

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

Conflicts:
	src/parallel/decompose/scotchDecomp/scotchDecomp.C

parents 9f8b5bb6 28b1a9e2

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C 23 additions, 20 deletions

...hoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H 1 addition, 2 deletions

...ions/solvers/compressible/rhoCentralFoam/readFluxScheme.H
applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H 9 additions, 5 deletions

...ompressible/rhoCentralFoam/readThermophysicalProperties.H
applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H 7 additions, 16 deletions

...s/solvers/compressible/rhoPorousSimpleFoam/createFields.H
applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H 10 additions, 5 deletions

.../compressible/rhopSonicFoam/readThermodynamicProperties.H
applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H 3 additions, 2 deletions

...ions/solvers/electromagnetics/mhdFoam/readBPISOControls.H
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H 7 additions, 21 deletions

...gionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H 4 additions, 6 deletions

...gionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H 6 additions, 4 deletions

...ultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H 12 additions, 22 deletions

...tMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H
applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H 3 additions, 1 deletion

...vers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPISOControls.H 3 additions, 5 deletions

...tMultiRegionFoam/solid/readSolidMultiRegionPISOControls.H
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H 5 additions, 10 deletions

...rs/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H
applications/solvers/incompressible/porousSimpleFoam/createFields.H 7 additions, 16 deletions

...ns/solvers/incompressible/porousSimpleFoam/createFields.H
applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H 1 addition, 1 deletion

...tions/solvers/multiphase/bubbleFoam/createRASTurbulence.H
applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H 7 additions, 12 deletions

...olvers/multiphase/compressibleInterDyMFoam/readControls.H
applications/solvers/multiphase/interDyMFoam/readControls.H 5 additions, 10 deletions

applications/solvers/multiphase/interDyMFoam/readControls.H
applications/solvers/multiphase/settlingFoam/createFields.H 1 addition, 1 deletion

applications/solvers/multiphase/settlingFoam/createFields.H
applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H 1 addition, 3 deletions

...tions/solvers/multiphase/twoPhaseEulerFoam/createFields.H
applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H 2 additions, 1 deletion

...solidDisplacementFoam/readSolidDisplacementFoamControls.H

with 117 additions and 163 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment

Admin message

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

Some changes are not shown.