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

Commit 19ae0c6d authored 11 years ago by

Sergio Ferraris

Browse files

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

parents 0c33cbc9 1d679022

Branches

Tags

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

applications/utilities/mesh/manipulation/createBaffles/createBaffles.C 371 additions, 245 deletions

...utilities/mesh/manipulation/createBaffles/createBaffles.C
applications/utilities/mesh/manipulation/createBaffles/createBafflesDict 19 additions, 95 deletions

...ilities/mesh/manipulation/createBaffles/createBafflesDict
applications/utilities/postProcessing/sampling/sample/sampleDict 3 additions, 1 deletion

...tions/utilities/postProcessing/sampling/sample/sampleDict
applications/utilities/preProcessing/mapFieldsNew/mapFieldsDict 7 additions, 1 deletion

...ations/utilities/preProcessing/mapFieldsNew/mapFieldsDict
src/OpenFOAM/Make/files 1 addition, 0 deletions

src/OpenFOAM/Make/files
src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C 260 additions, 0 deletions

...OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.H 128 additions, 0 deletions

...OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.H
src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifierI.H 42 additions, 0 deletions

...penFOAM/meshes/Identifiers/patch/coupleGroupIdentifierI.H
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C 35 additions, 14 deletions

.../polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H 9 additions, 7 deletions

.../polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C 5 additions, 0 deletions

...rmediate/clouds/Templates/KinematicCloud/KinematicCloud.C
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H 6 additions, 0 deletions

...rmediate/clouds/Templates/KinematicCloud/KinematicCloud.H
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H 8 additions, 0 deletions

...mediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C 2 additions, 2 deletions

...diate/parcels/Templates/KinematicParcel/KinematicParcel.C
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H 1 addition, 1 deletion

...ediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C 3 additions, 3 deletions

...ic/InjectionModel/InflationInjection/InflationInjection.C
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C 10 additions, 12 deletions

.../Kinematic/InjectionModel/InjectionModel/InjectionModel.C
src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C 13 additions, 24 deletions

...rangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C 1 addition, 5 deletions

.../spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C 30 additions, 6 deletions

...patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C

with 954 additions and 416 deletions

Please register or to comment

Admin message

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