Merge branch 'master-copy' (bf5c4cc9) · Commits · Development / openfoam

Commit bf5c4cc9 authored 14 years ago by

sergio

Merge branch 'master-copy'

Conflicts:
	src/finiteVolume/Make/files
	src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H

parents 397dad7e ddcf2ee9

Branches

Tags

Hide whitespace changes

Inline Side-by-side

Showing

src/finiteVolume/Make/files 11 additions, 0 deletions

src/finiteVolume/Make/files
src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C 196 additions, 0 deletions

...ces/basicSource/actuationDiskSource/actuationDiskSource.C
src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H 213 additions, 0 deletions

...ces/basicSource/actuationDiskSource/actuationDiskSource.H
src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C 64 additions, 0 deletions

...Source/actuationDiskSource/actuationDiskSourceTemplates.C
src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C 65 additions, 0 deletions

.../fieldSources/basicSource/basicSource/IObasicSourceList.C
src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.H 99 additions, 0 deletions

.../fieldSources/basicSource/basicSource/IObasicSourceList.H
src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C 292 additions, 0 deletions

...eneral/fieldSources/basicSource/basicSource/basicSource.C
src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H 384 additions, 0 deletions

...eneral/fieldSources/basicSource/basicSource/basicSource.H
src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H 147 additions, 0 deletions

...neral/fieldSources/basicSource/basicSource/basicSourceI.H
src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C 83 additions, 0 deletions

...eral/fieldSources/basicSource/basicSource/basicSourceIO.C
src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C 180 additions, 0 deletions

...al/fieldSources/basicSource/basicSource/basicSourceList.C
src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H 137 additions, 0 deletions

...al/fieldSources/basicSource/basicSource/basicSourceList.H
src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C 321 additions, 0 deletions

.../fieldSources/basicSource/explicitSource/explicitSource.C
src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H 289 additions, 0 deletions

.../fieldSources/basicSource/explicitSource/explicitSource.H
src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H 49 additions, 0 deletions

...fieldSources/basicSource/explicitSource/explicitSourceI.H
src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C 83 additions, 0 deletions

...ieldSources/basicSource/explicitSource/explicitSourceIO.C
src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C 173 additions, 0 deletions

...nletVelocity/cylindricalInletVelocityFvPatchVectorField.C
src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H 175 additions, 0 deletions

...nletVelocity/cylindricalInletVelocityFvPatchVectorField.H
src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H 28 additions, 47 deletions

...etVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
src/turbulenceModels/incompressible/LES/Make/files 1 addition, 0 deletions

src/turbulenceModels/incompressible/LES/Make/files

with 2990 additions and 47 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master-copy'