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
07e604d4
Commit
07e604d4
authored
Dec 12, 2008
by
Mark Olesen
Browse files
Merge commit 'OpenCFD/master' into olesenm
Conflicts: src/Pstream/Allwmake
parents
7467c891
c7a0f553
Changes
25
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
basicSubGrid
Foam::XiEqModels::
basicSubGrid
Description
Basic sub-grid obstacle flame-wrinking enhancement factor model.
...
...
applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
basicSubGrid
Foam::XiGModel::
basicSubGrid
Description
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
PDRDragModel
Foam::
PDRDragModel
Description
Base-class for sub-grid obstacle drag models.
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
basic
Foam::PDRDragModels::
basic
Description
Basic sub-grid obstacle drag model.
...
...
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
PDRkEpsilon
Foam::compressible::RASModels::
PDRkEpsilon
Description
Standard k-epsilon turbulence model with additional source terms
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Gulder
Foam::XiEqModels::
Gulder
Description
Simple Gulder model for XiEq based on Gulders correlation
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
View file @
07e604d4
...
...
@@ -23,10 +23,10 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
SCOPEBlend
Foam::XiEqModels::
SCOPEBlend
Description
SourceFiles
SCOPEBlend.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
SCOPEXiEq
Foam::XiEqModel::
SCOPEXiEq
Description
Simple SCOPEXiEq model for XiEq based on SCOPEXiEqs correlation
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
XiEqModel
Foam::
XiEqModel
Description
Base-class for all XiEq models used by the b-XiEq combustion model.
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
View file @
07e604d4
...
...
@@ -23,10 +23,10 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
instability
Foam::XiEqModels::
instability
Description
SourceFiles
instability.C
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
KTS
Foam::XiGModels::
KTS
Description
Simple Kolmogorov time-scale model for the flame-wrinling generation rate.
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
XiGModel
Foam::
XiGModel
Description
Base-class for all Xi generation models used by the b-Xi combustion model.
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
instabilityG
Foam::XiGModels::
instabilityG
Description
Flame-surface instabilityG flame-wrinking generation rate coefficient model.
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
XiModel
Foam::
XiModel
Description
Base-class for all Xi models used by the b-Xi combustion model.
...
...
@@ -102,8 +102,6 @@ namespace Foam
Class XiModel Declaration
\*---------------------------------------------------------------------------*/
class
XiModel
{
...
...
applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
algebraic
Foam::XiModels::
algebraic
Description
Simple algebraic model for Xi based on Gulders correlation
...
...
applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
fixed
Foam::XiModels::
fixed
Description
Fixed value model for Xi.
...
...
applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
transport
Foam::XiModels::
transport
Description
Simple transport model for Xi based on Gulders correlation
...
...
applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
View file @
07e604d4
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
SCOPE
Foam::laminarFlameSpeedModels::
SCOPE
Description
Laminar flame speed obtained from the SCOPE correlation.
...
...
applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
View file @
07e604d4
...
...
@@ -74,24 +74,26 @@ int main(int argc, char *argv[])
Info
<<
"Time = "
<<
runTime
.
timeName
()
<<
nl
<<
endl
;
scalar
timeBeforeMeshUpdate
=
runTime
.
elapsedCpuTime
();
{
// Store divU from the previous mesh for the correctPhi
volScalarField
divU
=
fvc
::
div
(
phi
);
// Do any mesh changes
mesh
.
update
();
scalar
timeBeforeMeshUpdate
=
runTime
.
elapsedCpuTime
();
if
(
mesh
.
changing
())
{
Info
<<
"Execution time for mesh.update() = "
<<
runTime
.
elapsedCpuTime
()
-
timeBeforeMeshUpdate
<<
" s"
<<
endl
;
// Do any mesh changes
mesh
.
update
();
gh
=
g
&
mesh
.
C
();
ghf
=
g
&
mesh
.
Cf
();
}
if
(
mesh
.
changing
())
{
Info
<<
"Execution time for mesh.update() = "
<<
runTime
.
elapsedCpuTime
()
-
timeBeforeMeshUpdate
<<
" s"
<<
endl
;
}
if
(
mesh
.
changing
()
&&
correctPhi
)
{
//***HGW#include "correctPhi.H"
if
(
mesh
.
changing
()
&&
correctPhi
)
{
#include "correctPhi.H"
}
}
// Make the fluxes relative to the mesh motion
...
...
@@ -102,6 +104,12 @@ int main(int argc, char *argv[])
#include "meshCourantNo.H"
}
if
(
mesh
.
changing
())
{
gh
=
g
&
mesh
.
C
();
ghf
=
g
&
mesh
.
Cf
();
}
turbulence
->
correct
();
// --- Outer-corrector loop
...
...
applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
0 → 100644
View file @
07e604d4
{
#include "continuityErrs.H"
volScalarField
pcorr
(
IOobject
(
"pcorr"
,
runTime
.
timeName
(),
mesh
,
IOobject
::
NO_READ
,
IOobject
::
NO_WRITE
),
mesh
,
dimensionedScalar
(
"pcorr"
,
pd
.
dimensions
(),
0
.
0
),
pcorrTypes
);
dimensionedScalar
rAUf
(
"(1|A(U))"
,
dimTime
/
rho
.
dimensions
(),
1
.
0
);
adjustPhi
(
phi
,
U
,
pcorr
);
for
(
int
nonOrth
=
0
;
nonOrth
<=
nNonOrthCorr
;
nonOrth
++
)
{
fvScalarMatrix
pcorrEqn
(
fvm
::
laplacian
(
rAUf
,
pcorr
)
==
fvc
::
div
(
phi
)
-
divU
);
pcorrEqn
.
solve
();
if
(
nonOrth
==
nNonOrthCorr
)
{
phi
-=
pcorrEqn
.
flux
();
}
}
#include "continuityErrs.H"
}
Prev
1
2
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