diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H index 1a2b15d3..c7a4ef0c 100644 --- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H +++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::faceSelections::faceZoneSelection Description - Deselect cells not reachable from 'inside' points + Select faces from faceZone SourceFiles faceZoneSelection.C diff --git a/etc/config/settings.csh b/etc/config/settings.csh index dad1d03f..d817b428 100644 --- a/etc/config/settings.csh +++ b/etc/config/settings.csh @@ -542,6 +542,7 @@ endif # cleanup environment: # ~~~~~~~~~~~~~~~~~~~~ #- keep _foamAddPath _foamAddLib _foamAddMan -unset foamCompiler minBufferSize +unset minBufferSize +unsetenv foamCompiler # ----------------------------------------------------------------- end-of-file diff --git a/etc/cshrc b/etc/cshrc index 06d5922c..df902347 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -57,8 +57,8 @@ set foamInstall = $HOME/$WM_PROJECT if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall #- Compiler location: -# foamCompiler= system | ThirdParty (OpenFOAM) -set foamCompiler=system +# foamCompiler = system | ThirdParty (OpenFOAM) +setenv foamCompiler system #- Compiler: # WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Clang | Icc (Intel icc) diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.C b/src/meshTools/algorithms/MeshWave/FaceCellWave.C index 9b2a68fc..f254302a 100644 --- a/src/meshTools/algorithms/MeshWave/FaceCellWave.C +++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.C @@ -546,7 +546,7 @@ void Foam::FaceCellWave::handleProcPatches() sendFacesInfo ); - if (debug) + if (debug & 2) { Pout<< " Processor patch " << patchI << ' ' << procPatch.name() << " communicating with " << procPatch.neighbProcNo() @@ -581,7 +581,7 @@ void Foam::FaceCellWave::handleProcPatches() fromNeighbour >> receiveFaces >> receiveFacesInfo; } - if (debug) + if (debug & 2) { Pout<< " Processor patch " << patchI << ' ' << procPatch.name() << " communicating with " << procPatch.neighbProcNo() @@ -672,7 +672,7 @@ void Foam::FaceCellWave::handleCyclicPatches() ); } - if (debug) + if (debug & 2) { Pout<< " Cyclic patch " << patchI << ' ' << cycPatch.name() << " Changed : " << nReceiveFaces @@ -1028,7 +1028,7 @@ Foam::label Foam::FaceCellWave::faceToCell() // Handled all changed faces by now nChangedFaces_ = 0; - if (debug) + if (debug & 2) { Pout<< " Changed cells : " << nChangedCells_ << endl; } @@ -1110,7 +1110,7 @@ Foam::label Foam::FaceCellWave::cellToFace() handleProcPatches(); } - if (debug) + if (debug & 2) { Pout<< " Changed faces : " << nChangedFaces_ << endl; } @@ -1151,7 +1151,7 @@ Foam::label Foam::FaceCellWave::iterate(const label maxIter) { if (debug) { - Pout<< " Iteration " << iter << endl; + Info<< " Iteration " << iter << endl; } nEvals_ = 0; @@ -1160,7 +1160,7 @@ Foam::label Foam::FaceCellWave::iterate(const label maxIter) if (debug) { - Pout<< " Total changed cells : " << nCells << endl; + Info<< " Total changed cells : " << nCells << endl; } if (nCells == 0) @@ -1172,7 +1172,7 @@ Foam::label Foam::FaceCellWave::iterate(const label maxIter) if (debug) { - Pout<< " Total changed faces : " << nFaces << nl + Info<< " Total changed faces : " << nFaces << nl << " Total evaluations : " << nEvals_ << nl << " Remaining unvisited cells: " << nUnvisitedCells_ << nl << " Remaining unvisited faces: " << nUnvisitedFaces_ << endl; diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary deleted file mode 100644 index 76c1ea53..00000000 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -2 -( - atmosphere - { - type patch; - nFaces 1024; - startFace 93568; - } - walls - { - type wall; - nFaces 5376; - startFace 94592; - } -) - -// ************************************************************************* //