Merge remote-tracking branch 'origin/develop' into integration-foundation (d71a7857) · Commits · Development / openfoam

Commit d71a7857 authored 7 years ago by

Andrew Heather

Browse files

Merge remote-tracking branch 'origin/develop' into integration-foundation

parents 38147627 c1cbfe7a

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H 1 addition, 1 deletion

...nctionObjects/regionFunctionObject/regionFunctionObject.H
src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C 18 additions, 4 deletions

src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H 3 additions, 3 deletions

...s/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H 2 additions, 2 deletions

...onObjects/field/fieldValues/volFieldValue/volFieldValue.H
src/functionObjects/field/histogram/histogram.H 6 additions, 0 deletions

src/functionObjects/field/histogram/histogram.H
src/sampling/surfMeshSampler/surfMeshSamplers/surfMeshSamplers.H 5 additions, 5 deletions

...pling/surfMeshSampler/surfMeshSamplers/surfMeshSamplers.H
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/T 0 additions, 0 deletions

...phase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/T
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/U 0 additions, 0 deletions

...phase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/U
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/alpha.water.orig 0 additions, 0 deletions

...bleInterDyMFoam/laminar/sloshingTank2D/0/alpha.water.orig
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p 0 additions, 0 deletions

...phase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p_rgh 0 additions, 0 deletions

...e/compressibleInterDyMFoam/laminar/sloshingTank2D/0/p_rgh
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allclean 0 additions, 0 deletions

.../compressibleInterDyMFoam/laminar/sloshingTank2D/Allclean
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun 0 additions, 0 deletions

...se/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict 0 additions, 0 deletions

...erDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g 0 additions, 0 deletions

...ompressibleInterDyMFoam/laminar/sloshingTank2D/constant/g
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties 0 additions, 0 deletions

.../laminar/sloshingTank2D/constant/thermophysicalProperties
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air 0 additions, 0 deletions

...inar/sloshingTank2D/constant/thermophysicalProperties.air
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water 0 additions, 0 deletions

...ar/sloshingTank2D/constant/thermophysicalProperties.water
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties 0 additions, 0 deletions

...MFoam/laminar/sloshingTank2D/constant/transportProperties
tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties 0 additions, 0 deletions

...Foam/laminar/sloshingTank2D/constant/turbulenceProperties

with 35 additions and 15 deletions

Please register or to comment

Admin message

Admin message

Merge remote-tracking branch 'origin/develop' into integration-foundation