GIT: Resolved conflict
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- applications/Allwmake 0 additions, 3 deletionsapplications/Allwmake
- applications/solvers/combustion/chemFoam/createFields.H 4 additions, 4 deletionsapplications/solvers/combustion/chemFoam/createFields.H
- applications/solvers/compressible/rhoCentralFoam/Allwclean 0 additions, 1 deletionapplications/solvers/compressible/rhoCentralFoam/Allwclean
- applications/solvers/compressible/rhoCentralFoam/Allwmake 0 additions, 1 deletionapplications/solvers/compressible/rhoCentralFoam/Allwmake
- applications/solvers/lagrangian/DPMFoam/Allwclean 0 additions, 1 deletionapplications/solvers/lagrangian/DPMFoam/Allwclean
- applications/solvers/lagrangian/DPMFoam/Allwmake 0 additions, 1 deletionapplications/solvers/lagrangian/DPMFoam/Allwmake
- applications/solvers/multiphase/MPPICInterFoam/Allwclean 1 addition, 2 deletionsapplications/solvers/multiphase/MPPICInterFoam/Allwclean
- applications/solvers/multiphase/MPPICInterFoam/Allwmake 1 addition, 2 deletionsapplications/solvers/multiphase/MPPICInterFoam/Allwmake
- applications/solvers/multiphase/compressibleInterFoam/Allwclean 0 additions, 1 deletion...ations/solvers/multiphase/compressibleInterFoam/Allwclean
- applications/solvers/multiphase/compressibleInterFoam/Allwmake 0 additions, 1 deletion...cations/solvers/multiphase/compressibleInterFoam/Allwmake
- applications/solvers/multiphase/compressibleInterFoam/TEqn.H 1 addition, 1 deletionapplications/solvers/multiphase/compressibleInterFoam/TEqn.H
- applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C 12 additions, 6 deletions...rFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
- applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H 7 additions, 10 deletions...ase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
- applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C 1 addition, 0 deletions.../multiphase/compressibleInterFoam/compressibleInterFoam.C
- applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean 0 additions, 1 deletion...vers/multiphase/compressibleMultiphaseInterFoam/Allwclean
- applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake 0 additions, 1 deletion...lvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
- applications/solvers/multiphase/driftFluxFoam/Allwclean 0 additions, 1 deletionapplications/solvers/multiphase/driftFluxFoam/Allwclean
- applications/solvers/multiphase/driftFluxFoam/Allwmake 0 additions, 1 deletionapplications/solvers/multiphase/driftFluxFoam/Allwmake
- applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C 34 additions, 2 deletions...ocityModels/relativeVelocityModel/relativeVelocityModel.C
Please register or sign in to comment