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
d2b84dc5
Commit
d2b84dc5
authored
Jan 08, 2013
by
andy
Browse files
ENH: Updated fieldSources->fvOptions for solvers
parent
ffb49af0
Changes
165
Hide whitespace changes
Inline
Side-by-side
applications/solvers/basic/scalarTransportFoam/Make/options
View file @
d2b84dc5
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/f
ieldSource
s/lnInclude \
-I$(LIB_SRC)/f
vOption
s/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lf
ieldSource
s \
-lf
vOption
s \
-lmeshTools \
-lsampling
applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
View file @
d2b84dc5
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
2
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -30,7 +30,7 @@ Description
\*---------------------------------------------------------------------------*/
#include
"fvCFD.H"
#include
"
IObasicSource
List.H"
#include
"
fvIOoption
List.H"
#include
"simpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
#include
"createTime.H"
#include
"createMesh.H"
#include
"createFields.H"
#include
"create
Source
s.H"
#include
"create
FvOption
s.H"
simpleControl
simple
(
mesh
);
...
...
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
+
fvm
::
div
(
phi
,
T
)
-
fvm
::
laplacian
(
DT
,
T
)
==
source
s
(
T
)
fvOption
s
(
T
)
);
}
...
...
applications/solvers/combustion/XiFoam/EaEqn.H
View file @
d2b84dc5
...
...
@@ -16,16 +16,16 @@
:
-
dpdt
)
-
fvm
::
laplacian
(
turbulence
->
alphaEff
(),
hea
)
+
source
s
(
rho
,
hea
)
+
fvOption
s
(
rho
,
hea
)
);
EaEqn
.
relax
();
source
s
.
constrain
(
EaEqn
);
fvOption
s
.
constrain
(
EaEqn
);
EaEqn
.
solve
();
source
s
.
correct
(
hea
);
fvOption
s
.
correct
(
hea
);
thermo
.
correct
();
}
applications/solvers/combustion/XiFoam/EauEqn.H
View file @
d2b84dc5
...
...
@@ -25,12 +25,12 @@ if (ign.ignited())
//+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), heau)
==
source
s
(
rho
,
heau
)
fvOption
s
(
rho
,
heau
)
);
source
s
.
constrain
(
heauEqn
);
fvOption
s
.
constrain
(
heauEqn
);
heauEqn
.
solve
();
source
s
.
correct
(
heau
);
fvOption
s
.
correct
(
heau
);
}
applications/solvers/combustion/XiFoam/Make/options
View file @
d2b84dc5
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/f
ieldSource
s/lnInclude \
-I$(LIB_SRC)/f
vOption
s/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude\
-I$(LIB_SRC)/engine/lnInclude \
...
...
@@ -12,7 +12,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lf
ieldSource
s \
-lf
vOption
s \
-lsampling \
-lmeshTools \
-lengine \
...
...
applications/solvers/combustion/XiFoam/UEqn.H
View file @
d2b84dc5
...
...
@@ -5,17 +5,17 @@
+
turbulence
->
divDevRhoReff
(
U
)
==
rho
*
g
+
source
s
(
rho
,
U
)
+
fvOption
s
(
rho
,
U
)
);
UEqn
.
relax
();
source
s
.
constrain
(
UEqn
);
fvOption
s
.
constrain
(
UEqn
);
if
(
pimple
.
momentumPredictor
())
{
solve
(
UEqn
==
-
fvc
::
grad
(
p
));
source
s
.
correct
(
U
);
fvOption
s
.
correct
(
U
);
K
=
0
.
5
*
magSqr
(
U
);
}
applications/solvers/combustion/XiFoam/XiFoam.C
View file @
d2b84dc5
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
2
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -56,7 +56,7 @@ Description
#include
"ignition.H"
#include
"Switch.H"
#include
"pimpleControl.H"
#include
"
IObasicSource
List.H"
#include
"
fvIOoption
List.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
#include
"readCombustionProperties.H"
#include
"readGravitationalAcceleration.H"
#include
"createFields.H"
#include
"create
Source
s.H"
#include
"create
FvOption
s.H"
#include
"initContinuityErrs.H"
#include
"readTimeControls.H"
#include
"compressibleCourantNo.H"
...
...
applications/solvers/combustion/XiFoam/bEqn.H
View file @
d2b84dc5
...
...
@@ -54,7 +54,7 @@ if (ign.ignited())
-
fvm
::
Sp
(
fvc
::
div
(
phiSt
),
b
)
-
fvm
::
laplacian
(
turbulence
->
alphaEff
(),
b
)
==
source
s
(
rho
,
b
)
fvOption
s
(
rho
,
b
)
);
...
...
@@ -67,11 +67,11 @@ if (ign.ignited())
// ~~~~~~~~~~~
bEqn
.
relax
();
source
s
.
constrain
(
bEqn
);
fvOption
s
.
constrain
(
bEqn
);
bEqn
.
solve
();
source
s
.
correct
(
b
);
fvOption
s
.
correct
(
b
);
Info
<<
"min(b) = "
<<
min
(
b
).
value
()
<<
endl
;
...
...
@@ -160,16 +160,16 @@ if (ign.ignited())
==
-
fvm
::
SuSp
(
-
rho
*
Rc
*
Su0
/
Su
,
Su
)
-
fvm
::
SuSp
(
rho
*
(
sigmas
+
Rc
),
Su
)
+
source
s
(
rho
,
Su
)
+
fvOption
s
(
rho
,
Su
)
);
SuEqn
.
relax
();
source
s
.
constrain
(
SuEqn
);
fvOption
s
.
constrain
(
SuEqn
);
SuEqn
.
solve
();
source
s
.
correct
(
Su
);
fvOption
s
.
correct
(
Su
);
// Limit the maximum Su
// ~~~~~~~~~~~~~~~~~~~~
...
...
@@ -247,16 +247,16 @@ if (ign.ignited())
),
Xi
)
+
source
s
(
rho
,
Xi
)
+
fvOption
s
(
rho
,
Xi
)
);
XiEqn
.
relax
();
source
s
.
constrain
(
XiEqn
);
fvOption
s
.
constrain
(
XiEqn
);
XiEqn
.
solve
();
source
s
.
correct
(
Xi
);
fvOption
s
.
correct
(
Xi
);
// Correct boundedness of Xi
// ~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
applications/solvers/combustion/XiFoam/ftEqn.H
View file @
d2b84dc5
...
...
@@ -19,12 +19,12 @@ if (composition.contains("ft"))
+
mvConvection
->
fvmDiv
(
phi
,
ft
)
-
fvm
::
laplacian
(
turbulence
->
alphaEff
(),
ft
)
==
source
s
(
rho
,
ft
)
fvOption
s
(
rho
,
ft
)
);
source
s
.
constrain
(
ftEqn
);
fvOption
s
.
constrain
(
ftEqn
);
ftEqn
.
solve
();
source
s
.
correct
(
ft
);
fvOption
s
.
correct
(
ft
);
}
applications/solvers/combustion/XiFoam/pEqn.H
View file @
d2b84dc5
...
...
@@ -16,7 +16,7 @@ if (pimple.transonic())
)
);
source
s
.
relativeFlux
(
fvc
::
interpolate
(
psi
),
phid
);
fvOption
s
.
relativeFlux
(
fvc
::
interpolate
(
psi
),
phid
);
while
(
pimple
.
correctNonOrthogonal
())
{
...
...
@@ -26,10 +26,10 @@ if (pimple.transonic())
+
fvm
::
div
(
phid
,
p
)
-
fvm
::
laplacian
(
rho
*
rAU
,
p
)
==
source
s
(
psi
,
p
,
rho
.
name
())
fvOption
s
(
psi
,
p
,
rho
.
name
())
);
source
s
.
constrain
(
pEqn
);
fvOption
s
.
constrain
(
pEqn
);
pEqn
.
solve
(
mesh
.
solver
(
p
.
select
(
pimple
.
finalInnerIter
())));
...
...
@@ -51,7 +51,7 @@ else
)
);
source
s
.
relativeFlux
(
phiHbyA
);
fvOption
s
.
relativeFlux
(
phiHbyA
);
while
(
pimple
.
correctNonOrthogonal
())
{
...
...
@@ -61,10 +61,10 @@ else
+
fvc
::
div
(
phiHbyA
)
-
fvm
::
laplacian
(
rho
*
rAU
,
p
)
==
source
s
(
psi
,
p
,
rho
.
name
())
fvOption
s
(
psi
,
p
,
rho
.
name
())
);
source
s
.
constrain
(
pEqn
);
fvOption
s
.
constrain
(
pEqn
);
pEqn
.
solve
(
mesh
.
solver
(
p
.
select
(
pimple
.
finalInnerIter
())));
...
...
@@ -80,7 +80,7 @@ else
U
=
HbyA
-
rAU
*
fvc
::
grad
(
p
);
U
.
correctBoundaryConditions
();
source
s
.
correct
(
U
);
fvOption
s
.
correct
(
U
);
K
=
0
.
5
*
magSqr
(
U
);
if
(
thermo
.
dpdt
())
...
...
applications/solvers/combustion/coldEngineFoam/Make/options
View file @
d2b84dc5
...
...
@@ -10,7 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/f
ieldSource
s/lnInclude
-I$(LIB_SRC)/f
vOption
s/lnInclude
EXE_LIBS = \
-lengine \
...
...
@@ -21,4 +21,4 @@ EXE_LIBS = \
-lspecie \
-lfiniteVolume \
-lmeshTools \
-lf
ieldSource
s
-lf
vOption
s
applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
View file @
d2b84dc5
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
2
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -35,7 +35,7 @@ Description
#include
"psiThermo.H"
#include
"turbulenceModel.H"
#include
"OFstream.H"
#include
"
IObasicSource
List.H"
#include
"
fvIOoption
List.H"
#include
"pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
#include
"createEngineTime.H"
#include
"createEngineMesh.H"
#include
"createFields.H"
#include
"create
Source
s.H"
#include
"create
FvOption
s.H"
#include
"initContinuityErrs.H"
#include
"readEngineTimeControls.H"
#include
"compressibleCourantNo.H"
...
...
applications/solvers/combustion/engineFoam/Make/options
View file @
d2b84dc5
EXE_INC = \
-I$(FOAM_SOLVERS)/combustion/XiFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/f
ieldSource
s/lnInclude \
-I$(LIB_SRC)/f
vOption
s/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/engine/lnInclude \
...
...
@@ -13,7 +13,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lf
ieldSource
s \
-lf
vOption
s \
-lsampling \
-lmeshTools \
-lengine \
...
...
applications/solvers/combustion/engineFoam/UEqn.H
View file @
d2b84dc5
...
...
@@ -4,13 +4,13 @@
+
fvm
::
div
(
phi
,
U
)
+
turbulence
->
divDevRhoReff
(
U
)
==
source
s
(
rho
,
U
)
fvOption
s
(
rho
,
U
)
);
if
(
pimple
.
momentumPredictor
())
{
solve
(
UEqn
==
-
fvc
::
grad
(
p
));
source
s
.
correct
(
U
);
fvOption
s
.
correct
(
U
);
K
=
0
.
5
*
magSqr
(
U
);
}
applications/solvers/combustion/engineFoam/engineFoam.C
View file @
d2b84dc5
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
2
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -59,7 +59,7 @@ Description
#include
"OFstream.H"
#include
"mathematicalConstants.H"
#include
"pimpleControl.H"
#include
"
IObasicSource
List.H"
#include
"
fvIOoption
List.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
#include
"createEngineMesh.H"
#include
"readCombustionProperties.H"
#include
"createFields.H"
#include
"create
Source
s.H"
#include
"create
FvOption
s.H"
#include
"initContinuityErrs.H"
#include
"readEngineTimeControls.H"
#include
"compressibleCourantNo.H"
...
...
applications/solvers/combustion/engineFoam/pEqn.H
View file @
d2b84dc5
...
...
@@ -13,7 +13,7 @@ if (pimple.transonic())
*
((
fvc
::
interpolate
(
HbyA
)
&
mesh
.
Sf
())
-
fvc
::
meshPhi
(
rho
,
U
))
);
source
s
.
relativeFlux
(
fvc
::
interpolate
(
psi
),
phid
);
fvOption
s
.
relativeFlux
(
fvc
::
interpolate
(
psi
),
phid
);
while
(
pimple
.
correctNonOrthogonal
())
{
...
...
@@ -23,10 +23,10 @@ if (pimple.transonic())
+
fvm
::
div
(
phid
,
p
)
-
fvm
::
laplacian
(
rho
*
rAU
,
p
)
==
source
s
(
psi
,
p
,
rho
.
name
())
fvOption
s
(
psi
,
p
,
rho
.
name
())
);
source
s
.
constrain
(
pEqn
);
fvOption
s
.
constrain
(
pEqn
);
pEqn
.
solve
(
mesh
.
solver
(
p
.
select
(
pimple
.
finalInnerIter
())));
...
...
@@ -45,7 +45,7 @@ else
*
((
fvc
::
interpolate
(
HbyA
)
&
mesh
.
Sf
())
-
fvc
::
meshPhi
(
rho
,
U
))
);
source
s
.
relativeFlux
(
fvc
::
interpolate
(
rho
),
phiHbyA
);
fvOption
s
.
relativeFlux
(
fvc
::
interpolate
(
rho
),
phiHbyA
);
while
(
pimple
.
correctNonOrthogonal
())
{
...
...
@@ -55,10 +55,10 @@ else
+
fvc
::
div
(
phiHbyA
)
-
fvm
::
laplacian
(
rho
*
rAU
,
p
)
==
source
s
(
psi
,
p
,
rho
.
name
())
fvOption
s
(
psi
,
p
,
rho
.
name
())
);
source
s
.
constrain
(
pEqn
);
fvOption
s
.
constrain
(
pEqn
);
pEqn
.
solve
(
mesh
.
solver
(
p
.
select
(
pimple
.
finalInnerIter
())));
...
...
@@ -74,7 +74,7 @@ else
U
=
HbyA
-
rAU
*
fvc
::
grad
(
p
);
U
.
correctBoundaryConditions
();
source
s
.
correct
(
U
);
fvOption
s
.
correct
(
U
);
K
=
0
.
5
*
magSqr
(
U
);
if
(
thermo
.
dpdt
())
...
...
applications/solvers/combustion/fireFoam/Make/options
View file @
d2b84dc5
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/f
ieldSource
s/lnInclude \
-I$(LIB_SRC)/f
vOption
s/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \
-I${LIB_SRC}/sampling/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
...
...
@@ -31,7 +31,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lf
ieldSource
s \
-lf
vOption
s \
-lmeshTools \
-lsampling \
-lcompressibleRASModels \
...
...
applications/solvers/combustion/fireFoam/UEqn.H
View file @
d2b84dc5
...
...
@@ -5,12 +5,12 @@
+
turbulence
->
divDevRhoReff
(
U
)
==
parcels
.
SU
(
U
)
+
source
s
(
rho
,
U
)
+
fvOption
s
(
rho
,
U
)
);
UEqn
.
relax
();
source
s
.
constrain
(
UEqn
);
fvOption
s
.
constrain
(
UEqn
);
if
(
pimple
.
momentumPredictor
())
{
...
...
@@ -27,6 +27,6 @@
)
);
source
s
.
correct
(
U
);
fvOption
s
.
correct
(
U
);
K
=
0
.
5
*
magSqr
(
U
);
}
applications/solvers/combustion/fireFoam/YEEqn.H
View file @
d2b84dc5
...
...
@@ -30,16 +30,16 @@ tmp<fv::convectionScheme<scalar> > mvConvection
parcels
.
SYi
(
i
,
Yi
)
+
surfaceFilm
.
Srho
(
i
)
+
combustion
->
R
(
Yi
)
+
source
s
(
rho
,
Yi
)
+
fvOption
s
(
rho
,
Yi
)
);
YiEqn
.
relax
();
source
s
.
constrain
(
YiEqn
);
fvOption
s
.
constrain
(
YiEqn
);
YiEqn
.
solve
(
mesh
.
solver
(
"Yi"
));
source
s
.
correct
(
Yi
);
fvOption
s
.
correct
(
Yi
);
Yi
.
max
(
0
.
0
);
Yt
+=
Yi
;
...
...
@@ -75,16 +75,16 @@ tmp<fv::convectionScheme<scalar> > mvConvection
+
radiation
->
Sh
(
thermo
)
+
parcels
.
Sh
(
he
)
+
surfaceFilm
.
Sh
()
+
source
s
(
rho
,
he
)
+
fvOption
s
(
rho
,
he
)
);
EEqn
.
relax
();
source
s
.
constrain
(
EEqn
);
fvOption
s
.
constrain
(
EEqn
);
EEqn
.
solve
();
source
s
.
correct
(
he
);
fvOption
s
.
correct
(
he
);
thermo
.
correct
();
...
...
applications/solvers/combustion/fireFoam/fireFoam.C
View file @
d2b84dc5
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
2
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -40,7 +40,7 @@ Description
#include
"solidChemistryModel.H"
#include
"psiCombustionModel.H"
#include
"pimpleControl.H"
#include
"
IObasicSource
List.H"
#include
"
fvIOoption
List.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
#include
"createMesh.H"
#include
"readGravitationalAcceleration.H"
#include
"createFields.H"
#include
"create
Source
s.H"
#include
"create
FvOption
s.H"
#include
"createClouds.H"
#include
"createSurfaceFilmModel.H"
#include
"createPyrolysisModel.H"
...
...
Prev
1
2
3
4
5
…
9
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