GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 09:32:38 +00:00
246 changed files with 4020 additions and 788 deletions

View File

@ -149,10 +149,7 @@ void Foam::calcFvcDiv::execute()
void Foam::calcFvcDiv::end()
{
if (active_)
{
execute();
}
// Do nothing
}

View File

@ -111,10 +111,7 @@ void Foam::calcFvcGrad::execute()
void Foam::calcFvcGrad::end()
{
if (active_)
{
execute();
}
// Do nothing
}

View File

@ -114,10 +114,7 @@ void Foam::calcMag::execute()
void Foam::calcMag::end()
{
if (active_)
{
execute();
}
// Do nothing
}