Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev into feature/cvMesh (07cb342a) · Commits · Development / openfoam

Commit 07cb342a authored 12 years ago by

laurence

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev into feature/cvMesh

Conflicts:
	src/OpenFOAM/primitives/triad/triad.C

parents f4c7e8ce 6eafa394

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/combustion/chemFoam/readInitialConditions.H 3 additions, 3 deletions

...tions/solvers/combustion/chemFoam/readInitialConditions.H
applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H 8 additions, 8 deletions

.../solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
applications/solvers/compressible/rhoSimpleFoam/pEqn.H 0 additions, 5 deletions

applications/solvers/compressible/rhoSimpleFoam/pEqn.H
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H 4 additions, 4 deletions

...ers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createZones.H 0 additions, 3 deletions

...pressible/rhoSimpleFoam/rhoPorousSimpleFoam/createZones.H
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H 3 additions, 8 deletions

...ers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C 1 addition, 2 deletions

...e/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H 1 addition, 6 deletions

.../solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options 4 additions, 2 deletions

...ers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H 4 additions, 0 deletions

...s/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H
applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C 2 additions, 0 deletions

...buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H 3 additions, 1 deletion

applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C 2 additions, 1 deletion

...vers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C 1 addition, 0 deletions

...nFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H 3 additions, 1 deletion

...ltiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H 11 additions, 0 deletions

...heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H 30 additions, 4 deletions

...tTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C 1 addition, 35 deletions

...heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H 1 addition, 10 deletions

...heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H 25 additions, 14 deletions

...ransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H

with 107 additions and 107 deletions

Please register or to comment

Admin message

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev into feature/cvMesh