Merge branch 'master' of /home/noisy2/OpenFOAM/OpenFOAM-dev/ (5009cca1) · Commits · Development / openfoam

Commit 5009cca1 authored 16 years ago by

Mattijs Janssens

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

Conflicts:

	etc/controlDict

parents 675f8a00 2c4d8c65

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/multiphase/interPhaseChangeFoam/Make/files 8 additions, 0 deletions

...ations/solvers/multiphase/interPhaseChangeFoam/Make/files
applications/solvers/multiphase/interPhaseChangeFoam/Make/options 14 additions, 0 deletions

...ions/solvers/multiphase/interPhaseChangeFoam/Make/options
applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H 32 additions, 0 deletions

applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H
applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H 50 additions, 0 deletions

...ions/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
applications/solvers/multiphase/interPhaseChangeFoam/createFields.H 98 additions, 0 deletions

...ns/solvers/multiphase/interPhaseChangeFoam/createFields.H
applications/solvers/multiphase/interPhaseChangeFoam/gammaEqn.H 67 additions, 0 deletions

...ations/solvers/multiphase/interPhaseChangeFoam/gammaEqn.H
applications/solvers/multiphase/interPhaseChangeFoam/gammaEqnSubCycle.H 53 additions, 0 deletions

...olvers/multiphase/interPhaseChangeFoam/gammaEqnSubCycle.H
applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C 111 additions, 0 deletions

...rs/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H 55 additions, 0 deletions

applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C 126 additions, 0 deletions

...erPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H 135 additions, 0 deletions

...erPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/#Merkle.C# 75 additions, 0 deletions

...eChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/#Merkle.C#
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C 121 additions, 0 deletions

...aseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H 129 additions, 0 deletions

...aseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C 169 additions, 0 deletions

...m/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H 142 additions, 0 deletions

...m/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C 39 additions, 45 deletions

...haseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C 94 additions, 0 deletions

...s/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H 175 additions, 0 deletions

...s/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
applications/utilities/postProcessing/sampling/sample/Make/files 0 additions, 0 deletions

...tions/utilities/postProcessing/sampling/sample/Make/files

with 1693 additions and 45 deletions

Please register or to comment

Admin message

Admin message

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