GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
2311 changed files with 44974 additions and 26547 deletions

View File

@ -420,7 +420,7 @@ int main(int argc, char *argv[])
instantList times = timeSelector::selectIfPresent(runTime, args);
if (times.size() < 1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No times selected." << exit(FatalError);
}
runTime.setTime(times[0], 0);
@ -653,7 +653,7 @@ int main(int argc, char *argv[])
}
else
{
WarningIn(args.executable())
WarningInFunction
<< "Requested field to change " << fieldName
<< " does not exist in " << fieldHeader.path() << endl;
}