ENH: Added proc no to output or min/max field function object

This commit is contained in:
andy
2012-05-04 11:23:11 +01:00
parent bd075a3c9f
commit b30ad82fc9
2 changed files with 80 additions and 13 deletions

View File

@ -157,9 +157,22 @@ void Foam::fieldMinMax::writeFileHeader()
{ {
fieldMinMaxFilePtr_() fieldMinMaxFilePtr_()
<< "# Time" << token::TAB << "field" << token::TAB << "# Time" << token::TAB << "field" << token::TAB
<< "min" << token::TAB << "position(min)" << token::TAB << "min" << token::TAB << "position(min)";
<< "max" << token::TAB << "position(max)" << token::TAB
<< endl; if (Pstream::parRun())
{
fieldMinMaxFilePtr_() << token::TAB << "proc";
}
fieldMinMaxFilePtr_()
<< token::TAB << "max" << token::TAB << "position(max)";
if (Pstream::parRun())
{
fieldMinMaxFilePtr_() << token::TAB << "proc";
}
fieldMinMaxFilePtr_() << endl;
} }
} }

View File

@ -88,16 +88,43 @@ void Foam::fieldMinMax::calcMinMaxFields
fieldMinMaxFilePtr_() fieldMinMaxFilePtr_()
<< obr_.time().value() << token::TAB << obr_.time().value() << token::TAB
<< fieldName << token::TAB << fieldName << token::TAB
<< minValue << token::TAB << minC << token::TAB << minValue << token::TAB << minC;
<< maxValue << token::TAB << maxC << endl;
if (Pstream::parRun())
{
fieldMinMaxFilePtr_() << token::TAB << minI;
}
fieldMinMaxFilePtr_()
<< token::TAB << maxValue << token::TAB << maxC;
if (Pstream::parRun())
{
fieldMinMaxFilePtr_() << token::TAB << maxI;
}
fieldMinMaxFilePtr_() << endl;
} }
if (log_) if (log_)
{ {
Info<< " min(mag(" << fieldName << ")) = " Info<< " min(mag(" << fieldName << ")) = "
<< minValue << " at position " << minC << nl << minValue << " at position " << minC;
<< " max(mag(" << fieldName << ")) = "
<< maxValue << " at position " << maxC << nl; if (Pstream::parRun())
{
Info<< " on processor " << minI;
}
Info<< nl << " max(mag(" << fieldName << ")) = "
<< maxValue << " at position " << maxC;
if (Pstream::parRun())
{
Info<< " on processor " << maxI;
}
Info<< endl;
} }
} }
break; break;
@ -142,16 +169,43 @@ void Foam::fieldMinMax::calcMinMaxFields
fieldMinMaxFilePtr_() fieldMinMaxFilePtr_()
<< obr_.time().value() << token::TAB << obr_.time().value() << token::TAB
<< fieldName << token::TAB << fieldName << token::TAB
<< minValue << token::TAB << minC << token::TAB << minValue << token::TAB << minC;
<< maxValue << token::TAB << maxC << endl;
if (Pstream::parRun())
{
fieldMinMaxFilePtr_() << token::TAB << minI;
}
fieldMinMaxFilePtr_()
<< token::TAB << maxValue << token::TAB << maxC;
if (Pstream::parRun())
{
fieldMinMaxFilePtr_() << token::TAB << maxI;
}
fieldMinMaxFilePtr_() << endl;
} }
if (log_) if (log_)
{ {
Info<< " min(" << fieldName << ") = " Info<< " min(" << fieldName << ") = "
<< minValue << " at position " << minC << nl << minValue << " at position " << minC;
<< " max(" << fieldName << ") = "
<< maxValue << " at position " << maxC << nl; if (Pstream::parRun())
{
Info<< " on processor " << minI;
}
Info<< nl << " max(" << fieldName << ") = "
<< maxValue << " at position " << maxC;
if (Pstream::parRun())
{
Info<< " on processor " << maxI;
}
Info<< endl;
} }
} }
break; break;