GIT: Resolved conflict
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 25 additions, 2 deletions...cations/solvers/compressible/rhoPimpleFoam/createFields.H
- applications/solvers/compressible/rhoPimpleFoam/pEqn.H 43 additions, 25 deletionsapplications/solvers/compressible/rhoPimpleFoam/pEqn.H
- applications/solvers/compressible/rhoPimpleFoam/pcEqn.H 42 additions, 25 deletionsapplications/solvers/compressible/rhoPimpleFoam/pcEqn.H
- applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H 9 additions, 9 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/compressible/rhoSimpleFoam/pEqn.H 84 additions, 83 deletionsapplications/solvers/compressible/rhoSimpleFoam/pEqn.H
- applications/solvers/compressible/rhoSimpleFoam/pcEqn.H 9 additions, 5 deletionsapplications/solvers/compressible/rhoSimpleFoam/pcEqn.H
- applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H 83 additions, 90 deletionsapplications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
- applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H 23 additions, 0 deletions...ons/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
- applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H 10 additions, 9 deletionsapplications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
- applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H 18 additions, 4 deletions.../chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
- applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H 19 additions, 0 deletions...heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
Please register or sign in to comment