GIT: Resolve conflict associated with cherry-pick of Foundation commit 79ff91350
79ff91350 - rhoPimpleFoam: Improved support for compressible liquids (2017-05-17 17:05:43 +0100) <Henry Weller>
Showing
- applications/solvers/combustion/reactingFoam/createFields.H 1 addition, 21 deletionsapplications/solvers/combustion/reactingFoam/createFields.H
- applications/solvers/combustion/reactingFoam/pEqn.H 6 additions, 11 deletionsapplications/solvers/combustion/reactingFoam/pEqn.H
- applications/solvers/combustion/reactingFoam/pcEqn.H 5 additions, 14 deletionsapplications/solvers/combustion/reactingFoam/pcEqn.H
- applications/solvers/combustion/reactingFoam/reactingFoam.C 4 additions, 1 deletionapplications/solvers/combustion/reactingFoam/reactingFoam.C
- applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H 60 additions, 62 deletions...ers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
- applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H 2 additions, 0 deletions...rs/combustion/reactingFoam/rhoReactingFoam/createFields.H
- applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H 0 additions, 109 deletions...ns/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
- applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C 10 additions, 2 deletions...combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
- applications/solvers/compressible/rhoPimpleFoam/createFields.H 2 additions, 2 deletions...cations/solvers/compressible/rhoPimpleFoam/createFields.H
- applications/solvers/compressible/rhoPimpleFoam/pEqn.H 31 additions, 21 deletionsapplications/solvers/compressible/rhoPimpleFoam/pEqn.H
- applications/solvers/compressible/rhoPimpleFoam/pcEqn.H 31 additions, 21 deletionsapplications/solvers/compressible/rhoPimpleFoam/pcEqn.H
- applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H 2 additions, 7 deletions...olvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
- applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C 2 additions, 0 deletions...ations/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
- applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H 59 additions, 100 deletionsapplications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
- applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H 73 additions, 87 deletions...ions/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
- applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C 2 additions, 1 deletion.../solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
- applications/solvers/lagrangian/reactingParcelFoam/pEqn.H 53 additions, 55 deletionsapplications/solvers/lagrangian/reactingParcelFoam/pEqn.H
- applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H 42 additions, 44 deletions...angian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
- applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H 2 additions, 2 deletions...ase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
- applications/solvers/multiphase/compressibleInterFoam/createFields.H 2 additions, 2 deletions...s/solvers/multiphase/compressibleInterFoam/createFields.H
Please register or sign in to comment