Commit 3d126aca authored by Mark Olesen's avatar Mark Olesen
Browse files

Merge commit 'OpenCFD/master' into olesenm

parents 28872c44 5f82861d
......@@ -59,7 +59,7 @@ manualCoeffs
}
//// Is the case distributred
//// Is the case distributed
//distributed yes;
//// Per slave (so nProcs-1 entries) the directory above the case.
//roots
......
......@@ -180,7 +180,7 @@ surfaces
triangleCut
{
// Cutingplaneusing iso surface
// Cutingplane using iso surface
type cuttingPlane;
planeType pointAndNormal;
pointAndNormalDict
......
......@@ -17,11 +17,12 @@ wmake libso lagrangian/basic
wmake libso triSurface
wmake libso edgeMesh
wmake libso surfMesh
wmake libso meshTools
wmake libso finiteVolume
decompositionAgglomeration/Allwmake
wmake libso meshTools
wmake libso finiteVolume
wmake libso sampling
wmake libso dynamicMesh
......
......@@ -5,18 +5,18 @@ set -x
wmake libso dummy
case "$WM_MPLIB" in
GAMMA)
wmake libso gamma
;;
LAM | *MPI* )
WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
set +x
echo
echo "Note: ignore spurious warnings about missing mpicxx.h headers"
set -x
wmake libso mpi
(WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso mpi)
;;
#GAMMA)
# wmake libso gamma
# ;;
esac
# ----------------------------------------------------------------- end-of-file
......@@ -317,25 +317,18 @@ Foam::autoHexMeshDriver::autoHexMeshDriver
Info<< surfaces().names()[surfI] << ':' << nl << nl;
//const triSurfaceMesh& s = surfaces()[surfI];
//const geometricSurfacePatchList& regions = s.patches();
//labelList nTrisPerRegion(surfaces().countRegions(s));
forAll(regNames, i)
{
//if (nTrisPerRegion[i] > 0)
//{
label patchI = meshRefinement::addPatch
(
mesh,
regNames[i],
wallPolyPatch::typeName
);
Info<< patchI << '\t' << regNames[i] << nl;
globalToPatch_[surfaces().globalRegion(surfI, i)] = patchI;
//}
label patchI = meshRefinement::addPatch
(
mesh,
regNames[i],
wallPolyPatch::typeName
);
Info<< patchI << '\t' << regNames[i] << nl;
globalToPatch_[surfaces().globalRegion(surfI, i)] = patchI;
}
Info<< nl;
......
......@@ -6,7 +6,7 @@ wmake libso decompositionMethods
if [ -d "$FOAM_MPI_LIBBIN" ]
then
wmake libso parMetisDecomp
(WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso parMetisDecomp)
fi
wmake libso MGridGenGamgAgglomeration
......
......@@ -52,18 +52,19 @@ void Foam::setRefCell
if (refCelli < 0 || refCelli >= field.mesh().nCells())
{
FatalErrorIn
FatalIOErrorIn
(
"void Foam::setRefCell"
"("
" const volScalarField&,"
" const dictionary&,"
" label& scalar&,"
" bool"
")"
"void Foam::setRefCell\n"
"(\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" label& scalar&,\n"
" bool\n"
")",
dict
) << "Illegal master cellID " << refCelli
<< ". Should be 0.." << field.mesh().nCells()
<< exit(FatalError);
<< exit(FatalIOError);
}
}
else
......@@ -79,36 +80,38 @@ void Foam::setRefCell
label sumHasRef = returnReduce<label>(hasRef, sumOp<label>());
if (sumHasRef != 1)
{
FatalErrorIn
FatalIOErrorIn
(
"void Foam::setRefCell"
"("
" const volScalarField&,"
" const dictionary&,"
" label& scalar&,"
" bool"
")"
"void Foam::setRefCell\n"
"(\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" label& scalar&,\n"
" bool\n"
")",
dict
)
<< "Unable to set reference cell for field " << field.name()
<< nl << " Reference point " << refPointName
<< " found on multiple domains" << nl << exit(FatalError);
<< " found on multiple domains" << nl << exit(FatalIOError);
}
}
else
{
FatalErrorIn
FatalIOErrorIn
(
"void Foam::setRefCell"
"("
" const volScalarField&,"
" const dictionary&,"
" label& scalar&,"
" bool"
")"
"void Foam::setRefCell\n"
"(\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" label& scalar&,\n"
" bool\n"
")",
dict
)
<< "Unable to set reference cell for field" << field.name() << nl
<< " Please supply either " << refCellName
<< " or " << refPointName << nl << exit(FatalError);
<< " or " << refPointName << nl << exit(FatalIOError);
}
refValue = readScalar(dict.lookup(refValueName));
......
......@@ -369,7 +369,7 @@ void Foam::isoSurface::generateTriPoints
{
const polyPatch& pp = patches[patchI];
if (pp.coupled())
if (isA<processorPolyPatch>(pp))
{
if (refCast<const processorPolyPatch>(pp).owner())
{
......
......@@ -466,12 +466,13 @@ Foam::sampledIsoSurface::sampledIsoSurface
{
if (!sampledSurface::interpolate())
{
FatalErrorIn
FatalIOErrorIn
(
"sampledIsoSurface::sampledIsoSurface"
"(const word&, const polyMesh&, const dictionary&)"
"(const word&, const polyMesh&, const dictionary&)",
dict
) << "Non-interpolated iso surface not supported since triangles"
<< " span across cells." << exit(FatalError);
<< " span across cells." << exit(FatalIOError);
}
if (zoneID_.index() != -1)
......@@ -480,14 +481,15 @@ Foam::sampledIsoSurface::sampledIsoSurface
if (mesh.boundaryMesh().findPatchID(exposedPatchName_) == -1)
{
FatalErrorIn
FatalIOErrorIn
(
"sampledIsoSurface::sampledIsoSurface"
"(const word&, const polyMesh&, const dictionary&)"
"(const word&, const polyMesh&, const dictionary&)",
dict
) << "Cannot find patch " << exposedPatchName_
<< " in which to put exposed faces." << endl
<< "Valid patches are " << mesh.boundaryMesh().names()
<< exit(FatalError);
<< exit(FatalIOError);
}
if (debug && zoneID_.index() != -1)
......
......@@ -52,7 +52,7 @@ functions
type fieldAverage;
// Where to load it from (if not already in solver)
functionObjectLibs ("libfieldAverage.so");
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
......
......@@ -52,7 +52,7 @@ functions
type fieldAverage;
// Where to load it from (if not already in solver)
functionObjectLibs ("libfieldAverage.so");
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment