Commit d0bf2741 authored by Douglas Serson's avatar Douglas Serson
Browse files

Merge branch 'fix/SessionFunction' into 'master'

Fix session function warning

Closes #89

See merge request !905
parents 33806ae8 767d35f5
......@@ -188,6 +188,10 @@ void SessionFunction::Evaluate(std::string pFieldName,
EvaluateFld(pFieldName, pArray, pTime, domain);
}
}
else
{
ASSERTL0(false, "unknown eFunctionType");
}
if (m_toCache)
{
......@@ -217,12 +221,16 @@ std::string SessionFunction::Describe(std::string pFieldName, const int domain)
retVal = ffunc->GetExpression();
}
else if (vType == LibUtilities::eFunctionTypeFile ||
LibUtilities::eFunctionTypeTransientFile)
vType == LibUtilities::eFunctionTypeTransientFile)
{
std::string filename =
m_session->GetFunctionFilename(m_name, pFieldName, domain);
retVal = "from file " + filename;
}
else
{
ASSERTL0(false, "unknown eFunctionType");
}
return retVal;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment