Merge remote branch 'OpenCFD/master' into olesenm (f7f6faa8) · Commits · Development / openfoam

Commit f7f6faa8 authored 14 years ago by

Mark Olesen

Browse files

Merge remote branch 'OpenCFD/master' into olesenm

parents b16ef5f0 526aefad

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C 48 additions, 13 deletions

src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C 5 additions, 1 deletion

...diate/parcels/Templates/KinematicParcel/KinematicParcel.C
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H 10 additions, 1 deletion

...diate/parcels/Templates/KinematicParcel/KinematicParcel.H
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H 17 additions, 1 deletion

...iate/parcels/Templates/KinematicParcel/KinematicParcelI.H
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C 16 additions, 3 deletions

...ate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C 4 additions, 0 deletions

...PatchInteractionModel/LocalInteraction/LocalInteraction.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H 1 addition, 0 deletions

...PatchInteractionModel/LocalInteraction/LocalInteraction.H
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H 1 addition, 0 deletions

...actionModel/PatchInteractionModel/PatchInteractionModel.H
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C 2 additions, 0 deletions

...bmodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H 1 addition, 0 deletions

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

...onModel/StandardWallInteraction/StandardWallInteraction.C
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H 1 addition, 0 deletions

...onModel/StandardWallInteraction/StandardWallInteraction.H
tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties 4 additions, 1 deletion

...CentralFoam/forwardStep/constant/thermophysicalProperties
tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties 3 additions, 1 deletion

...rhoSonicFoam/forwardStep/constant/thermodynamicProperties
tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties 5 additions, 2 deletions

...oam/laminar/forwardStep/constant/thermophysicalProperties
tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U 59 additions, 0 deletions

tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U
tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon 61 additions, 0 deletions

...s/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon
tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k 62 additions, 0 deletions

tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k
tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda 52 additions, 0 deletions

...s/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut 59 additions, 0 deletions

...rials/incompressible/pimpleFoam/t-junction-with-fan/0/nut

with 415 additions and 23 deletions

Please register or to comment

Admin message

Admin message

Merge remote branch 'OpenCFD/master' into olesenm