diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C index 8d4180d6b7..ea43fb6f88 100644 --- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C +++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -938,7 +938,9 @@ void Foam::refinementSurfaces::findNearestIntersection surface1 = -1; hit1.setSize(start.size()); region1.setSize(start.size()); + region1 = -1; normal1.setSize(start.size()); + normal1 = vector::zero; // Current end of segment to test. pointField nearest(end); diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake index e6d0a1dee5..54508f1122 100755 --- a/src/parallel/decompose/Allwmake +++ b/src/parallel/decompose/Allwmake @@ -49,10 +49,12 @@ then then #- Bit of a hack: ptscotch 6 requires scotch linked as well as. Can be # removed once ptscotch declares dependency on scotch itself. - if [ "$SCOTCH_VERSION" = "scotch_6.0.0" ] - then + case "$SCOTCH_VERSION" in + scotch_6.*) export LINK_FLAGS="-lscotch" - fi + ;; + esac + wmakeMpiLib ptscotchDecomp fi diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict index a4a51a6460..3b8fcd4536 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict @@ -272,7 +272,7 @@ castellatedMeshControls // section reachable from the locationInMesh is kept. // NOTE: This point should never be on a face, always inside a cell, even // after refinement. - locationInMesh (0 -0.5 0); + locationInMesh (0.01 -0.5 0.01); // Whether any faceZones (as specified in the refinementSurfaces) diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict index b78ee601a8..f6f1aa2f31 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict @@ -37,7 +37,7 @@ writeFormat binary; writePrecision 6; -writeCompression compressed; +writeCompression off; timeFormat general; diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz deleted file mode 100644 index df712a5aac..0000000000 Binary files a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.air.gz and /dev/null differ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz deleted file mode 100644 index e8108f6bab..0000000000 Binary files a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.water.gz and /dev/null differ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean index f33fd89a62..36e5712426 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean @@ -3,6 +3,6 @@ cd ${0%/*} || exit 1 # run from this directory foamCleanTutorials cases 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 diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict index 0fa4ae9a77..bb61973589 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.005; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 8; -writeCompression compressed; +writeCompression off; timeFormat general; diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict index a4a51a6460..3b8fcd4536 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict @@ -272,7 +272,7 @@ castellatedMeshControls // section reachable from the locationInMesh is kept. // NOTE: This point should never be on a face, always inside a cell, even // after refinement. - locationInMesh (0 -0.5 0); + locationInMesh (0.01 -0.5 0.01); // Whether any faceZones (as specified in the refinementSurfaces)