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 remote branch 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2010-03-19 11:38:24 +01:00
parent 19bfbd159a f5322b0bed
commit 31ec0ed204
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
etc/prefs.csh-EXAMPLE
View File

@ -37,16 +37,17 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Specify system compiler ## Specify system compiler
# ~~~~~~~~~~~~~~~~~~~~~~~ ## ~~~~~~~~~~~~~~~~~~~~~~~
set compilerInstall=system #set compilerInstall=system
# Specify system openmpi ## Specify system openmpi
# ~~~~~~~~~~~~~~~~~~~~~~ ## ~~~~~~~~~~~~~~~~~~~~~~
setenv WM_MPLIB SYSTEMOPENMPI #setenv WM_MPLIB SYSTEMOPENMPI
# Specify ParaView version # Specify ParaView version
# ~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~
setenv ParaView_VERSION 3.7.0 # eg, cvs/git version setenv ParaView_VERSION git # eg, cvs/git version
setenv ParaView_MAJOR 3.7
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

4
etc/prefs.sh-EXAMPLE
View File

@ -47,6 +47,6 @@ export WM_MPLIB=SYSTEMOPENMPI
# Specify ParaView version # Specify ParaView version
# ~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~
export ParaView_VERSION=3.7.0 # eg, cvs/git version export ParaView_VERSION=git # eg, cvs/git version
export ParaView_MAJOR=3.7
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

5
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
View File

@ -102,9 +102,10 @@ Foam::Map<Foam::label> Foam::autoSnapDriver::getZoneBafflePatches
FatalErrorIn("getZoneBafflePatches(const bool)") FatalErrorIn("getZoneBafflePatches(const bool)")
<< "Face " << faceI << "Face " << faceI
<< " fc:" << mesh.faceCentres()[faceI] << " fc:" << mesh.faceCentres()[faceI]
<< " is in faceZone " << " in zone " << fZone.name()
<< " is in patch "
<< mesh.boundaryMesh()[oldPatchI].name() << mesh.boundaryMesh()[oldPatchI].name()
<< " and in faceZone " << " and in patch "
<< mesh.boundaryMesh()[patchI].name() << mesh.boundaryMesh()[patchI].name()
<< abort(FatalError); << abort(FatalError);
} }