Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev (a37d5966) · Commits · Development / openfoam

Commit a37d5966 authored 11 years ago by

mattijs

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Conflicts:
	src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C

parents 5ac31aab e678146f

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/correctPhi.H 19 additions, 19 deletions

.../compressible/rhoPimpleFoam/rhoPimpleDyMFoam/correctPhi.H
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H 2 additions, 2 deletions

...olvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C 8 additions, 14 deletions

...essible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/correctPhi.H 4 additions, 4 deletions

...vers/incompressible/pimpleFoam/pimpleDyMFoam/correctPhi.H
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C 17 additions, 19 deletions

...hase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H 18 additions, 9 deletions

.../multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H 7 additions, 2 deletions

...olvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/readControls.H 9 additions, 0 deletions

...ultiphase/cavitatingFoam/cavitatingDyMFoam/readControls.H
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/correctPhi.H 18 additions, 20 deletions

...mpressibleInterFoam/compressibleInterDyMFoam/correctPhi.H
applications/solvers/multiphase/multiphaseEulerFoam/correctPhi.H 1 addition, 17 deletions

...tions/solvers/multiphase/multiphaseEulerFoam/correctPhi.H
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C 2 additions, 1 deletion

...vers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C 6 additions, 6 deletions

...d/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C 2 additions, 2 deletions

src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
src/regionModels/regionCoupling/Make/files 1 addition, 0 deletions

src/regionModels/regionCoupling/Make/files
src/regionModels/regionCoupling/Make/options 9 additions, 0 deletions

src/regionModels/regionCoupling/Make/options
src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C 372 additions, 0 deletions

...ed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H 232 additions, 0 deletions

...ed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.H
src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C 32 additions, 14 deletions

...ature/externalWallHeatFluxTemperatureFvPatchScalarField.C
src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H 9 additions, 8 deletions

...ature/externalWallHeatFluxTemperatureFvPatchScalarField.H

with 768 additions and 137 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev