merged in current master

This commit is contained in:
Steve Plimpton
2020-01-13 10:34:31 -07:00
parent bf20d72fc3
commit e8d11931ec
2720 changed files with 221313 additions and 28584 deletions

View File

@ -40,7 +40,7 @@ namespace ATC {
// modify
// parses input commands
//--------------------------------------------------------
bool TimeFilterManager::modify(int narg, char ** arg)
bool TimeFilterManager::modify(int /* narg */, char ** arg)
{
bool foundMatch = false;
@ -210,7 +210,7 @@ namespace ATC {
}
else if (filterType_ == STEP_FILTER) {
newTimeFilter = new TimeFilterStep(*this);
}
} else newTimeFilter = NULL;
}
else { // default to return base class
newTimeFilter = new TimeFilter(*this);