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 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2014-02-11 11:58:17 +00:00
parent 0c102c35bd 9a4968f122
commit 39ea2c80a3
9 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -938,7 +938,9 @@ void Foam::refinementSurfaces::findNearestIntersection
surface1 = -1; surface1 = -1;
hit1.setSize(start.size()); hit1.setSize(start.size());
region1.setSize(start.size()); region1.setSize(start.size());
region1 = -1;
normal1.setSize(start.size()); normal1.setSize(start.size());
normal1 = vector::zero;
// Current end of segment to test. // Current end of segment to test.
pointField nearest(end); pointField nearest(end);

8
src/parallel/decompose/Allwmake
View File

@ -49,10 +49,12 @@ then
then then
#- Bit of a hack: ptscotch 6 requires scotch linked as well as. Can be #- Bit of a hack: ptscotch 6 requires scotch linked as well as. Can be
# removed once ptscotch declares dependency on scotch itself. # removed once ptscotch declares dependency on scotch itself.
if [ "$SCOTCH_VERSION" = "scotch_6.0.0" ] case "$SCOTCH_VERSION" in
then scotch_6.*)
export LINK_FLAGS="-lscotch" export LINK_FLAGS="-lscotch"
fi ;;
esac
wmakeMpiLib ptscotchDecomp wmakeMpiLib ptscotchDecomp
fi fi

2
tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict
View File

@ -272,7 +272,7 @@ castellatedMeshControls
// section reachable from the locationInMesh is kept. // section reachable from the locationInMesh is kept.
// NOTE: This point should never be on a face, always inside a cell, even // NOTE: This point should never be on a face, always inside a cell, even
// after refinement. // after refinement.
locationInMesh (0 -0.5 0); locationInMesh (0.01 -0.5 0.01);
// Whether any faceZones (as specified in the refinementSurfaces) // Whether any faceZones (as specified in the refinementSurfaces)

2
tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
View File

@ -37,7 +37,7 @@ writeFormat binary;
writePrecision 6; writePrecision 6;
writeCompression compressed; writeCompression off;
timeFormat general; timeFormat general;

BIN
tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz
View File

Binary file not shown.

BIN
tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz
View File

Binary file not shown.

2
tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
View File

@ -3,6 +3,6 @@ cd ${0%/*} || exit 1 # run from this directory
foamCleanTutorials cases foamCleanTutorials cases
rm -rf processor* rm -rf processor*
rm -rf 0/p_rgh.gz 0/p.gz 0/alpha.water.gz 0/T.gz rm -rf 0/p_rgh 0/p 0/alpha.water 0/T 0/T.air 0/T.water
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

4
tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
View File

@ -33,11 +33,11 @@ writeInterval 0.005;
purgeWrite 0; purgeWrite 0;
writeFormat ascii; writeFormat binary;
writePrecision 8; writePrecision 8;
writeCompression compressed; writeCompression off;
timeFormat general; timeFormat general;

2
tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict
View File

@ -272,7 +272,7 @@ castellatedMeshControls
// section reachable from the locationInMesh is kept. // section reachable from the locationInMesh is kept.
// NOTE: This point should never be on a face, always inside a cell, even // NOTE: This point should never be on a face, always inside a cell, even
// after refinement. // after refinement.
locationInMesh (0 -0.5 0); locationInMesh (0.01 -0.5 0.01);
// Whether any faceZones (as specified in the refinementSurfaces) // Whether any faceZones (as specified in the refinementSurfaces)