Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
30964be5
Commit
30964be5
authored
Jan 13, 2009
by
mattijs
Browse files
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
parents
b8c8c685
c5bb3f5d
Changes
325
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
View file @
30964be5
...
...
@@ -26,7 +26,7 @@ Application
PDRFoam
Description
Compressible premixed/partially-premixed combustion solver with turbulence
Compressible premixed/partially-premixed combustion solver with turbulence
modelling.
Combusting RANS code using the b-Xi two-equation model.
...
...
@@ -121,7 +121,8 @@ scalar StCoNum = 0.0;
// Test : disable refinement for some cells
PackedList
<
1
>&
protectedCell
=
refCast
<
dynamicRefineFvMesh
>
(
mesh
).
protectedCell
();
if
(
protectedCell
.
size
()
==
0
)
if
(
protectedCell
.
empty
())
{
protectedCell
.
setSize
(
mesh
.
nCells
());
protectedCell
=
0
;
...
...
@@ -135,7 +136,7 @@ scalar StCoNum = 0.0;
}
}
//volScalarField pIndicator("pIndicator",
//volScalarField pIndicator("pIndicator",
// p*(fvc::laplacian(p))
// / (
// magSqr(fvc::grad(p))
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
View file @
30964be5
...
...
@@ -26,7 +26,8 @@ Class
Foam::PDRDragModel
Description
Base-class for sub-grid obstacle drag models.
Base-class for sub-grid obstacle drag models. The available drag model is at
\link basic.H \endlink.
SourceFiles
PDRDragModel.C
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
View file @
30964be5
...
...
@@ -70,7 +70,7 @@ Description
\f$ T \f$ is a tensor in the file CT.
The term \f$ G_{R} \f$ is treated explicitly in the \f$ \kappa-\epsilon
\f$ Eqs in the PDRkEpsilon.C file.
\f$ Eqs in the
\link
PDRkEpsilon.C
\endlink
file.
SourceFiles
...
...
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
View file @
30964be5
...
...
@@ -50,7 +50,7 @@ PDRkEpsilon::PDRkEpsilon
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
,
const
basicThermo
&
thermophysicalModel
basicThermo
&
thermophysicalModel
)
:
RASModel
(
typeName
,
rho
,
U
,
phi
,
thermophysicalModel
),
...
...
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
View file @
30964be5
...
...
@@ -27,7 +27,7 @@ Class
Description
Standard k-epsilon turbulence model with additional source terms
corresponding to PDR basic drag model (basic.H)
corresponding to PDR basic drag model (
\link
basic.H
\endlink
)
The turbulence source term \f$ G_{R} \f$ appears in the
\f$ \kappa-\epsilon \f$ equation for the generation of turbulence due to
...
...
@@ -93,7 +93,7 @@ public:
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
,
const
basicThermo
&
thermophysicalModel
basicThermo
&
thermophysicalModel
);
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
View file @
30964be5
...
...
@@ -26,6 +26,10 @@ Class
Foam::XiEqModels::SCOPEBlend
Description
Simple SCOPEBlendXiEq model for XiEq based on SCOPEXiEqs correlation
with a linear correction function to give a plausible profile for XiEq.
See @link SCOPELaminarFlameSpeed.H @endlink for details on the SCOPE
laminar flame speed model.
SourceFiles
SCOPEBlend.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
View file @
30964be5
...
...
@@ -28,6 +28,8 @@ Class
Description
Simple SCOPEXiEq model for XiEq based on SCOPEXiEqs correlation
with a linear correction function to give a plausible profile for XiEq.
See \link SCOPELaminarFlameSpeed.H \endlink for details on the SCOPE laminar
flame speed model.
SourceFiles
SCOPEXiEq.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
View file @
30964be5
...
...
@@ -27,6 +27,12 @@ Class
Description
Base-class for all XiEq models used by the b-XiEq combustion model.
The available models are :
\link basicXiSubXiEq.H \endlink
\link Gulder.H \endlink
\link instabilityXiEq.H \endlink
\link SCOPEBlendXiEq.H \endlink
\link SCOPEXiEq.H \endlink
SourceFiles
XiEqModel.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
View file @
30964be5
...
...
@@ -26,6 +26,9 @@ Class
Foam::XiEqModels::instability
Description
This is the equilibrium level of the flame wrinkling generated by
instability. It is a constant (default 2.5). It is used in
@link XiModel.H @endlink.
SourceFiles
instability.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
View file @
30964be5
...
...
@@ -26,7 +26,8 @@ Class
Foam::XiGModels::KTS
Description
Simple Kolmogorov time-scale model for the flame-wrinling generation rate.
Simple Kolmogorov time-scale (KTS) model for the flame-wrinling generation
rate.
SourceFiles
KTS.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
View file @
30964be5
...
...
@@ -27,6 +27,9 @@ Class
Description
Base-class for all Xi generation models used by the b-Xi combustion model.
See Technical Report SH/RE/01R for details on the PDR modelling. For details
on the use of XiGModel see \link XiModel.H \endlink. The model available is
\link instabilityG.H \endlink
SourceFiles
XiGModel.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
View file @
30964be5
...
...
@@ -26,7 +26,10 @@ Class
Foam::XiGModels::instabilityG
Description
Flame-surface instabilityG flame-wrinking generation rate coefficient model.
Flame-surface instabilityG flame-wrinking generation rate coefficient model
used in \link XiModel.H \endlink.
See Technical Report SH/RE/01R for details on the PDR modelling.
SourceFiles
instabilityG.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
View file @
30964be5
...
...
@@ -29,8 +29,10 @@ Description
Base-class for all Xi models used by the b-Xi combustion model.
See Technical Report SH/RE/01R for details on the PDR modelling.
Xi is given through an algebraic expression (algebraic.H),
by solving a transport equation (transport.H) or a fixed value (fixed.H).
Xi is given through an algebraic expression (\link algebraic.H \endlink),
by solving a transport equation (\link transport.H \endlink) or a
fixed value (\link fixed.H \endlink).
See report TR/HGW/10 for details on the Weller two equations model.
In the algebraic and transport methods \f$\Xi_{eq}\f$ is calculated in
...
...
@@ -45,6 +47,8 @@ Description
\f$ \dwea{b} \f$ is the regress variable.
\f$ \Xi_{coeff} \f$ is a model constant.
\f$ \Xi^* \f$ is the total equilibrium wrinkling combining the effects
of the flame inestability and turbulence interaction and is given by
...
...
applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
View file @
30964be5
...
...
@@ -28,6 +28,8 @@ Class
Description
Simple algebraic model for Xi based on Gulders correlation
with a linear correction function to give a plausible profile for Xi.
See report TR/HGW/10 for details on the Weller two equations model.
See \link XiModel.H \endlink for more details on flame wrinkling modelling.
SourceFiles
algebraic.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
View file @
30964be5
...
...
@@ -26,7 +26,8 @@ Class
Foam::XiModels::fixed
Description
Fixed value model for Xi.
Fixed value model for Xi. See \link XiModel.H \endlink for more details
on flame wrinkling modelling.
SourceFiles
fixed.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
View file @
30964be5
...
...
@@ -28,6 +28,8 @@ Class
Description
Simple transport model for Xi based on Gulders correlation
with a linear correction function to give a plausible profile for Xi.
See report TR/HGW/10 for details on the Weller two equations model.
See \link XiModel.H \endlink for more details on flame wrinkling modelling.
SourceFiles
transport.C
...
...
applications/solvers/incompressible/pisoFoam/pisoFoam.C
View file @
30964be5
...
...
@@ -100,7 +100,19 @@ int main(int argc, char *argv[])
);
pEqn
.
setReference
(
pRefCell
,
pRefValue
);
pEqn
.
solve
();
if
(
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
{
pEqn
.
solve
(
mesh
.
solver
(
"pFinal"
));
}
else
{
pEqn
.
solve
();
}
if
(
nonOrth
==
nNonOrthCorr
)
{
...
...
applications/test/HashSet/hashSetTest.C
View file @
30964be5
...
...
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
wordHashSet
setA
(
0
);
HashTable
<
label
,
word
>
tableA
;
HashTable
<
empty
>
tableB
;
HashTable
<
nil
>
tableB
;
Map
<
label
>
mapA
;
setA
.
insert
(
"kjhk"
);
...
...
@@ -49,9 +49,9 @@ int main(int argc, char *argv[])
tableA
.
insert
(
"value2"
,
2
);
tableA
.
insert
(
"value3"
,
3
);
tableB
.
insert
(
"value4"
,
empty
());
tableB
.
insert
(
"value5"
,
empty
());
tableB
.
insert
(
"value6"
,
empty
());
tableB
.
insert
(
"value4"
,
nil
());
tableB
.
insert
(
"value5"
,
nil
());
tableB
.
insert
(
"value6"
,
nil
());
mapA
.
set
(
1
,
1
);
mapA
.
set
(
2
,
2
);
...
...
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
Info
<<
wordHashSet
(
setA
)
<<
endl
;
Info
<<
"create from HashTable<T>: "
;
Info
<<
wordHashSet
(
tableA
)
<<
endl
;
Info
<<
"create from HashTable<
empty
>: "
;
Info
<<
"create from HashTable<
nil
>: "
;
Info
<<
wordHashSet
(
tableB
)
<<
endl
;
Info
<<
"create from Map<label>: "
;
...
...
applications/test/HashTable/hashTableTest.C
View file @
30964be5
...
...
@@ -100,12 +100,12 @@ int main()
<<
"
\n
table2"
<<
table1
<<
nl
<<
"
\n
table3"
<<
table3
<<
nl
;
Info
<<
"
\n
delet
e table2"
<<
nl
;
Info
<<
"
\n
eras
e table2
by iterator
"
<<
nl
;
forAllIter
(
HASHTABLE_CLASS
<
double
>
,
table2
,
iter
)
{
Info
<<
"
delet
ing "
<<
iter
.
key
()
<<
" => "
<<
iter
()
<<
" ... "
;
Info
<<
"
eras
ing "
<<
iter
.
key
()
<<
" => "
<<
iter
()
<<
" ... "
;
table2
.
erase
(
iter
);
Info
<<
"
delet
ed"
<<
endl
;
Info
<<
"
eras
ed"
<<
endl
;
}
Info
<<
"
\n
table1"
<<
table1
<<
nl
...
...
@@ -134,6 +134,24 @@ int main()
table1
.
erase
(
table1
.
begin
());
Info
<<
"removed an element - test table1 != table3 : "
<<
(
table1
!=
table3
)
<<
nl
;
// insert a few things into table2
table2
.
set
(
"ada"
,
14
.
0
);
table2
.
set
(
"aeq"
,
15
.
0
);
table2
.
set
(
"aaw"
,
16
.
0
);
table2
.
set
(
"abs"
,
17
.
0
);
table2
.
set
(
"adx"
,
20
.
0
);
Info
<<
"
\n
table1"
<<
table1
<<
nl
<<
"
\n
table2"
<<
table2
<<
nl
;
label
nErased
=
table1
.
erase
(
table2
);
Info
<<
"
\n
erase table2 keys from table1 (removed "
<<
nErased
<<
" elements)"
<<
nl
<<
"
\n
table1"
<<
table1
<<
nl
<<
"
\n
table2"
<<
table2
<<
nl
;
Info
<<
"
\n
clearStorage table3 ... "
;
table3
.
clearStorage
();
...
...
applications/test/StaticHashTable/staticHashTableTest.C
View file @
30964be5
...
...
@@ -100,13 +100,13 @@ int main()
<<
"
\n
table2"
<<
table1
<<
nl
<<
"
\n
table3"
<<
table3
<<
nl
;
Info
<<
"
\n
delet
e table2"
<<
nl
;
forAllIter
(
HASHTABLE_CLASS
<
double
>
,
table2
,
iter
)
{
Info
<<
"
delet
ing "
<<
iter
.
key
()
<<
" => "
<<
iter
()
<<
" ... "
;
table2
.
erase
(
iter
);
Info
<<
"
delet
ed"
<<
endl
;
}
Info
<<
"
\n
eras
e table2
by iterator
"
<<
nl
;
forAllIter
(
HASHTABLE_CLASS
<
double
>
,
table2
,
iter
)
{
Info
<<
"
eras
ing "
<<
iter
.
key
()
<<
" => "
<<
iter
()
<<
" ... "
;
table2
.
erase
(
iter
);
Info
<<
"
eras
ed"
<<
endl
;
}
Info
<<
"
\n
table1"
<<
table1
<<
nl
<<
"
\n
table2"
<<
table2
<<
nl
...
...
@@ -134,6 +134,24 @@ int main()
table1
.
erase
(
table1
.
begin
());
Info
<<
"removed an element - test table1 != table3 : "
<<
(
table1
!=
table3
)
<<
nl
;
// insert a few things into table2
table2
.
set
(
"ada"
,
14
.
0
);
table2
.
set
(
"aeq"
,
15
.
0
);
table2
.
set
(
"aaw"
,
16
.
0
);
table2
.
set
(
"abs"
,
17
.
0
);
table2
.
set
(
"adx"
,
20
.
0
);
Info
<<
"
\n
table1"
<<
table1
<<
nl
<<
"
\n
table2"
<<
table2
<<
nl
;
label
nErased
=
table1
.
erase
(
table2
);
Info
<<
"
\n
erase table2 keys from table1 (removed "
<<
nErased
<<
" elements)"
<<
nl
<<
"
\n
table1"
<<
table1
<<
nl
<<
"
\n
table2"
<<
table2
<<
nl
;
Info
<<
"
\n
clearStorage table3 ... "
;
table3
.
clearStorage
();
...
...
@@ -144,5 +162,4 @@ int main()
return
0
;
}
// ************************************************************************* //
Prev
1
2
3
4
5
…
17
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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