Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev (e66e4029) · Commits · Development / openfoam

Commit e66e4029 authored 8 years ago by

Henry Weller

Browse files

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

parents 864fc239 44ac4449

Branches

Tags

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C 17 additions, 1 deletion

...EulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C 6 additions, 1 deletion

...diate/parcels/Templates/KinematicParcel/KinematicParcel.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C 5 additions, 1 deletion

...PatchInteractionModel/LocalInteraction/LocalInteraction.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C 1 addition, 2 deletions

...eractionModel/LocalInteraction/patchInteractionDataList.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C 9 additions, 0 deletions

...actionModel/PatchInteractionModel/PatchInteractionModel.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H 2 additions, 1 deletion

...actionModel/PatchInteractionModel/PatchInteractionModel.H
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C 4 additions, 0 deletions

...onModel/StandardWallInteraction/StandardWallInteraction.C
tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict 60 additions, 81 deletions

tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict
tutorials/basic/scalarTransportFoam/pitzDaily/0/U 12227 additions, 12229 deletions

tutorials/basic/scalarTransportFoam/pitzDaily/0/U
tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict 60 additions, 81 deletions

.../basic/scalarTransportFoam/pitzDaily/system/blockMeshDict
tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/blockMeshDict 60 additions, 81 deletions

...ressible/rhoPimpleFoam/LES/pitzDaily/system/blockMeshDict
tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict 60 additions, 81 deletions

...jointShapeOptimizationFoam/pitzDaily/system/blockMeshDict
tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/blockMeshDict 60 additions, 81 deletions

...ompressible/pimpleFoam/RAS/pitzDaily/system/blockMeshDict
tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict 2 additions, 2 deletions

...ncompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
tutorials/incompressible/pisoFoam/LES/pitzDaily/system/blockMeshDict 60 additions, 81 deletions

...ncompressible/pisoFoam/LES/pitzDaily/system/blockMeshDict
tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/blockMeshDict 61 additions, 83 deletions

...essible/pisoFoam/LES/pitzDailyMapped/system/blockMeshDict
tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict 60 additions, 81 deletions

.../incompressible/simpleFoam/pitzDaily/system/blockMeshDict
tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict 60 additions, 81 deletions

...ssible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict

with 12814 additions and 12968 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev