songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Mark Olesen 2023-08-24 14:35:02 +02:00
parent 81475e3be1
commit d9f3dd00ff
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
View File

@ -216,6 +216,8 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::setFaceZoneFaces()
refPtr<OSstream> os;
bool fatal = false;
++nWarnings_; // Always increment (even if ignore etc)
switch (emptySurfaceError_)
{
case error::handlerTypes::IGNORE:
@ -225,7 +227,7 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::setFaceZoneFaces()
case error::handlerTypes::WARN:
{
if (++nWarnings_ <= maxWarnings)
if (nWarnings_ <= maxWarnings)
{
os.ref(WarningInFunction);
}
@ -370,10 +372,12 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::setPatchFaces()
if (!nFaces_)
{
// Raise warning or error
refPtr<OSstream> os;
bool fatal = false;
// Raise warning or error
++nWarnings_; // Always increment (even if ignore etc)
switch (emptySurfaceError_)
{
case error::handlerTypes::IGNORE:
@ -383,7 +387,7 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::setPatchFaces()
case error::handlerTypes::WARN:
{
if (++nWarnings_ <= maxWarnings)
if (nWarnings_ <= maxWarnings)
{
os.ref(WarningInFunction);
}
@ -716,6 +720,8 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::update()
refPtr<OSstream> os;
bool fatal = false;
++nWarnings_; // Always increment (even if ignore etc)
switch (emptySurfaceError_)
{
case error::handlerTypes::IGNORE:
@ -725,7 +731,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::update()
case error::handlerTypes::WARN:
{
if (++nWarnings_ <= maxWarnings)
if (nWarnings_ <= maxWarnings)
{
os.ref(WarningInFunction);
}
@ -765,7 +771,11 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::update()
<< " total area = " << totalArea_ << nl
<< endl;
writeFileHeader(file());
// Emit file header on success or change of state
if (nWarnings_ <= 1)
{
writeFileHeader(file());
}
return true;
}
@ -1307,12 +1317,6 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
update();
if (!nFaces_)
{
// Encountered an error
return true;
}
if (operation_ != opNone)
{
writeCurrentTime(file());
@ -1320,7 +1324,15 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
if (writeArea_)
{
totalArea_ = totalArea();
// Update the area
if (!nFaces_)
{
totalArea_ = 0;
}
else
{
totalArea_ = totalArea();
}
Log << " total area = " << totalArea_ << endl;
if (operation_ != opNone && Pstream::master())
@ -1329,6 +1341,18 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
}
}
if (!nFaces_)
{
// Early exit on error
if (operation_ != opNone)
{
file() << endl;
Log << endl;
}
return true;
}
// Many operations use the Sf field
vectorField Sf;
if (usesSf())