resolve local conflict (45db8fa4) · Commits · Development / openfoam

Commit 45db8fa4 authored 14 years ago by

Andrew Heather

Browse files

resolve local conflict

parents ad18857c 1c1c6df6

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/combustion/fireFoam/UEqn.H 9 additions, 26 deletions

applications/solvers/combustion/fireFoam/UEqn.H
applications/solvers/combustion/fireFoam/fireFoam.C 11 additions, 0 deletions

applications/solvers/combustion/fireFoam/fireFoam.C
applications/solvers/combustion/fireFoam/pEqn.H 14 additions, 8 deletions

applications/solvers/combustion/fireFoam/pEqn.H
applications/solvers/combustion/rhoReactingFoam/pEqn.H 28 additions, 16 deletions

applications/solvers/combustion/rhoReactingFoam/pEqn.H
applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C 12 additions, 1 deletion

...ions/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
applications/solvers/compressible/rhoPimpleFoam/UEqn.H 2 additions, 16 deletions

applications/solvers/compressible/rhoPimpleFoam/UEqn.H
applications/solvers/compressible/rhoPimpleFoam/createFields.H 1 addition, 9 deletions

...cations/solvers/compressible/rhoPimpleFoam/createFields.H
applications/solvers/compressible/rhoPimpleFoam/hEqn.H 2 additions, 10 deletions

applications/solvers/compressible/rhoPimpleFoam/hEqn.H
applications/solvers/compressible/rhoPimpleFoam/pEqn.H 33 additions, 47 deletions

applications/solvers/compressible/rhoPimpleFoam/pEqn.H
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C 17 additions, 5 deletions

...ations/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
applications/solvers/compressible/rhoPisoFoam/Make/files 0 additions, 3 deletions

applications/solvers/compressible/rhoPisoFoam/Make/files
applications/solvers/compressible/rhoPisoFoam/Make/options 0 additions, 13 deletions

applications/solvers/compressible/rhoPisoFoam/Make/options
applications/solvers/compressible/rhoPisoFoam/UEqn.H 0 additions, 11 deletions

applications/solvers/compressible/rhoPisoFoam/UEqn.H
applications/solvers/compressible/rhoPisoFoam/createFields.H 0 additions, 58 deletions

applications/solvers/compressible/rhoPisoFoam/createFields.H
applications/solvers/compressible/rhoPisoFoam/hEqn.H 0 additions, 12 deletions

applications/solvers/compressible/rhoPisoFoam/hEqn.H
applications/solvers/compressible/rhoPisoFoam/pEqn.H 0 additions, 68 deletions

applications/solvers/compressible/rhoPisoFoam/pEqn.H
applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H 2 additions, 16 deletions

...ations/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H
applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H 26 additions, 24 deletions

...ations/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H
applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C 17 additions, 6 deletions

...pressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H 7 additions, 2 deletions

...s/solvers/compressible/rhoPorousSimpleFoam/createFields.H

with 181 additions and 351 deletions

Please register or to comment

Admin message

resolve local conflict