research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

Browse source
This commit is contained in:
Henry 2014-07-11 15:50:03 +01:00
commit d65887d7b6
5 changed files with 14 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H
View file

@ -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

3
etc/config/settings.csh
View file

@ -542,6 +542,7 @@ endif
# cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~
#- keep _foamAddPath _foamAddLib _foamAddMan
unset foamCompiler minBufferSize
unset minBufferSize
unsetenv foamCompiler
# ----------------------------------------------------------------- end-of-file

4
etc/cshrc
View file

@ -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)

16
src/meshTools/algorithms/MeshWave/FaceCellWave.C
View file

@ -546,7 +546,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
sendFacesInfo
);
if (debug)
if (debug & 2)
{
Pout<< " Processor patch " << patchI << ' ' << procPatch.name()
<< " communicating with " << procPatch.neighbProcNo()
@ -581,7 +581,7 @@ void Foam::FaceCellWave<Type, TrackingData>::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<Type, TrackingData>::handleCyclicPatches()
);
}
if (debug)
if (debug & 2)
{
Pout<< " Cyclic patch " << patchI << ' ' << cycPatch.name()
<< " Changed : " << nReceiveFaces
@ -1028,7 +1028,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::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<Type, TrackingData>::cellToFace()
handleProcPatches();
}
if (debug)
if (debug & 2)
{
Pout<< " Changed faces : " << nChangedFaces_ << endl;
}
@ -1151,7 +1151,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::iterate(const label maxIter)
{
if (debug)
{
Pout<< " Iteration " << iter << endl;
Info<< " Iteration " << iter << endl;
}
nEvals_ = 0;
@ -1160,7 +1160,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::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<Type, TrackingData>::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;

34
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary
View file

@ -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;
}
)
// ************************************************************************* //