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
d3b12e79
Commit
d3b12e79
authored
May 15, 2011
by
mattijs
Browse files
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
parents
6b81feca
1bb78656
Changes
501
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
d3b12e79
...
...
@@ -60,6 +60,8 @@ doc/[Dd]oxygen/man
# untracked configuration files
/etc/prefs.csh
/etc/prefs.sh
/etc/config/*.csh
/etc/config/*.sh
# source packages - anywhere
*.tar.bz2
...
...
ReleaseNotes-dev
View file @
d3b12e79
...
...
@@ -266,8 +266,6 @@
internal field instead of boundary field.
+ =ensight=: new output format for all sampledSurfaces.
+ Function objects:
+ =residualControl=: new function object to allow users to terminate steady
state calculations when the defined residual levels are achieved
+ =abortCalculation=: watches for presence of the named file in the
$FOAM_CASE directory and aborts the calculation if it is present
+ =timeActivatedFileUpdate=: performs a file copy/replacement once a
...
...
applications/solvers/DNS/dnsFoam/createFields.H
View file @
d3b12e79
...
...
@@ -26,4 +26,4 @@
mesh
);
#
include "createPhi.H"
#
include "createPhi.H"
applications/solvers/DNS/dnsFoam/dnsFoam.C
View file @
d3b12e79
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -110,7 +110,12 @@ int main(int argc, char *argv[])
if
(
runTime
.
outputTime
())
{
calcEk
(
U
,
K
).
write
(
runTime
.
timePath
()
/
"Ek"
,
runTime
.
graphFormat
());
calcEk
(
U
,
K
).
write
(
runTime
.
path
()
/
"graphs"
/
runTime
.
timeName
(),
"Ek"
,
runTime
.
graphFormat
()
);
}
Info
<<
"ExecutionTime = "
<<
runTime
.
elapsedCpuTime
()
<<
" s"
...
...
applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
View file @
d3b12e79
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C)
1991
-2011 OpenCFD Ltd.
\\ / A nd | Copyright (C)
2004
-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
View file @
d3b12e79
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C)
1991
-2011 OpenCFD Ltd.
\\ / A nd | Copyright (C)
2004
-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
applications/solvers/combustion/reactingFoam/chemistry.H
View file @
d3b12e79
if
(
chemistry
.
chemistry
())
{
Info
<<
"Solving chemistry"
<<
endl
;
...
...
@@ -10,17 +11,29 @@
// turbulent time scale
if
(
turbulentReaction
)
{
volScalarField
tk
(
Cmix
*
sqrt
(
turbulence
->
muEff
()
/
rho
/
turbulence
->
epsilon
())
);
volScalarField
tc
(
chemistry
.
tc
()
);
tmp
<
volScalarField
>
tepsilon
(
turbulence
->
epsilon
());
const
volScalarField
&
epsilon
=
tepsilon
();
tmp
<
volScalarField
>
tmuEff
(
turbulence
->
muEff
());
const
volScalarField
&
muEff
=
tmuEff
();
tmp
<
volScalarField
>
ttc
(
chemistry
.
tc
());
const
volScalarField
&
tc
=
ttc
();
// Chalmers PaSR model
kappa
=
(
runTime
.
deltaT
()
+
tc
)
/
(
runTime
.
deltaT
()
+
tc
+
tk
);
forAll
(
epsilon
,
i
)
{
if
(
epsilon
[
i
]
>
0
)
{
// Chalmers PaSR model
scalar
tk
=
Cmix
.
value
()
*
Foam
::
sqrt
(
muEff
[
i
]
/
rho
[
i
]
/
epsilon
[
i
]);
kappa
[
i
]
=
(
runTime
.
deltaTValue
()
+
tc
[
i
])
/
(
runTime
.
deltaTValue
()
+
tc
[
i
]
+
tk
);
}
else
{
// Return to laminar combustion
kappa
[
i
]
=
1
.
0
;
}
}
}
else
{
...
...
applications/solvers/combustion/rhoReactingFoam/Make/options
View file @
d3b12e79
...
...
@@ -5,7 +5,9 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(FOAM_SOLVERS)/combustion/reactingFoam
EXE_LIBS = \
-lcompressibleTurbulenceModel \
...
...
applications/solvers/combustion/rhoReactingFoam/chemistry.H
deleted
100644 → 0
View file @
6b81feca
{
Info
<<
"Solving chemistry"
<<
endl
;
chemistry
.
solve
(
runTime
.
value
()
-
runTime
.
deltaTValue
(),
runTime
.
deltaTValue
()
);
// turbulent time scale
if
(
turbulentReaction
)
{
volScalarField
tk
(
Cmix
*
sqrt
(
turbulence
->
muEff
()
/
rho
/
turbulence
->
epsilon
())
);
volScalarField
tc
(
chemistry
.
tc
());
// Chalmers PaSR model
kappa
=
(
runTime
.
deltaT
()
+
tc
)
/
(
runTime
.
deltaT
()
+
tc
+
tk
);
}
else
{
kappa
=
1
.
0
;
}
chemistrySh
=
kappa
*
chemistry
.
Sh
()();
}
applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
View file @
d3b12e79
...
...
@@ -8,10 +8,10 @@
License
This file is part of OpenFOAM.
OpenFOAM is free software
;
you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the
Free Software Foundation
;
either version
2
of the License, or
(at your
option) any later version.
OpenFOAM is free software
:
you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the
Free Software Foundation
,
either version
3
of the License, or
(at your
option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
...
...
@@ -19,8 +19,7 @@ License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
...
...
applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
View file @
d3b12e79
...
...
@@ -19,7 +19,8 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-lfiniteVolume \
...
...
@@ -42,4 +43,5 @@ EXE_LIBS = \
-lradiationModels \
-lODE \
-lregionModels \
-lsurfaceFilmModels
-lsurfaceFilmModels \
-lsampling
applications/solvers/lagrangian/LTSReactingParcelFoam/readTimeControls.H
View file @
d3b12e79
...
...
@@ -27,13 +27,16 @@ License
scalar
maxCo
(
readScalar
(
pimple
.
dict
().
lookup
(
"maxCo"
)));
// Maximum time scale
scalar
maxDeltaT
=
readScalar
(
pimple
.
dict
().
lookup
(
"maxDeltaT"
));
scalar
maxDeltaT
(
pimple
.
dict
().
lookup
OrDefault
<
scalar
>
(
"maxDeltaT"
,
GREAT
));
// Smoothing parameter (0-1) when smoothing iterations > 0
scalar
alphaTauSmooth
(
pimple
.
dict
().
lookupOrDefault
(
"alphaTauSmooth"
,
0
.
1
));
scalar
rDeltaTSmoothingCoeff
(
pimple
.
dict
().
lookupOrDefault
<
scalar
>
(
"rDeltaTSmoothingCoeff"
,
0
.
1
)
);
// Maximum change in cell temperature per iteration (relative to previous value)
scalar
alphaT
auT
emp
(
pimple
.
dict
().
lookupOrDefault
(
"alphaT
auT
emp"
,
0
.
05
));
scalar
alphaTemp
(
pimple
.
dict
().
lookupOrDefault
(
"alphaTemp"
,
0
.
05
));
// ************************************************************************* //
applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
View file @
d3b12e79
...
...
@@ -82,7 +82,7 @@ Info<< "Time scales min/max:" << endl;
/
rho
);
tau
=
alphaT
auT
emp
*
thermo
.
Cp
()
*
T
/
(
tau
+
ROOTVSMALL
);
tau
=
alphaTemp
*
thermo
.
Cp
()
*
T
/
(
tau
+
ROOTVSMALL
);
Info
<<
" Temperature = "
<<
min
(
maxDeltaT
,
gMin
(
tau
))
<<
", "
<<
min
(
maxDeltaT
,
gMax
(
tau
))
<<
endl
;
...
...
@@ -105,7 +105,7 @@ Info<< "Time scales min/max:" << endl;
// Spatially smooth the time scale field
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fvc
::
smooth
(
rDeltaT
,
alphaTauSmooth
);
fvc
::
smooth
(
rDeltaT
,
rDeltaTSmoothingCoeff
);
Info
<<
" Overall = "
<<
min
(
1
/
rDeltaT
).
value
()
<<
", "
<<
max
(
1
/
rDeltaT
).
value
()
<<
nl
<<
endl
;
...
...
applications/solvers/lagrangian/coalChemistryFoam/Make/options
View file @
d3b12e79
...
...
@@ -19,7 +19,10 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/ODE/lnInclude
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(FOAM_SOLVERS)/combustion/reactingFoam
EXE_LIBS = \
-lfiniteVolume \
...
...
@@ -43,4 +46,5 @@ EXE_LIBS = \
-lradiationModels \
-lregionModels \
-lsurfaceFilmModels \
-lODE
-lODE \
-lsampling
applications/solvers/lagrangian/coalChemistryFoam/chemistry.H
deleted
100644 → 0
View file @
6b81feca
if
(
chemistry
.
chemistry
())
{
Info
<<
"Solving chemistry"
<<
endl
;
chemistry
.
solve
(
runTime
.
value
()
-
runTime
.
deltaTValue
(),
runTime
.
deltaTValue
()
);
// turbulent time scale
if
(
turbulentReaction
)
{
DimensionedField
<
scalar
,
volMesh
>
tk
(
Cmix
*
sqrt
(
turbulence
->
muEff
()
/
rho
/
turbulence
->
epsilon
())
);
DimensionedField
<
scalar
,
volMesh
>
tc
(
chemistry
.
tc
()().
dimensionedInternalField
()
);
// Chalmers PaSR model
kappa
=
(
runTime
.
deltaT
()
+
tc
)
/
(
runTime
.
deltaT
()
+
tc
+
tk
);
}
else
{
kappa
=
1
.
0
;
}
chemistrySh
=
kappa
*
chemistry
.
Sh
()();
}
applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
View file @
d3b12e79
...
...
@@ -14,7 +14,8 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
...
...
@@ -33,4 +34,5 @@ EXE_LIBS = \
-lsurfaceFilmModels \
-ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh
-ltopoChangerFvMesh \
-lsampling
applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
View file @
d3b12e79
...
...
@@ -12,6 +12,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-llagrangian \
...
...
@@ -26,4 +27,5 @@ EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lregionModels \
-lsurfaceFilmModels
-lsurfaceFilmModels \
-lsampling
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
View file @
d3b12e79
...
...
@@ -19,7 +19,10 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(FOAM_SOLVERS)/combustion/reactingFoam
EXE_LIBS = \
-lfiniteVolume \
...
...
@@ -42,4 +45,5 @@ EXE_LIBS = \
-lradiationModels \
-lODE \
-lregionModels \
-lsurfaceFilmModels
-lsurfaceFilmModels \
-lsampling
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H
deleted
100644 → 0
View file @
6b81feca
{
Info
<<
"Solving chemistry"
<<
endl
;
chemistry
.
solve
(
runTime
.
value
()
-
runTime
.
deltaTValue
(),
runTime
.
deltaTValue
()
);
// turbulent time scale
if
(
turbulentReaction
)
{
DimensionedField
<
scalar
,
volMesh
>
tk
(
Cmix
*
sqrt
(
turbulence
->
muEff
()
/
rho
/
turbulence
->
epsilon
())
);
DimensionedField
<
scalar
,
volMesh
>
tc
(
chemistry
.
tc
()().
dimensionedInternalField
()
);
// Chalmers PaSR model
kappa
=
(
runTime
.
deltaT
()
+
tc
)
/
(
runTime
.
deltaT
()
+
tc
+
tk
);
}
else
{
kappa
=
1
.
0
;
}
chemistrySh
=
kappa
*
chemistry
.
Sh
()();
}
applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
View file @
d3b12e79
...
...
@@ -18,7 +18,10 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/ODE/lnInclude
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(FOAM_SOLVERS)/combustion/reactingFoam
EXE_LIBS = \
-lfiniteVolume \
...
...
@@ -37,4 +40,5 @@ EXE_LIBS = \
-lradiationModels \
-lsurfaceFilmModels \
-llagrangianIntermediate \
-lODE
-lODE \
-lsampling
Prev
1
2
3
4
5
…
26
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