zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-dev-OpenCFD into develop

Browse Source
This commit is contained in:
mattijs
2015-12-15 21:32:13 +00:00
parent 4a8abe78f5 193893a8a6
commit 8326eae30d
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
View File

@ -34,6 +34,7 @@
)/(mesh.magSf().boundaryField()*rhorAUf.boundaryField()) )/(mesh.magSf().boundaryField()*rhorAUf.boundaryField())
); );
while (simple.correctNonOrthogonal()) while (simple.correctNonOrthogonal())
{ {
fvScalarMatrix p_rghEqn fvScalarMatrix p_rghEqn
@ -64,9 +65,12 @@
p = p_rgh + rho*gh; p = p_rgh + rho*gh;
dimensionedScalar compressibility = fvc::domainIntegrate(psi);
bool compressible = (compressibility.value() > SMALL);
// For closed-volume cases adjust the pressure level // For closed-volume cases adjust the pressure level
// to obey overall mass continuity // to obey overall mass continuity
if (closedVolume) if (closedVolume && compressible)
{ {
p += (initialMass - fvc::domainIntegrate(psi*p)) p += (initialMass - fvc::domainIntegrate(psi*p))
/fvc::domainIntegrate(psi); /fvc::domainIntegrate(psi);

13
tutorials/mesh/foamyHexMesh/simpleShapes/Allrun
View File

@ -4,26 +4,21 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions # Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication surfaceOrient \ runApplication -log log.surfaceOrient.cone surfaceOrient \
constant/triSurface/cone.stl \ constant/triSurface/cone.stl \
-inside '(0 -0.5 0)' \ -inside '(0 -0.5 0)' \
constant/triSurface/cone_orient.stl constant/triSurface/cone_orient.stl
mv log.surfaceOrient log.surfaceOrient.cone
runApplication surfaceOrient \ runApplication -log log.surfaceOrient.sphere surfaceOrient \
constant/triSurface/sphere.stl \ constant/triSurface/sphere.stl \
-inside '(0 -0.5 0)' \ -inside '(0 -0.5 0)' \
constant/triSurface/sphere_orient.stl constant/triSurface/sphere_orient.stl
mv log.surfaceOrient log.surfaceOrient.sphere
runApplication surfaceBooleanFeatures intersection \ runApplication surfaceBooleanFeatures intersection cone_orient.stl sphere_orient.stl
constant/triSurface/cone_orient.stl \
constant/triSurface/sphere_orient.stl
runApplication foamyHexMesh runApplication foamyHexMesh
runApplication collapseEdges -latestTime -collapseFaceSet indirectPatchFaces runApplication -log log.collapseFaceSet collapseEdges -latestTime -collapseFaceSet indirectPatchFaces
mv log.collapseEdges log.collapseFaceSet
runApplication collapseEdges -latestTime -collapseFaces runApplication collapseEdges -latestTime -collapseFaces