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
7ae8dc48
Commit
7ae8dc48
authored
Dec 14, 2010
by
mattijs
Browse files
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
parents
8a355a63
63e24812
Changes
46
Hide whitespace changes
Inline
Side-by-side
applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
View file @
7ae8dc48
...
...
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
+
aphiv_neg
*
(
rho_neg
*
(
e_neg
+
0
.
5
*
magSqr
(
U_neg
))
+
p_neg
)
+
aSf
*
p_pos
-
aSf
*
p_neg
;
volTensorField
tauMC
(
"tauMC"
,
mu
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)));
volTensorField
tauMC
(
"tauMC"
,
mu
*
dev2
(
Foam
::
T
(
fvc
::
grad
(
U
))));
// --- Solve density
Info
<<
max
(
rho
)
<<
" "
<<
min
(
rho
)
<<
endl
;
...
...
applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
View file @
7ae8dc48
...
...
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
+
aphiv_neg
*
(
rho_neg
*
(
e_neg
+
0
.
5
*
magSqr
(
U_neg
))
+
p_neg
)
+
aSf
*
p_pos
-
aSf
*
p_neg
;
volTensorField
tauMC
(
"tauMC"
,
mu
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)));
volTensorField
tauMC
(
"tauMC"
,
mu
*
dev2
(
Foam
::
T
(
fvc
::
grad
(
U
))));
// --- Solve density
solve
(
fvm
::
ddt
(
rho
)
+
fvc
::
div
(
phi
));
...
...
applications/utilities/surface/surfaceCheck/surfaceCheck.C
View file @
7ae8dc48
...
...
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
// write bounding box corners
if
(
args
.
optionFound
(
"blockMesh"
))
{
pointField
cornerPts
=
boundBox
(
surf
.
points
()).
corner
s
();
pointField
cornerPts
=
boundBox
(
surf
.
points
()).
point
s
();
Info
<<
"// blockMeshDict info"
<<
nl
;
...
...
etc/settings.sh
View file @
7ae8dc48
...
...
@@ -259,7 +259,8 @@ unset MPI_ARCH_PATH MPI_HOME
case
"
$WM_MPLIB
"
in
OPENMPI
)
mpi_version
=
openmpi-1.4.1
#mpi_version=openmpi-1.4.1
mpi_version
=
openmpi-1.5
export
MPI_ARCH_PATH
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER
/
$mpi_version
# Tell OpenMPI where to find its install directory
...
...
src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C
View file @
7ae8dc48
...
...
@@ -36,6 +36,7 @@ namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
UNARY_FUNCTION
(
tensor
,
tensor
,
T
,
transform
)
UNARY_FUNCTION
(
scalar
,
tensor
,
tr
,
transform
)
UNARY_FUNCTION
(
sphericalTensor
,
tensor
,
sph
,
transform
)
UNARY_FUNCTION
(
symmTensor
,
tensor
,
symm
,
transform
)
...
...
src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
View file @
7ae8dc48
...
...
@@ -49,6 +49,7 @@ namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
UNARY_FUNCTION
(
tensor
,
tensor
,
T
,
transform
)
UNARY_FUNCTION
(
scalar
,
tensor
,
tr
,
transform
)
UNARY_FUNCTION
(
sphericalTensor
,
tensor
,
sph
,
transform
)
UNARY_FUNCTION
(
symmTensor
,
tensor
,
symm
,
transform
)
...
...
src/OpenFOAM/global/argList/argList.C
View file @
7ae8dc48
...
...
@@ -736,7 +736,7 @@ Foam::argList::argList
{
Info
<<
"Slaves : "
<<
slaveProcs
<<
nl
;
if
(
roots
.
size
())
{
{
Info
<<
"Roots : "
<<
roots
<<
nl
;
}
Info
<<
"Pstream initialized with:"
<<
nl
...
...
@@ -770,7 +770,8 @@ Foam::argList::argList
if
(
bannerEnabled
)
{
Info
<<
"Monitoring run-time modified files using "
Info
<<
"fileModificationChecking : "
<<
"Monitoring run-time modified files using "
<<
regIOobject
::
fileCheckTypesNames
[
regIOobject
::
fileModificationChecking
...
...
src/OpenFOAM/meshes/boundBox/boundBox.C
View file @
7ae8dc48
...
...
@@ -111,7 +111,7 @@ Foam::boundBox::boundBox(Istream& is)
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam
::
tmp
<
Foam
::
pointField
>
Foam
::
boundBox
::
corner
s
()
const
Foam
::
tmp
<
Foam
::
pointField
>
Foam
::
boundBox
::
point
s
()
const
{
tmp
<
pointField
>
tPts
=
tmp
<
pointField
>
(
new
pointField
(
8
));
pointField
&
pt
=
tPts
();
...
...
src/OpenFOAM/meshes/boundBox/boundBox.H
View file @
7ae8dc48
...
...
@@ -177,7 +177,7 @@ public:
}
//- Return corner points in an order corresponding to a 'hex' cell
tmp
<
pointField
>
corner
s
()
const
;
tmp
<
pointField
>
point
s
()
const
;
// Query
...
...
src/lagrangian/basic/InteractionLists/InteractionLists.C
View file @
7ae8dc48
...
...
@@ -180,7 +180,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
treeBoundBox
tempTransformedBb
(
transform
.
invTransform
(
cellBbsToExchange
[
bbI
].
corner
s
())
transform
.
invTransform
(
cellBbsToExchange
[
bbI
].
point
s
())
);
treeBoundBox
extendedBb
...
...
@@ -397,7 +397,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
treeBoundBox
tempTransformedBb
(
transform
.
invTransform
(
wallFaceBbsToExchange
[
bbI
].
corner
s
())
transform
.
invTransform
(
wallFaceBbsToExchange
[
bbI
].
point
s
())
);
treeBoundBox
extendedBb
...
...
@@ -702,7 +702,7 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
(
transform
.
transform
(
allExtendedProcBbs
[
procI
].
corner
s
()
allExtendedProcBbs
[
procI
].
point
s
()
)
);
...
...
@@ -749,7 +749,7 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
(
transform
.
transform
(
allExtendedProcBbs
[
procI
].
corner
s
()
allExtendedProcBbs
[
procI
].
point
s
()
)
);
...
...
@@ -792,7 +792,7 @@ void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
(
transform
.
transform
(
allExtendedProcBbs
[
procI
].
corner
s
()
allExtendedProcBbs
[
procI
].
point
s
()
)
);
...
...
src/meshTools/octree/treeBoundBox.C
View file @
7ae8dc48
...
...
@@ -192,15 +192,19 @@ Foam::treeBoundBox::treeBoundBox(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam
::
pointField
Foam
::
treeBoundBox
::
points
()
const
Foam
::
tmp
<
Foam
::
pointField
>
Foam
::
treeBoundBox
::
points
()
const
{
pointField
points
(
8
);
tmp
<
pointField
>
tPts
=
tmp
<
pointField
>
(
new
pointField
(
8
));
pointField
&
points
=
tPts
();
forAll
(
points
,
octant
)
{
points
[
octant
]
=
corner
(
octant
);
}
return
points
;
return
tPts
;
}
...
...
src/meshTools/octree/treeBoundBox.H
View file @
7ae8dc48
...
...
@@ -191,7 +191,7 @@ public:
inline
scalar
typDim
()
const
;
//- vertex coordinates. In octant coding.
pointField
points
()
const
;
tmp
<
pointField
>
points
()
const
;
// Check
...
...
src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
View file @
7ae8dc48
...
...
@@ -134,7 +134,7 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevRhoBeff(volVectorField& U) const
{
return
(
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
muEff
()
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)))
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
muEff
()
*
dev2
(
T
(
fvc
::
grad
(
U
))))
);
}
...
...
src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
View file @
7ae8dc48
...
...
@@ -143,7 +143,7 @@ tmp<fvVectorMatrix> GenSGSStress::divDevRhoBeff(volVectorField& U) const
fvc
::
div
(
rho
()
*
B_
+
0
.
05
*
muSgs_
*
fvc
::
grad
(
U
))
+
fvc
::
laplacian
(
0
.
95
*
muSgs_
,
U
,
"laplacian(muEff,U)"
)
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
mu
()
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)))
-
fvc
::
div
(
mu
()
*
dev2
(
T
(
fvc
::
grad
(
U
))))
);
}
...
...
src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
View file @
7ae8dc48
...
...
@@ -285,7 +285,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoBeff(volVectorField& U) const
{
return
(
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
muEff
()
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)))
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
muEff
()
*
dev2
(
T
(
fvc
::
grad
(
U
))))
);
}
...
...
src/turbulenceModels/compressible/RAS/LRR/LRR.C
View file @
7ae8dc48
...
...
@@ -274,7 +274,7 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
fvc
::
div
(
rho_
*
R_
+
couplingFactor_
*
mut_
*
fvc
::
grad
(
U
))
+
fvc
::
laplacian
((
1
.
0
-
couplingFactor_
)
*
mut_
,
U
)
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
mu
()
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)))
-
fvc
::
div
(
mu
()
*
dev2
(
T
(
fvc
::
grad
(
U
))))
);
}
else
...
...
@@ -284,7 +284,7 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
fvc
::
div
(
rho_
*
R_
)
+
fvc
::
laplacian
(
mut_
,
U
)
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
mu
()
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)))
-
fvc
::
div
(
mu
()
*
dev2
(
T
(
fvc
::
grad
(
U
))))
);
}
}
...
...
src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View file @
7ae8dc48
...
...
@@ -303,7 +303,7 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
fvc
::
div
(
rho_
*
R_
+
couplingFactor_
*
mut_
*
fvc
::
grad
(
U
))
+
fvc
::
laplacian
((
1
.
0
-
couplingFactor_
)
*
mut_
,
U
)
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
mu
()
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)))
-
fvc
::
div
(
mu
()
*
dev2
(
T
(
fvc
::
grad
(
U
))))
);
}
else
...
...
@@ -313,7 +313,7 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
fvc
::
div
(
rho_
*
R_
)
+
fvc
::
laplacian
(
mut_
,
U
)
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
mu
()
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)))
-
fvc
::
div
(
mu
()
*
dev2
(
T
(
fvc
::
grad
(
U
))))
);
}
}
...
...
src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
View file @
7ae8dc48
...
...
@@ -248,7 +248,7 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
{
return
(
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
muEff
()
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)))
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
muEff
()
*
dev2
(
T
(
fvc
::
grad
(
U
))))
);
}
...
...
src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
View file @
7ae8dc48
...
...
@@ -247,7 +247,7 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff(volVectorField& U) const
{
return
(
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
muEff
()
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)))
-
fvm
::
laplacian
(
muEff
(),
U
)
-
fvc
::
div
(
muEff
()
*
dev2
(
T
(
fvc
::
grad
(
U
))))
);
}
...
...
src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
View file @
7ae8dc48
...
...
@@ -345,7 +345,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff(volVectorField& U) const
return
(
-
fvm
::
laplacian
(
muEff_
,
U
)
-
fvc
::
div
(
muEff_
*
dev2
(
fvc
::
grad
(
U
)
().
T
(
)))
-
fvc
::
div
(
muEff_
*
dev2
(
T
(
fvc
::
grad
(
U
))))
);
}
...
...
Prev
1
2
3
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