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

Commit 1c65f234 authored 11 years ago by

Sergio Ferraris

Browse files

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

parents 11656a5f 20726d53

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H 0 additions, 1 deletion

...ns/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C 3 additions, 0 deletions

.../solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C 1 addition, 1 deletion

...e/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C 1 addition, 1 deletion

...multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C 8 additions, 4 deletions

...izeFunction/cellSizeCalculationType/automatic/automatic.C
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C 2 additions, 1 deletion

...noiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C 8 additions, 2 deletions

...s/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C 36 additions, 0 deletions

...dgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H 3 additions, 0 deletions

...dgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon 2 additions, 2 deletions

tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon 2 additions, 2 deletions

...s/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/polyMesh/boundary 0 additions, 81 deletions

...DyMFoam/oscillatingInletACMI2D/constant/polyMesh/boundary
tutorials/incompressible/pimpleFoam/TJunction/0/epsilon 1 addition, 1 deletion

tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon 2 additions, 2 deletions

tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega 1 addition, 1 deletion

...rangian/LTSReactingParcelFoam/verticalChannel/0.org/omega
tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega 1 addition, 1 deletion

.../lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega 1 addition, 1 deletion

...lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega 1 addition, 1 deletion

...gian/simpleReactingParcelFoam/verticalChannel/0.org/omega
tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega 1 addition, 1 deletion

...grangian/simpleReactingParcelFoam/verticalChannel/0/omega
tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution 7 additions, 4 deletions

...ials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution

with 81 additions and 107 deletions

Please register or to comment

Admin message

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