Merge commit 'OpenCFD/master' into olesenm (cdd22664) · Commits · Development / openfoam

Commit cdd22664 authored 16 years ago by

Mark Olesen

Merge commit 'OpenCFD/master' into olesenm

Conflicts:

	src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
	src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C

parents cb65f1c7 eb2e37b2

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/heatTransfer/chtMultiRegionFoam/Make/files 1 addition, 1 deletion

...ations/solvers/heatTransfer/chtMultiRegionFoam/Make/files
applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManager.C 46 additions, 0 deletions

...Transfer/chtMultiRegionFoam/coupleManager/coupleManager.C
applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManager.H 3 additions, 3 deletions

...Transfer/chtMultiRegionFoam/coupleManager/coupleManager.H
applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperatureCoupled/solidWallHeatFluxTemperatureCoupledFvPatchScalarField.C 1 addition, 1 deletion

...d/solidWallHeatFluxTemperatureCoupledFvPatchScalarField.C
applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C 252 additions, 0 deletions

...pled/solidWallMixedTemperatureCoupledFvPatchScalarField.C
applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.H 184 additions, 0 deletions

...pled/solidWallMixedTemperatureCoupledFvPatchScalarField.H
applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallTemperatureCoupled/solidWallTemperatureCoupledFvPatchScalarField.C 1 addition, 1 deletion

...reCoupled/solidWallTemperatureCoupledFvPatchScalarField.C
applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallTemperatureCoupled/solidWallTemperatureCoupledFvPatchScalarField.H 1 addition, 1 deletion

...reCoupled/solidWallTemperatureCoupledFvPatchScalarField.H
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H 1 addition, 1 deletion

...heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H 1 addition, 1 deletion

...ions/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H 3 additions, 0 deletions

...olvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
applications/solvers/incompressible/pisoFoam/pisoFoam.C 2 additions, 0 deletions

applications/solvers/incompressible/pisoFoam/pisoFoam.C
applications/solvers/multiphase/cavitatingFoam/pEqn.H 9 additions, 2 deletions

applications/solvers/multiphase/cavitatingFoam/pEqn.H
applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H 7 additions, 4 deletions

...ations/solvers/multiphase/compressibleInterDyMFoam/UEqn.H
applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H 2 additions, 0 deletions

...s/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H
applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H 31 additions, 9 deletions

...ations/solvers/multiphase/compressibleInterDyMFoam/pEqn.H
applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H 8 additions, 5 deletions

applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C 1 addition, 1 deletion

...neticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
applications/utilities/mesh/manipulation/setSet/writeFuns.C 1 addition, 1 deletion

applications/utilities/mesh/manipulation/setSet/writeFuns.C
applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C 1 addition, 1 deletion

...ities/postProcessing/dataConversion/foamToVTK/writeFuns.C

with 556 additions and 32 deletions

Please register or to comment

Admin message

Merge commit 'OpenCFD/master' into olesenm