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 branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

Browse Source
This commit is contained in:
Andrew Heather
2016-12-19 14:24:44 +00:00
parent a529ced473 23a6cadfa6
commit b7d0939482
5 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -1111,6 +1111,11 @@ int main(int argc, char *argv[])
cellProcAddressing.writeOpt() = IOobject::NO_WRITE;
}
}
else
{
cellProcAddressing.writeOpt() = IOobject::NO_WRITE;
}
if (faceProcAddressing.headerOk())
{
if (faceProcAddressing.size() == mesh.nFaces())
@ -1146,6 +1151,11 @@ int main(int argc, char *argv[])
faceProcAddressing.writeOpt() = IOobject::NO_WRITE;
}
}
else
{
faceProcAddressing.writeOpt() = IOobject::NO_WRITE;
}
if (pointProcAddressing.headerOk())
{
if (pointProcAddressing.size() == mesh.nPoints())
@ -1160,20 +1170,30 @@ int main(int argc, char *argv[])
}
else
{
Info<< "Not writing consistent processor point decomposition"
Info<< "Not writing inconsistent processor point decomposition"
<< " map " << pointProcAddressing.filePath() << endl;
pointProcAddressing.writeOpt() = IOobject::NO_WRITE;
}
}
else
{
pointProcAddressing.writeOpt() = IOobject::NO_WRITE;
}
if (boundaryProcAddressing.headerOk())
{
if (boundaryProcAddressing.size() != mesh.boundaryMesh().size())
{
Info<< "Not writing consistent processor patch decomposition"
Info<< "Not writing inconsistent processor patch decomposition"
<< " map " << boundaryProcAddressing.filePath() << endl;
boundaryProcAddressing.writeOpt() = IOobject::NO_WRITE;
}
}
else
{
boundaryProcAddressing.writeOpt() = IOobject::NO_WRITE;
}

2
applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
View File

@ -16,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Write maps from renumbered back to original mesh
writeMaps true;
writeMaps false;
// Optional entry: sort cells on coupled boundaries to last for use with
// e.g. nonBlockingGaussSeidel.

40
applications/utilities/parallelProcessing/redistributePar/redistributePar.C
View File

@ -2532,14 +2532,40 @@ int main(int argc, char *argv[])
bool haveAddressing = false;
if (haveMesh[Pstream::myProcNo()])
{
haveAddressing = IOobject
// Read faces (just to know their size)
faceCompactIOList faces
(
"faceProcAddressing",
facesInstance,
meshSubDir,
runTime,
IOobject::READ_IF_PRESENT
).typeHeaderOk<labelIOList>(true);
IOobject
(
"faces",
facesInstance,
meshSubDir,
runTime,
IOobject::MUST_READ
)
);
// Check faceProcAddressing
labelIOList faceProcAddressing
(
IOobject
(
"faceProcAddressing",
facesInstance,
meshSubDir,
runTime,
IOobject::READ_IF_PRESENT
),
labelList(0)
);
if
(
faceProcAddressing.headerOk()
&& faceProcAddressing.size() == faces.size()
)
{
haveAddressing = true;
}
}
else
{

2
etc/config.csh/vtk
View File

@ -45,7 +45,7 @@ setenv MESA_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa_v
#------------------------------------------------------------------------------
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using vtk ($vtk_version) -> $VTK_ARCH_PATH"
echo "Using vtk ($vtk_version) -> $VTK_DIR"
echo "Using mesa ($mesa_version) -> $MESA_ARCH_PATH"
endif

2
etc/config.sh/vtk
View File

@ -44,7 +44,7 @@ export MESA_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa_v
#------------------------------------------------------------------------------
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
echo "Using vtk ($vtk_version) -> $VTK_ARCH_PATH" 1>&2
echo "Using vtk ($vtk_version) -> $VTK_DIR" 1>&2
echo "Using mesa ($mesa_version) -> $MESA_ARCH_PATH" 1>&2
fi