Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
56fa7c09
Commit
56fa7c09
authored
Jan 10, 2016
by
Henry Weller
Browse files
Update code to use the simpler C++11 template syntax removing spaces between closing ">"s
parent
4eba393f
Changes
1000
Hide whitespace changes
Inline
Side-by-side
Too many changes to show.
To preserve performance only
20 of 1000+
files are displayed.
Plain diff
Email patch
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
View file @
56fa7c09
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -55,7 +55,7 @@ PDRkEpsilon::PDRkEpsilon
const
word
&
modelName
)
:
Foam
::
RASModels
::
kEpsilon
<
EddyDiffusivity
<
compressible
::
turbulenceModel
>
>
Foam
::
RASModels
::
kEpsilon
<
EddyDiffusivity
<
compressible
::
turbulenceModel
>>
(
geometricOneField
(),
rho
,
...
...
applications/solvers/combustion/PDRFoam/bEqn.H
View file @
56fa7c09
tmp
<
fv
::
convectionScheme
<
scalar
>
>
mvConvection
tmp
<
fv
::
convectionScheme
<
scalar
>>
mvConvection
(
fv
::
convectionScheme
<
scalar
>::
New
(
...
...
applications/solvers/combustion/XiFoam/ftEqn.H
View file @
56fa7c09
tmp
<
fv
::
convectionScheme
<
scalar
>
>
mvConvection
tmp
<
fv
::
convectionScheme
<
scalar
>>
mvConvection
(
fv
::
convectionScheme
<
scalar
>::
New
(
...
...
applications/solvers/combustion/chemFoam/createSingleCellMesh.H
View file @
56fa7c09
...
...
@@ -25,7 +25,7 @@ fvMesh mesh
runTime
,
IOobject
::
READ_IF_PRESENT
),
xferMove
<
Field
<
vector
>
>
(
points
),
xferMove
<
Field
<
vector
>>
(
points
),
faces
.
xfer
(),
owner
.
xfer
(),
neighbour
.
xfer
()
...
...
applications/solvers/combustion/fireFoam/YEEqn.H
View file @
56fa7c09
tmp
<
fv
::
convectionScheme
<
scalar
>
>
mvConvection
tmp
<
fv
::
convectionScheme
<
scalar
>>
mvConvection
(
fv
::
convectionScheme
<
scalar
>::
New
(
...
...
applications/solvers/combustion/reactingFoam/YEqn.H
View file @
56fa7c09
tmp
<
fv
::
convectionScheme
<
scalar
>
>
mvConvection
tmp
<
fv
::
convectionScheme
<
scalar
>>
mvConvection
(
fv
::
convectionScheme
<
scalar
>::
New
(
...
...
applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
View file @
56fa7c09
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -119,7 +119,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap
transformFvPatchField
<
Type
>::
rmap
(
ptf
,
addr
);
const
mixedFixedValueSlipFvPatchField
<
Type
>&
dmptf
=
refCast
<
const
mixedFixedValueSlipFvPatchField
<
Type
>
>
(
ptf
);
refCast
<
const
mixedFixedValueSlipFvPatchField
<
Type
>>
(
ptf
);
refValue_
.
rmap
(
dmptf
.
refValue_
,
addr
);
valueFraction_
.
rmap
(
dmptf
.
valueFraction_
,
addr
);
...
...
@@ -127,7 +127,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap
template
<
class
Type
>
Foam
::
tmp
<
Foam
::
Field
<
Type
>
>
Foam
::
tmp
<
Foam
::
Field
<
Type
>>
Foam
::
mixedFixedValueSlipFvPatchField
<
Type
>::
snGrad
()
const
{
tmp
<
vectorField
>
nHat
=
this
->
patch
().
nf
();
...
...
@@ -167,7 +167,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::evaluate
template
<
class
Type
>
Foam
::
tmp
<
Foam
::
Field
<
Type
>
>
Foam
::
tmp
<
Foam
::
Field
<
Type
>>
Foam
::
mixedFixedValueSlipFvPatchField
<
Type
>::
snGradTransformDiag
()
const
{
vectorField
nHat
(
this
->
patch
().
nf
());
...
...
applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H
View file @
56fa7c09
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -101,9 +101,9 @@ public:
);
//- Construct and return a clone
virtual
tmp
<
fvPatchField
<
Type
>
>
clone
()
const
virtual
tmp
<
fvPatchField
<
Type
>>
clone
()
const
{
return
tmp
<
fvPatchField
<
Type
>
>
return
tmp
<
fvPatchField
<
Type
>>
(
new
mixedFixedValueSlipFvPatchField
<
Type
>
(
*
this
)
);
...
...
@@ -117,12 +117,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual
tmp
<
fvPatchField
<
Type
>
>
clone
virtual
tmp
<
fvPatchField
<
Type
>>
clone
(
const
DimensionedField
<
Type
,
volMesh
>&
iF
)
const
{
return
tmp
<
fvPatchField
<
Type
>
>
return
tmp
<
fvPatchField
<
Type
>>
(
new
mixedFixedValueSlipFvPatchField
<
Type
>
(
*
this
,
iF
)
);
...
...
@@ -170,7 +170,7 @@ public:
// Evaluation functions
//- Return gradient at boundary
virtual
tmp
<
Field
<
Type
>
>
snGrad
()
const
;
virtual
tmp
<
Field
<
Type
>>
snGrad
()
const
;
//- Evaluate the patch field
virtual
void
evaluate
...
...
@@ -179,7 +179,7 @@ public:
);
//- Return face-gradient transform diagonal
virtual
tmp
<
Field
<
Type
>
>
snGradTransformDiag
()
const
;
virtual
tmp
<
Field
<
Type
>>
snGradTransformDiag
()
const
;
//- Write
...
...
applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
View file @
56fa7c09
...
...
@@ -3,14 +3,14 @@ namespace Foam
//- Interpolate field vf according to direction dir
template
<
class
Type
>
tmp
<
GeometricField
<
Type
,
fvsPatchField
,
surfaceMesh
>
>
interpolate
tmp
<
GeometricField
<
Type
,
fvsPatchField
,
surfaceMesh
>>
interpolate
(
const
GeometricField
<
Type
,
fvPatchField
,
volMesh
>&
vf
,
const
surfaceScalarField
&
dir
,
const
word
&
reconFieldName
=
word
::
null
)
{
tmp
<
GeometricField
<
Type
,
fvsPatchField
,
surfaceMesh
>
>
tsf
tmp
<
GeometricField
<
Type
,
fvsPatchField
,
surfaceMesh
>>
tsf
(
fvc
::
interpolate
(
...
...
applications/solvers/lagrangian/DPMFoam/createFields.H
View file @
56fa7c09
...
...
@@ -151,7 +151,7 @@ alphac.correctBoundaryConditions();
surfaceScalarField
alphacf
(
"alphacf"
,
fvc
::
interpolate
(
alphac
));
surfaceScalarField
alphaPhic
(
"alphaPhic"
,
alphacf
*
phic
);
autoPtr
<
PhaseIncompressibleTurbulenceModel
<
singlePhaseTransportModel
>
>
autoPtr
<
PhaseIncompressibleTurbulenceModel
<
singlePhaseTransportModel
>>
continuousPhaseTurbulence
(
PhaseIncompressibleTurbulenceModel
<
singlePhaseTransportModel
>::
New
...
...
applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
View file @
56fa7c09
tmp
<
fv
::
convectionScheme
<
scalar
>
>
mvConvection
tmp
<
fv
::
convectionScheme
<
scalar
>>
mvConvection
(
fv
::
convectionScheme
<
scalar
>::
New
(
...
...
applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H
View file @
56fa7c09
tmp
<
fv
::
convectionScheme
<
scalar
>
>
mvConvection
tmp
<
fv
::
convectionScheme
<
scalar
>>
mvConvection
(
fv
::
convectionScheme
<
scalar
>::
New
(
...
...
applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
View file @
56fa7c09
tmp
<
fv
::
convectionScheme
<
scalar
>
>
mvConvection
tmp
<
fv
::
convectionScheme
<
scalar
>>
mvConvection
(
fv
::
convectionScheme
<
scalar
>::
New
(
...
...
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
View file @
56fa7c09
tmp
<
fv
::
convectionScheme
<
scalar
>
>
mvConvection
tmp
<
fv
::
convectionScheme
<
scalar
>>
mvConvection
(
fv
::
convectionScheme
<
scalar
>::
New
(
...
...
applications/solvers/multiphase/interFoam/alphaEqn.H
View file @
56fa7c09
...
...
@@ -2,7 +2,7 @@
word
alphaScheme
(
"div(phi,alpha)"
);
word
alpharScheme
(
"div(phirb,alpha)"
);
tmp
<
fv
::
ddtScheme
<
scalar
>
>
ddtAlpha
tmp
<
fv
::
ddtScheme
<
scalar
>>
ddtAlpha
(
fv
::
ddtScheme
<
scalar
>::
New
(
...
...
@@ -15,13 +15,13 @@
scalar
ocCoeff
=
0
;
if
(
isType
<
fv
::
EulerDdtScheme
<
scalar
>
>
(
ddtAlpha
())
||
isType
<
fv
::
localEulerDdtScheme
<
scalar
>
>
(
ddtAlpha
())
isType
<
fv
::
EulerDdtScheme
<
scalar
>>
(
ddtAlpha
())
||
isType
<
fv
::
localEulerDdtScheme
<
scalar
>>
(
ddtAlpha
())
)
{
ocCoeff
=
0
;
}
else
if
(
isType
<
fv
::
CrankNicolsonDdtScheme
<
scalar
>
>
(
ddtAlpha
()))
else
if
(
isType
<
fv
::
CrankNicolsonDdtScheme
<
scalar
>>
(
ddtAlpha
()))
{
if
(
nAlphaSubCycles
>
1
)
{
...
...
@@ -32,7 +32,7 @@
}
ocCoeff
=
refCast
<
fv
::
CrankNicolsonDdtScheme
<
scalar
>
>
(
ddtAlpha
()).
ocCoeff
();
refCast
<
fv
::
CrankNicolsonDdtScheme
<
scalar
>>
(
ddtAlpha
()).
ocCoeff
();
}
else
{
...
...
applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
View file @
56fa7c09
...
...
@@ -4,7 +4,7 @@
surfaceScalarField
phir
(
"phir"
,
phic
*
interface
.
nHatf
());
Pair
<
tmp
<
volScalarField
>
>
vDotAlphal
=
Pair
<
tmp
<
volScalarField
>>
vDotAlphal
=
mixture
->
vDotAlphal
();
const
volScalarField
&
vDotcAlphal
=
vDotAlphal
[
0
]();
const
volScalarField
&
vDotvAlphal
=
vDotAlphal
[
1
]();
...
...
applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
View file @
56fa7c09
...
...
@@ -39,7 +39,7 @@
)
/
(
mesh
.
magSf
().
boundaryField
()
*
rAUf
.
boundaryField
())
);
Pair
<
tmp
<
volScalarField
>
>
vDotP
=
mixture
->
vDotP
();
Pair
<
tmp
<
volScalarField
>>
vDotP
=
mixture
->
vDotP
();
const
volScalarField
&
vDotcP
=
vDotP
[
0
]();
const
volScalarField
&
vDotvP
=
vDotP
[
1
]();
...
...
applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
View file @
56fa7c09
...
...
@@ -33,7 +33,7 @@
)
/
(
mesh
.
magSf
().
boundaryField
()
*
rAUf
.
boundaryField
())
);
Pair
<
tmp
<
volScalarField
>
>
vDotP
=
mixture
->
vDotP
();
Pair
<
tmp
<
volScalarField
>>
vDotP
=
mixture
->
vDotP
();
const
volScalarField
&
vDotcP
=
vDotP
[
0
]();
const
volScalarField
&
vDotvP
=
vDotP
[
1
]();
...
...
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
View file @
56fa7c09
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011
-2016
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -63,13 +63,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam
::
Pair
<
Foam
::
tmp
<
Foam
::
volScalarField
>
>
Foam
::
Pair
<
Foam
::
tmp
<
Foam
::
volScalarField
>>
Foam
::
phaseChangeTwoPhaseMixtures
::
Kunz
::
mDotAlphal
()
const
{
const
volScalarField
&
p
=
alpha1_
.
db
().
lookupObject
<
volScalarField
>
(
"p"
);
volScalarField
limitedAlpha1
(
min
(
max
(
alpha1_
,
scalar
(
0
)),
scalar
(
1
)));
return
Pair
<
tmp
<
volScalarField
>
>
return
Pair
<
tmp
<
volScalarField
>>
(
mcCoeff_
*
sqr
(
limitedAlpha1
)
*
max
(
p
-
pSat
(),
p0_
)
/
max
(
p
-
pSat
(),
0
.
01
*
pSat
()),
...
...
@@ -78,13 +78,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const
);
}
Foam
::
Pair
<
Foam
::
tmp
<
Foam
::
volScalarField
>
>
Foam
::
Pair
<
Foam
::
tmp
<
Foam
::
volScalarField
>>
Foam
::
phaseChangeTwoPhaseMixtures
::
Kunz
::
mDotP
()
const
{
const
volScalarField
&
p
=
alpha1_
.
db
().
lookupObject
<
volScalarField
>
(
"p"
);
volScalarField
limitedAlpha1
(
min
(
max
(
alpha1_
,
scalar
(
0
)),
scalar
(
1
)));
return
Pair
<
tmp
<
volScalarField
>
>
return
Pair
<
tmp
<
volScalarField
>>
(
mcCoeff_
*
sqr
(
limitedAlpha1
)
*
(
1
.
0
-
limitedAlpha1
)
*
pos
(
p
-
pSat
())
/
max
(
p
-
pSat
(),
0
.
01
*
pSat
()),
...
...
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
View file @
56fa7c09
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -105,11 +105,11 @@ public:
//- Return the mass condensation and vaporisation rates as a
// coefficient to multiply (1 - alphal) for the condensation rate
// and a coefficient to multiply alphal for the vaporisation rate
virtual
Pair
<
tmp
<
volScalarField
>
>
mDotAlphal
()
const
;
virtual
Pair
<
tmp
<
volScalarField
>>
mDotAlphal
()
const
;
//- Return the mass condensation and vaporisation rates as coefficients
// to multiply (p - pSat)
virtual
Pair
<
tmp
<
volScalarField
>
>
mDotP
()
const
;
virtual
Pair
<
tmp
<
volScalarField
>>
mDotP
()
const
;
//- Correct the Kunz phaseChange model
virtual
void
correct
();
...
...
Prev
1
2
3
4
5
…
50
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment