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

Commit 70ab8f59 authored 13 years ago by

Sergio Ferraris

Browse files

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

parents ecb1061d 531b721d

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/multiphase/multiphaseEulerFoam/Allwmake 1 addition, 1 deletion

applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
applications/solvers/multiphase/multiphaseEulerFoam/Make/options 1 addition, 1 deletion

...tions/solvers/multiphase/multiphaseEulerFoam/Make/options
applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H 1 addition, 1 deletion

applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options 1 addition, 1 deletion

...tiphase/multiphaseEulerFoam/multiphaseSystem/Make/options
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C 10 additions, 6 deletions

...e/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
src/OpenFOAM/matrices/solution/solution.C 2 additions, 2 deletions

src/OpenFOAM/matrices/solution/solution.C
src/finiteVolume/Make/files 0 additions, 1 deletion

src/finiteVolume/Make/files
src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H 0 additions, 4 deletions

...ls/general/solutionControl/pimpleControl/pimpleControlI.H
src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C 0 additions, 177 deletions

...xPressure/multiphaseFixedFluxPressureFvPatchScalarField.C
src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.H 0 additions, 154 deletions

...xPressure/multiphaseFixedFluxPressureFvPatchScalarField.H
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary 1 addition, 1 deletion

...eactingParcelFilmFoam/cylinder/constant/polyMesh/boundary
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict 1 addition, 1 deletion

...ingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T 1 addition, 1 deletion

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U 1 addition, 1 deletion

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict 2 additions, 2 deletions

...actingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict 1 addition, 1 deletion

...ingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict
tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary 1 addition, 1 deletion

...ingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary
tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict 1 addition, 1 deletion

...arcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict
tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict 1 addition, 1 deletion

...ParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict
tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas 1 addition, 1 deletion

...ials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas

with 27 additions and 359 deletions

Please register or to comment

Admin message

Admin message

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