Commit b6ad46e1 authored 8 years ago by Andrew Heather

GIT: Resolved conflict

parents 9e84deeb 86cb17b4

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/TurbulenceModels/compressible/Make/files 1 addition, 0 deletions

src/TurbulenceModels/compressible/Make/files
src/TurbulenceModels/compressible/Make/options 2 additions, 0 deletions

src/TurbulenceModels/compressible/Make/options
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C 219 additions, 0 deletions

...identRadiation/fixedIncidentRadiationFvPatchScalarField.C
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H 205 additions, 0 deletions

...identRadiation/fixedIncidentRadiationFvPatchScalarField.H
src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C 24 additions, 21 deletions

...ity/activePressureForceBaffleVelocityFvPatchVectorField.C
src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.H 8 additions, 10 deletions

...ity/activePressureForceBaffleVelocityFvPatchVectorField.H
src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H 3 additions, 2 deletions

...locity/fixedNormalInletOutletVelocityFvPatchVectorField.H
src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H 3 additions, 0 deletions

...Schemes/boundedConvectionScheme/boundedConvectionScheme.H
src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H 3 additions, 0 deletions

...ume/convectionSchemes/convectionScheme/convectionScheme.H
src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H 3 additions, 0 deletions

...tionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H 3 additions, 0 deletions

...GaussConvectionScheme/multivariateGaussConvectionScheme.H
src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H 3 additions, 0 deletions

...niteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H 3 additions, 0 deletions

...dtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H 3 additions, 0 deletions

...e/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H 3 additions, 0 deletions

...ume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H 3 additions, 0 deletions

...teVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H 3 additions, 0 deletions

...niteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H 3 additions, 0 deletions

...initeVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H 3 additions, 0 deletions

...lume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H 3 additions, 0 deletions

...me/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H

with 501 additions and 33 deletions

Please register or to comment