merge with master + fix conflicts
Showing
- ReleaseNotes-1.6 1 addition, 1 deletionReleaseNotes-1.6
- applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H 60 additions, 19 deletions...tions/solvers/multiphase/bubbleFoam/createRASTurbulence.H
- applications/solvers/multiphase/bubbleFoam/kEpsilon.H 10 additions, 2 deletionsapplications/solvers/multiphase/bubbleFoam/kEpsilon.H
- applications/solvers/multiphase/bubbleFoam/wallFunctions.H 5 additions, 4 deletionsapplications/solvers/multiphase/bubbleFoam/wallFunctions.H
- applications/solvers/multiphase/bubbleFoam/wallViscosity.H 8 additions, 5 deletionsapplications/solvers/multiphase/bubbleFoam/wallViscosity.H
- applications/solvers/multiphase/settlingFoam/createFields.H 67 additions, 21 deletionsapplications/solvers/multiphase/settlingFoam/createFields.H
- applications/solvers/multiphase/settlingFoam/kEpsilon.H 6 additions, 2 deletionsapplications/solvers/multiphase/settlingFoam/kEpsilon.H
- applications/solvers/multiphase/settlingFoam/wallFunctions.H 5 additions, 4 deletionsapplications/solvers/multiphase/settlingFoam/wallFunctions.H
- applications/solvers/multiphase/settlingFoam/wallViscosity.H 4 additions, 2 deletionsapplications/solvers/multiphase/settlingFoam/wallViscosity.H
- applications/solvers/multiphase/twoPhaseEulerFoam/Make/options 2 additions, 1 deletion...cations/solvers/multiphase/twoPhaseEulerFoam/Make/options
- applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H 1 addition, 136 deletions...tions/solvers/multiphase/twoPhaseEulerFoam/createFields.H
- applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/kEpsilon.H 0 additions, 61 deletions...s/multiphase/twoPhaseEulerFoam/turbulenceModel/kEpsilon.H
- applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallDissipation.H 0 additions, 51 deletions...phase/twoPhaseEulerFoam/turbulenceModel/wallDissipation.H
- applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H 0 additions, 86 deletions...tiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H
- applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H 0 additions, 38 deletions...tiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H
- applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C 8 additions, 1 deletion...allelProcessing/redistributeMeshPar/redistributeMeshPar.C
- applications/utilities/preProcessing/applyWallFunctionBounaryConditions/applyWallFunctionBounaryConditions.C 3 additions, 3 deletions...ionBounaryConditions/applyWallFunctionBounaryConditions.C
- etc/apps/paraview3/bashrc 1 addition, 1 deletionetc/apps/paraview3/bashrc
- etc/apps/paraview3/cshrc 1 addition, 1 deletionetc/apps/paraview3/cshrc
- etc/controlDict 1 addition, 1 deletionetc/controlDict
Please register or sign in to comment