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
10373183
Commit
10373183
authored
May 12, 2011
by
andy
Browse files
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
parents
b6465899
88d1e99e
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
ReleaseNotes-dev
View file @
10373183
...
...
@@ -120,6 +120,8 @@
+ reuses tracking state in interpolation - improves consistency and speed
*** *Updated* split cyclics into two separate patches.
See [[./doc/changes/splitCyclic.txt]]
* *New* cyclics (and all coupled patches) have optional
matchTolerance entry to allow looser area matching tolerance.
* *Updated* interpolation (volPointInterpolation) now works without the
globalPointPatch. Moving mesh cases can now be run non-parallel and
continued in parallel and reconstructed without any limitation.
...
...
@@ -264,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
...
...
@@ -312,8 +312,3 @@
* Other
+ compilable with =clang=
In your prefs.sh set the WM_COMPILER to Clang
+ dlclose error: upon exit of e.g. paraFoam you can get the error
Inconsistency detected by ld.so: dl-close.c: 731: _dl_close: Assertion
`map->l_init_called' failed!
This seems to happen with a mix of system libraries and a thirdParty
compiler.
applications/solvers/DNS/dnsFoam/createFields.H
View file @
10373183
...
...
@@ -26,4 +26,4 @@
mesh
);
#
include "createPhi.H"
#
include
"createPhi.H"
applications/solvers/DNS/dnsFoam/dnsFoam.C
View file @
10373183
...
...
@@ -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/basic/laplacianFoam/laplacianFoam.C
View file @
10373183
...
...
@@ -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
...
...
@@ -30,6 +30,7 @@ Description
\*---------------------------------------------------------------------------*/
#include
"fvCFD.H"
#include
"simpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -41,17 +42,17 @@ int main(int argc, char *argv[])
#include
"createMesh.H"
#include
"createFields.H"
simpleControl
simple
(
mesh
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info
<<
"
\n
Calculating temperature distribution
\n
"
<<
endl
;
while
(
runTim
e
.
loop
())
while
(
simpl
e
.
loop
())
{
Info
<<
"Time = "
<<
runTime
.
timeName
()
<<
nl
<<
endl
;
#include
"readSIMPLEControls.H"
for
(
int
nonOrth
=
0
;
nonOrth
<=
nNonOrthCorr
;
nonOrth
++
)
for
(
int
nonOrth
=
0
;
nonOrth
<=
simple
.
nNonOrthCorr
();
nonOrth
++
)
{
solve
(
...
...
applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
View file @
10373183
...
...
@@ -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
...
...
@@ -30,32 +30,30 @@ Description
\*---------------------------------------------------------------------------*/
#include
"fvCFD.H"
#include
"simpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int
main
(
int
argc
,
char
*
argv
[])
{
#include
"setRootCase.H"
#include
"createTime.H"
#include
"createMesh.H"
#include
"createFields.H"
#
include "setRootCase.H"
simpleControl
simple
(
mesh
);
# include "createTime.H"
# include "createMesh.H"
# include "createFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info
<<
"
\n
Calculating scalar transport
\n
"
<<
endl
;
#
include "CourantNo.H"
#
include
"CourantNo.H"
while
(
runTim
e
.
loop
())
while
(
simpl
e
.
loop
())
{
Info
<<
"Time = "
<<
runTime
.
timeName
()
<<
nl
<<
endl
;
# include "readSIMPLEControls.H"
for
(
int
nonOrth
=
0
;
nonOrth
<=
nNonOrthCorr
;
nonOrth
++
)
for
(
int
nonOrth
=
0
;
nonOrth
<=
simple
.
nNonOrthCorr
();
nonOrth
++
)
{
solve
(
...
...
applications/solvers/combustion/PDRFoam/PDRFoam.C
View file @
10373183
...
...
@@ -53,6 +53,18 @@ Description
PDR (porosity/distributed resistance) modelling is included to handle
regions containing blockages which cannot be resolved by the mesh.
The fields used by this solver are:
betav: Volume porosity
Lobs: Average diameter of obstacle in cell (m)
Aw: Obstacle surface area per unit volume (1/m)
CR: Drag tensor (1/m)
CT: Turbulence generation parameter (1/m)
Nv: Number of obstacles in cell per unit volume (m^-2)
nsv: Tensor whose diagonal indicates the number to substract from
Nv to get the number of obstacles crossing the flow in each
direction.
\*---------------------------------------------------------------------------*/
#include
"fvCFD.H"
...
...
@@ -64,6 +76,7 @@ Description
#include
"ignition.H"
#include
"Switch.H"
#include
"bound.H"
#include
"pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -81,6 +94,8 @@ int main(int argc, char *argv[])
#include
"compressibleCourantNo.H"
#include
"setInitialDeltaT.H"
pimpleControl
pimple
(
mesh
);
scalar
StCoNum
=
0
.
0
;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -90,7 +105,6 @@ int main(int argc, char *argv[])
while
(
runTime
.
run
())
{
#include
"readTimeControls.H"
#include
"readPISOControls.H"
#include
"compressibleCourantNo.H"
#include
"setDeltaT.H"
...
...
@@ -98,26 +112,34 @@ int main(int argc, char *argv[])
Info
<<
"
\n\n
Time = "
<<
runTime
.
timeName
()
<<
endl
;
#include
"rhoEqn.H"
#include
"UEqn.H"
// --- P
ISO
loop
for
(
int
corr
=
1
;
corr
<=
nCorr
;
corr
++
)
// --- P
ressure-velocity PIMPLE corrector
loop
for
(
pimple
.
start
();
pimple
.
loop
();
pimple
++
)
{
#include
"bEqn.H"
#include
"ftEqn.H"
#include
"huEqn.H"
#include
"hEqn.H"
#include
"UEqn.H"
if
(
!
ign
.
ignited
())
// --- PISO loop
for
(
int
corr
=
1
;
corr
<=
pimple
.
nCorr
();
corr
++
)
{
hu
==
h
;
#include
"bEqn.H"
#include
"ftEqn.H"
#include
"huEqn.H"
#include
"hEqn.H"
if
(
!
ign
.
ignited
())
{
hu
==
h
;
}
#include
"pEqn.H"
}
#include
"pEqn.H"
if
(
pimple
.
turbCorr
())
{
turbulence
->
correct
();
}
}
turbulence
->
correct
();
runTime
.
write
();
Info
<<
"
\n
ExecutionTime = "
...
...
applications/solvers/combustion/PDRFoam/UEqn.H
View file @
10373183
...
...
@@ -9,7 +9,7 @@
volSymmTensorField
invA
(
inv
(
I
*
UEqn
.
A
()
+
drag
->
Dcu
()));
if
(
momentumPredictor
)
if
(
pimple
.
momentumPredictor
()
)
{
U
=
invA
&
(
UEqn
.
H
()
-
betav
*
fvc
::
grad
(
p
));
U
.
correctBoundaryConditions
();
...
...
applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
View file @
10373183
...
...
@@ -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 @
10373183
...
...
@@ -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/pEqn.H
View file @
10373183
...
...
@@ -3,7 +3,7 @@ rho = thermo.rho();
volScalarField
rAU
(
1
.
0
/
UEqn
.
A
());
U
=
invA
&
UEqn
.
H
();
if
(
transonic
)
if
(
pimple
.
transonic
()
)
{
surfaceScalarField
phid
(
...
...
@@ -15,7 +15,7 @@ if (transonic)
)
);
for
(
int
nonOrth
=
0
;
nonOrth
<=
nNonOrthCorr
;
nonOrth
++
)
for
(
int
nonOrth
=
0
;
nonOrth
<=
pimple
.
nNonOrthCorr
()
;
nonOrth
++
)
{
fvScalarMatrix
pEqn
(
...
...
@@ -24,9 +24,12 @@ if (transonic)
-
fvm
::
laplacian
(
rho
*
invA
,
p
)
);
pEqn
.
solve
();
pEqn
.
solve
(
mesh
.
solver
(
p
.
select
(
pimple
.
finalInnerIter
(
corr
,
nonOrth
)))
);
if
(
nonOrth
==
nNonOrthCorr
)
if
(
nonOrth
==
pimple
.
nNonOrthCorr
()
)
{
phi
==
pEqn
.
flux
();
}
...
...
@@ -41,7 +44,7 @@ else
+
fvc
::
ddtPhiCorr
(
rAU
,
rho
,
U
,
phi
)
);
for
(
int
nonOrth
=
0
;
nonOrth
<=
nNonOrthCorr
;
nonOrth
++
)
for
(
int
nonOrth
=
0
;
nonOrth
<=
pimple
.
nNonOrthCorr
()
;
nonOrth
++
)
{
fvScalarMatrix
pEqn
(
...
...
@@ -50,9 +53,12 @@ else
-
fvm
::
laplacian
(
rho
*
invA
,
p
)
);
pEqn
.
solve
();
pEqn
.
solve
(
mesh
.
solver
(
p
.
select
(
pimple
.
finalInnerIter
(
corr
,
nonOrth
)))
);
if
(
nonOrth
==
nNonOrthCorr
)
if
(
nonOrth
==
pimple
.
nNonOrthCorr
()
)
{
phi
+=
pEqn
.
flux
();
}
...
...
applications/solvers/combustion/XiFoam/UEqn.H
View file @
10373183
...
...
@@ -9,7 +9,7 @@
UEqn
.
relax
();
if
(
momentumPredictor
)
if
(
pimple
.
momentumPredictor
()
)
{
solve
(
UEqn
==
-
fvc
::
grad
(
p
));
}
applications/solvers/combustion/XiFoam/XiFoam.C
View file @
10373183
...
...
@@ -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
...
...
@@ -55,6 +55,7 @@ Description
#include
"laminarFlameSpeed.H"
#include
"ignition.H"
#include
"Switch.H"
#include
"pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -72,6 +73,8 @@ int main(int argc, char *argv[])
#include
"compressibleCourantNo.H"
#include
"setInitialDeltaT.H"
pimpleControl
pimple
(
mesh
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info
<<
"
\n
Starting time loop
\n
"
<<
endl
;
...
...
@@ -79,17 +82,17 @@ int main(int argc, char *argv[])
while
(
runTime
.
run
())
{
#include
"readTimeControls.H"
#include
"readPISOControls.H"
#include
"compressibleCourantNo.H"
#include
"setDeltaT.H"
runTime
++
;
Info
<<
"Time = "
<<
runTime
.
timeName
()
<<
nl
<<
endl
;
#include
"rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for
(
int
oCorr
=
0
;
oCorr
<
nOuterCorr
;
oCorr
++
)
for
(
pimple
.
start
();
pimple
.
loop
();
pimple
++
)
{
#include
"rhoEqn.H"
#include
"UEqn.H"
#include
"ftEqn.H"
...
...
@@ -103,12 +106,15 @@ int main(int argc, char *argv[])
}
// --- PISO loop
for
(
int
corr
=
1
;
corr
<
=
nCorr
;
corr
++
)
for
(
int
corr
=
0
;
corr
<
pimple
.
nCorr
()
;
corr
++
)
{
#include
"pEqn.H"
}
turbulence
->
correct
();
if
(
pimple
.
turbCorr
())
{
turbulence
->
correct
();
}
}
rho
=
thermo
.
rho
();
...
...
applications/solvers/combustion/XiFoam/pEqn.H
View file @
10373183
...
...
@@ -3,7 +3,7 @@ rho = thermo.rho();
volScalarField
rAU
(
1
.
0
/
UEqn
.
A
());
U
=
rAU
*
UEqn
.
H
();
if
(
transonic
)
if
(
pimple
.
transonic
()
)
{
surfaceScalarField
phid
(
...
...
@@ -15,7 +15,7 @@ if (transonic)
)
);
for
(
int
nonOrth
=
0
;
nonOrth
<=
nNonOrthCorr
;
nonOrth
++
)
for
(
int
nonOrth
=
0
;
nonOrth
<=
pimple
.
nNonOrthCorr
()
;
nonOrth
++
)
{
fvScalarMatrix
pEqn
(
...
...
@@ -24,9 +24,12 @@ if (transonic)
-
fvm
::
laplacian
(
rho
*
rAU
,
p
)
);
pEqn
.
solve
();
pEqn
.
solve
(
mesh
.
solver
(
p
.
select
(
pimple
.
finalInnerIter
(
corr
,
nonOrth
)))
);
if
(
nonOrth
==
nNonOrthCorr
)
if
(
nonOrth
==
pimple
.
nNonOrthCorr
()
)
{
phi
==
pEqn
.
flux
();
}
...
...
@@ -41,7 +44,7 @@ else
+
fvc
::
ddtPhiCorr
(
rAU
,
rho
,
U
,
phi
)
);
for
(
int
nonOrth
=
0
;
nonOrth
<=
nNonOrthCorr
;
nonOrth
++
)
for
(
int
nonOrth
=
0
;
nonOrth
<=
pimple
.
nNonOrthCorr
()
;
nonOrth
++
)
{
fvScalarMatrix
pEqn
(
...
...
@@ -50,9 +53,12 @@ else
-
fvm
::
laplacian
(
rho
*
rAU
,
p
)
);
pEqn
.
solve
();
pEqn
.
solve
(
mesh
.
solver
(
p
.
select
(
pimple
.
finalInnerIter
(
corr
,
nonOrth
)))
);
if
(
nonOrth
==
nNonOrthCorr
)
if
(
nonOrth
==
pimple
.
nNonOrthCorr
()
)
{
phi
+=
pEqn
.
flux
();
}
...
...
applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
View file @
10373183
...
...
@@ -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
...
...
@@ -35,6 +35,7 @@ Description
#include
"basicPsiThermo.H"
#include
"turbulenceModel.H"
#include
"OFstream.H"
#include
"pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -51,13 +52,14 @@ int main(int argc, char *argv[])
#include
"setInitialDeltaT.H"
#include
"startSummary.H"
pimpleControl
pimple
(
mesh
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info
<<
"
\n
Starting time loop
\n
"
<<
endl
;
while
(
runTime
.
run
())
{
#include
"readPISOControls.H"
#include
"readEngineTimeControls.H"
#include
"compressibleCourantNo.H"
#include
"setDeltaT.H"
...
...
@@ -71,17 +73,24 @@ int main(int argc, char *argv[])
#include
"rhoEqn.H"
#include
"UEqn.H"
// --- PISO loop
for
(
int
corr
=
1
;
corr
<=
nCorr
;
corr
++
)
// --- Pressure-velocity PIMPLE corrector loop
for
(
pimple
.
start
();
pimple
.
loop
();
pimple
++
)
{
#include
"hEqn.H"
#include
"pEqn.H"
#include
"UEqn.H"
// --- PISO loop
for
(
int
corr
=
1
;
corr
<=
pimple
.
nCorr
();
corr
++
)
{
#include
"hEqn.H"
#include
"pEqn.H"
}
if
(
pimple
.
turbCorr
())
{
turbulence
->
correct
();
}
}
turbulence
->
correct
();
runTime
.
write
();
#include
"logSummary.H"
...
...
applications/solvers/combustion/dieselEngineFoam/UEqn.H
View file @
10373183
...
...
@@ -8,7 +8,7 @@
+
dieselSpray
.
momentumSource
()
);
if
(
momentumPredictor
)
if
(
pimple
.
momentumPredictor
()
)
{
solve
(
UEqn
==
-
fvc
::
grad
(
p
));
}
applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
View file @
10373183
...
...
@@ -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
...
...
@@ -43,6 +43,7 @@ Description
#include
"volPointInterpolation.H"
#include
"thermoPhysicsTypes.H"
#include
"mathematicalConstants.H"
#include
"pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -61,13 +62,14 @@ int main(int argc, char *argv[])
#include
"setInitialDeltaT.H"
#include
"startSummary.H"
pimpleControl
pimple
(
mesh
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info
<<
"
\n
Starting time loop
\n
"
<<
endl
;
while
(
runTime
.
run
())
{
#include
"readPISOControls.H"
#include
"readEngineTimeControls.H"
#include
"compressibleCourantNo.H"
#include
"setDeltaT.H"
...
...
@@ -77,10 +79,6 @@ int main(int argc, char *argv[])
Info
<<
"Crank angle = "
<<
runTime
.
theta
()
<<
" CA-deg"
<<
endl
;
mesh
.
move
();
const_cast
<
volPointInterpolation
&>
(
volPointInterpolation
::
New
(
mesh
)
).
updateMesh
();
dieselSpray
.
evolve
();
...
...
@@ -106,22 +104,26 @@ int main(int argc, char *argv[])
chemistrySh
=
kappa
*
chemistry
.
Sh
()();
#include
"rhoEqn.H"
#include
"UEqn.H"
for
(
label
ocorr
=
1
;
ocorr
<=
nOuterCorr
;
ocorr
++
)
for
(
pimple
.
start
();
pimple
.
loop
();
pimple
++
)
{
#include
"UEqn.H"
#include
"YEqn.H"
#include
"hsEqn.H"
// --- PISO loop
for
(
int
corr
=
1
;
corr
<=
nCorr
;
corr
++
)
for
(
int
corr
=
1
;
corr
<=
pimple
.
nCorr
()
;
corr
++
)
{
#include
"pEqn.H"
}
}
turbulence
->
correct
();
if
(
pimple
.
turbCorr
())
{
turbulence
->
correct
();
}
}
#include
"logSummary.H"
#include
"spraySummary.H"
...
...
applications/solvers/combustion/dieselEngineFoam/pEqn.H
View file @
10373183
...
...
@@ -3,7 +3,7 @@ rho = thermo.rho();
volScalarField
A
(
UEqn
.
A
());
U
=
UEqn
.
H
()
/
A
;
if
(
transonic
)
if
(
pimple
.
transonic
()
)
{
surfaceScalarField
phid
(
...
...
@@ -12,7 +12,7 @@ if (transonic)
*
((
fvc
::
interpolate
(
U
)
&
mesh
.
Sf
())
-
fvc
::
meshPhi
(
rho
,
U
))
);
for
(
int
nonOrth
=
0
;
nonOrth<