Commit 860e7df5 authored by Mark Olesen's avatar Mark Olesen
Browse files

ENH: use DetailInfo for fileOperation I/O information

- allows suppression when the banner is suppressed
parent 16e8d294
......@@ -153,12 +153,12 @@ then
# - libPVFoamReader_SM = (OPENFOAM <= 1912)
case "$plugin" in
blockReader)
(blockReader)
for libName in \
ParaFoamBlockReader \
libParaFoamBlockReader \
libPVblockMeshReader_SM \
;
;
do
if [ -f "$PV_PLUGIN_PATH/$libName.so" ]
then
......@@ -166,13 +166,13 @@ then
break
fi
done
;;
foamReader)
;;
(foamReader)
for libName in \
ParaFoamReader \
libParaFoamReader \
libPVFoamReader_SM \
;
;
do
if [ -f "$PV_PLUGIN_PATH/$libName.so" ]
then
......@@ -180,7 +180,7 @@ then
break
fi
done
;;
;;
esac
if [ -n "$pluginError" ]
......@@ -329,22 +329,22 @@ else
# Check existence of essential files
warn=false
case "$plugin" in
blockReader)
blockMeshDict=system/blockMeshDict
if [ -f constant/polyMesh/blockMeshDict ]
then
blockMeshDict=constant/polyMesh/blockMeshDict
fi
(blockReader)
blockMeshDict=system/blockMeshDict
if [ -f constant/polyMesh/blockMeshDict ]
then
blockMeshDict=constant/polyMesh/blockMeshDict
fi
hasFiles system/controlDict "$blockMeshDict" || warn=true
;;
hasFiles system/controlDict "$blockMeshDict" || warn=true
;;
foamReader)
hasFiles \
system/controlDict \
"$fvControls/fvSchemes" \
"$fvControls/fvSolution" || warn=true
;;
(foamReader)
hasFiles \
system/controlDict \
"$fvControls/fvSchemes" \
"$fvControls/fvSolution" || warn=true
;;
esac
[ "${warn:-false}" = false ] || {
......
......@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017-2018 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -273,20 +274,23 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
if (verbose)
{
Info<< "I/O : " << typeName
DetailInfo
<< "I/O : " << typeName
<< " (maxThreadFileBufferSize " << maxThreadFileBufferSize
<< ')' << endl;
if (maxThreadFileBufferSize == 0)
{
Info<< " Threading not activated "
DetailInfo
<< " Threading not activated "
"since maxThreadFileBufferSize = 0." << nl
<< " Writing may run slowly for large file sizes."
<< endl;
}
else
{
Info<< " Threading activated "
DetailInfo
<< " Threading activated "
"since maxThreadFileBufferSize > 0." << nl
<< " Requires large enough buffer to collect all data"
" or thread support " << nl
......@@ -308,12 +312,15 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
}
Pstream::gatherList(ioRanks);
Info<< " IO nodes:" << nl;
DetailInfo
<< " IO nodes:" << nl;
for (const string& ranks : ioRanks)
{
if (!ranks.empty())
{
Info<< " " << ranks << nl;
DetailInfo
<< " " << ranks << nl;
}
}
}
......@@ -360,20 +367,23 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
if (verbose)
{
Info<< "I/O : " << typeName
DetailInfo
<< "I/O : " << typeName
<< " (maxThreadFileBufferSize " << maxThreadFileBufferSize
<< ')' << endl;
if (maxThreadFileBufferSize == 0)
{
Info<< " Threading not activated "
DetailInfo
<< " Threading not activated "
"since maxThreadFileBufferSize = 0." << nl
<< " Writing may run slowly for large file sizes."
<< endl;
}
else
{
Info<< " Threading activated "
DetailInfo
<< " Threading activated "
"since maxThreadFileBufferSize > 0." << nl
<< " Requires large enough buffer to collect all data"
" or thread support " << nl
......
......@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017-2018 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -774,7 +774,7 @@ masterUncollatedFileOperation
if (verbose)
{
Info
DetailInfo
<< "I/O : " << typeName
<< " (maxMasterFileBufferSize " << maxMasterFileBufferSize << ')'
<< endl;
......@@ -820,7 +820,7 @@ masterUncollatedFileOperation
if (verbose)
{
Info
DetailInfo
<< "I/O : " << typeName
<< " (maxMasterFileBufferSize " << maxMasterFileBufferSize << ')'
<< endl;
......
......@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......
Markdown is supported
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