Merge branch 'master' into dsmc (c3eac7b8) · Commits · Development / openfoam

Commit c3eac7b8 authored 15 years ago by

graham

Merge branch 'master' into dsmc

Conflicts:
	src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H

Fixed - old cacheDeltaT in conflict.

parents b783a210 92217930

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H 2 additions, 2 deletions

applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
applications/solvers/combustion/PDRFoam/StCourantNo.H 2 additions, 2 deletions

applications/solvers/combustion/PDRFoam/StCourantNo.H
applications/solvers/combustion/PDRFoam/setDeltaT.H 2 additions, 2 deletions

applications/solvers/combustion/PDRFoam/setDeltaT.H
applications/solvers/combustion/XiFoam/bEqn.H 1 addition, 1 deletion

applications/solvers/combustion/XiFoam/bEqn.H
applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C 2 additions, 2 deletions

...ns/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
applications/solvers/combustion/dieselFoam/dieselFoam.C 2 additions, 2 deletions

applications/solvers/combustion/dieselFoam/dieselFoam.C
applications/solvers/combustion/reactingFoam/chemistry.H 2 additions, 2 deletions

applications/solvers/combustion/reactingFoam/chemistry.H
applications/solvers/combustion/rhoReactingFoam/chemistry.H 2 additions, 2 deletions

applications/solvers/combustion/rhoReactingFoam/chemistry.H
applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H 2 additions, 2 deletions

...lvers/compressible/rhoCentralFoam/compressibleCourantNo.H
applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C 1 addition, 1 deletion

...ications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C 1 addition, 1 deletion

...ations/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
applications/solvers/electromagnetics/mhdFoam/magneticFieldErr.H 1 addition, 1 deletion

...tions/solvers/electromagnetics/mhdFoam/magneticFieldErr.H
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C 2 additions, 2 deletions

...Transfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C
applications/solvers/incompressible/shallowWaterFoam/CourantNo.H 3 additions, 3 deletions

...tions/solvers/incompressible/shallowWaterFoam/CourantNo.H
applications/solvers/lagrangian/coalChemistryFoam/chemistry.H 2 additions, 2 deletions

...ications/solvers/lagrangian/coalChemistryFoam/chemistry.H
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H 2 additions, 2 deletions

...angian/porousExplicitSourceReactingParcelFoam/chemistry.H
applications/solvers/lagrangian/reactingParcelFoam/chemistry.H 2 additions, 2 deletions

...cations/solvers/lagrangian/reactingParcelFoam/chemistry.H
applications/solvers/multiphase/cavitatingFoam/CourantNo.H 3 additions, 3 deletions

applications/solvers/multiphase/cavitatingFoam/CourantNo.H
applications/solvers/multiphase/cavitatingFoam/setDeltaT.H 2 additions, 2 deletions

applications/solvers/multiphase/cavitatingFoam/setDeltaT.H
applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H 1 addition, 1 deletion

...ions/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H

with 37 additions and 37 deletions

Please register or to comment

Admin message

Merge branch 'master' into dsmc