GIT: Resolved merge conflict
Showing
- applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files 1 addition, 0 deletions...multiphase/twoPhaseEulerFoam/interfacialModels/Make/files
- applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantCoefficient/constantCoefficient.C 2 additions, 1 deletion...dels/liftModels/constantCoefficient/constantCoefficient.C
- applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantCoefficient/constantCoefficient.H 3 additions, 0 deletions...dels/liftModels/constantCoefficient/constantCoefficient.H
- applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H 4 additions, 0 deletions...erFoam/interfacialModels/liftModels/liftModel/liftModel.H
- applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C 1 addition, 1 deletion...oam/interfacialModels/liftModels/liftModel/newLiftModel.C
- applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C 97 additions, 0 deletions...aseEulerFoam/interfacialModels/liftModels/noLift/noLift.C
- applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.H 98 additions, 0 deletions...aseEulerFoam/interfacialModels/liftModels/noLift/noLift.H
- applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C 5 additions, 3 deletions...neticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
- applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H 2 additions, 2 deletions...neticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
- applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H 2 additions, 2 deletions...tiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
- applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C 20 additions, 3 deletions...arallelProcessing/reconstructParMesh/reconstructParMesh.C
- applications/utilities/parallelProcessing/redistributePar/redistributePar.C 3 additions, 1 deletion...ties/parallelProcessing/redistributePar/redistributePar.C
- applications/utilities/surface/surfaceCheck/Make/options 2 additions, 0 deletionsapplications/utilities/surface/surfaceCheck/Make/options
- applications/utilities/surface/surfaceCheck/surfaceCheck.C 95 additions, 35 deletionsapplications/utilities/surface/surfaceCheck/surfaceCheck.C
- src/OpenFOAM/db/error/messageStream.C 2 additions, 2 deletionssrc/OpenFOAM/db/error/messageStream.C
- src/OpenFOAM/dimensionSet/dimensionSetIO.C 2 additions, 2 deletionssrc/OpenFOAM/dimensionSet/dimensionSetIO.C
- src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C 5 additions, 1 deletion...penFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
- src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C 2 additions, 2 deletions...enFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
- src/Pstream/mpi/UIPread.C 3 additions, 3 deletionssrc/Pstream/mpi/UIPread.C
- src/Pstream/mpi/UOPwrite.C 4 additions, 4 deletionssrc/Pstream/mpi/UOPwrite.C
Please register or sign in to comment