Commit 2a931737 authored by Spencer Sherwin's avatar Spencer Sherwin

Added in regression tests which reads in filter file. Also corrected mistake...

Added in regression tests which reads in filter file. Also corrected mistake in index in FilterFieldConvert
parent 4e94574c
......@@ -197,7 +197,7 @@ void FilterFieldConvert::v_Initialise(
{
// see if m_variables is part of pFields definition and if
// so use that field for extract
for(k = 0; k < pFields.num_elements(); ++j)
for(k = 0; k < pFields.num_elements(); ++k)
{
if(pFields[k]->GetSession()->GetVariable(k)
== m_variables[j])
......@@ -231,6 +231,11 @@ void FilterFieldConvert::v_Initialise(
m_numSamples = 1;
}
if(fieldMetaData.count("InitialTime"))
{
m_fieldMetaData["InitialTime"] = fieldMetaData["InitialTime"];
}
// Divide by scale
NekDouble scale = v_GetScale();
for (int n = 0; n < m_outFields.size(); ++n)
......
......@@ -9,14 +9,14 @@
</files>
<metrics>
<metric type="L2" id="1">
<value variable="u" tolerance="1e-12">4.70499e-05</value>
<value variable="v" tolerance="1e-12">0.000157969</value>
<value variable="p" tolerance="1e-12">0.00158632</value>
<value variable="u" tolerance="1e-12">6.73553e-05</value>
<value variable="v" tolerance="1e-12">0.000173686</value>
<value variable="p" tolerance="1e-12">4.56321e-05</value>
</metric>
<metric type="Linf" id="2">
<value variable="u" tolerance="1e-12">6.85934e-05</value>
<value variable="v" tolerance="1e-12">0.000191491</value>
<value variable="p" tolerance="1e-12">0.00500792</value>
<value variable="u" tolerance="1e-12">0.000105045</value>
<value variable="v" tolerance="1e-12">0.000240018</value>
<value variable="p" tolerance="1e-12">0.000625686</value>
</metric>
</metrics>
</test>
\ No newline at end of file
</test>
......@@ -4,7 +4,8 @@
xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
<EXPANSIONS>
<E COMPOSITE="C[0]" NUMMODES="6" FIELDS="u,v,p" TYPE="MODIFIED" />
<E COMPOSITE="C[0]" NUMMODES="6" FIELDS="u,v" TYPE="MODIFIED" />
<E COMPOSITE="C[0]" NUMMODES="5" FIELDS="p" TYPE="MODIFIEDQUADPLUS1" />
</EXPANSIONS>
<CONDITIONS>
......@@ -81,4 +82,13 @@
</COMPOSITE>
<DOMAIN> C[0] </DOMAIN>
</GEOMETRY>
<FILTERS>
<FILTER TYPE="AverageFields">
<PARAM NAME="OutputFile"> KovaFlow_m8 </PARAM>
<PARAM NAME="RestartFile"> KovaFlow_m8_avg.rst </PARAM>
<PARAM NAME="OutputFrequency">100</PARAM>
<PARAM NAME="SampleFrequency"> 10 </PARAM>
</FILTER>
</FILTERS>
</NEKTAR>
<?xml version="1.0" encoding="utf-8" ?>
<NEKTAR>
<Metadata>
<Provenance>
<GitBranch>refs/heads/fix/Averagefield_varP</GitBranch>
<GitSHA1>ded15b6c0f464a373d4b4809ec2cbfb24bf48cd4</GitSHA1>
<Hostname>Spencers-MBP-2.home</Hostname>
<NektarVersion>4.5.0</NektarVersion>
<Timestamp>23-Apr-2017 22:39:14</Timestamp>
</Provenance>
<FinalTime>0.10000000000000007</FinalTime>
<InitialTime>0</InitialTime>
<NumberOfFieldDumps>10</NumberOfFieldDumps>
</Metadata>
<ELEMENTS FIELDS="u,v,p" SHAPE="Quadrilateral" BASIS="Modified_A,Modified_A" NUMMODESPERDIR="UNIORDER:6,6" ID="0-11" COMPRESSED="B64Z-LittleEndian" BITSIZE="64">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</ELEMENTS>
</NEKTAR>
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