Commit 37d2ad71 authored by Dave Moxey's avatar Dave Moxey

Update regression tests

parent 798924b4
......@@ -151,8 +151,10 @@ namespace Nektar
std::ofstream m_flowrateStream;
/// Interval at which to record flowrate data
int m_flowrateSteps;
/// Value of aii_dt used to compute Stokes flowrate solution.
NekDouble m_flowrateAiidt;
void SetupFlowrate();
void SetupFlowrate(NekDouble aii_dt);
NekDouble MeasureFlowrate(
const Array<OneD, Array<OneD, NekDouble> > &inarray);
......
......@@ -9,16 +9,16 @@
</files>
<metrics>
<metric type="L2" id="1">
<value variable="u" tolerance="1e-12">8.7003e-16</value>
<value variable="v" tolerance="1e-12">1.18471e-15</value>
<value variable="w" tolerance="1e-12">8.94953e-07</value>
<value variable="p" tolerance="1e-8">1.91856e-15</value>
<value variable="u" tolerance="1e-12">0</value>
<value variable="v" tolerance="1e-12">0</value>
<value variable="w" tolerance="1e-12">6.57092e-15</value>
<value variable="p" tolerance="1e-8">0</value>
</metric>
<metric type="Linf" id="2">
<value variable="u" tolerance="1e-12">5.70037e-15</value>
<value variable="v" tolerance="1e-12">5.63826e-15</value>
<value variable="w" tolerance="1e-12">2.77108e-06</value>
<value variable="p" tolerance="1e-8">9.82442e-15</value>
<value variable="u" tolerance="1e-12">2.93546e-18</value>
<value variable="v" tolerance="1e-12">2.93958e-18</value>
<value variable="w" tolerance="1e-12">2.37588e-14</value>
<value variable="p" tolerance="1e-8">2.74618e-17</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8"?>
<NEKTAR>
<EXPANSIONS>
<E COMPOSITE="C[0]" NUMMODES="6" FIELDS="u,v,w,p" TYPE="MODIFIED" />
<E COMPOSITE="C[0]" NUMMODES="4" FIELDS="u,v,w,p" TYPE="MODIFIED" />
</EXPANSIONS>
<CONDITIONS>
<SOLVERINFO>
......@@ -14,11 +14,11 @@
</SOLVERINFO>
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 100 </P>
<P> IO_CheckSteps = 1000 </P>
<P> IO_InfoSteps = 1000 </P>
<P> Kinvis = 1/200 </P>
<P> Kinvis = 1 </P>
<P> HomModesZ = 8 </P>
<P> LZ = 1.0 </P>
<P> Flowrate = 1.0 </P>
......@@ -58,16 +58,10 @@
</REGION>
</BOUNDARYCONDITIONS>
<FUNCTION NAME="FlowrateForce">
<E VAR="ForceX" VALUE="0" />
<E VAR="ForceY" VALUE="0" />
<E VAR="ForceZ" VALUE="1" />
</FUNCTION>
<FUNCTION NAME="InitialConditions">
<E VAR="u" VALUE="0" />
<E VAR="v" VALUE="0" />
<E VAR="w" VALUE="6*y*(1-y)" />
<E VAR="w" VALUE="0" />
<E VAR="p" VALUE="0" />
</FUNCTION>
......
......@@ -9,16 +9,16 @@
</files>
<metrics>
<metric type="L2" id="1">
<value variable="u" tolerance="1e-12">1.54851e-15</value>
<value variable="v" tolerance="1e-12">1.92039e-15</value>
<value variable="w" tolerance="1e-12">8.94953e-07</value>
<value variable="p" tolerance="1e-8">3.23051e-15</value>
<value variable="u" tolerance="1e-12">0</value>
<value variable="v" tolerance="1e-12">0</value>
<value variable="w" tolerance="1e-12">7.58667e-15</value>
<value variable="p" tolerance="1e-8">0</value>
</metric>
<metric type="Linf" id="2">
<value variable="u" tolerance="1e-12">9.74693e-15</value>
<value variable="v" tolerance="1e-12">7.87791e-15</value>
<value variable="w" tolerance="1e-12">2.77108e-06</value>
<value variable="p" tolerance="1e-8">1.64691e-14</value>
<value variable="u" tolerance="1e-12">1.76842e-18</value>
<value variable="v" tolerance="1e-12">1.77358e-18</value>
<value variable="w" tolerance="1e-12">3.01981e-14</value>
<value variable="p" tolerance="1e-8">2.08802e-17</value>
</metric>
</metrics>
</test>
......@@ -9,14 +9,14 @@
</files>
<metrics>
<metric type="L2" id="1">
<value variable="u" tolerance="1e-12">7.66614e-11</value>
<value variable="v" tolerance="1e-12">4.52553e-12</value>
<value variable="p" tolerance="1e-8">7.0151e-09</value>
<value variable="u" tolerance="1e-12">9.00299e-13</value>
<value variable="v" tolerance="1e-12">1.72538e-12</value>
<value variable="p" tolerance="1e-8">5.92475e-10</value>
</metric>
<metric type="Linf" id="2">
<value variable="u" tolerance="1e-12">1.1156e-10</value>
<value variable="v" tolerance="1e-12">1.17928e-11</value>
<value variable="p" tolerance="1e-8">8.32526e-09</value>
<value variable="u" tolerance="1e-12">2.27274e-12</value>
<value variable="v" tolerance="1e-12">3.14404e-12</value>
<value variable="p" tolerance="1e-8">9.17508e-10</value>
</metric>
</metrics>
</test>
......@@ -10,15 +10,15 @@
<metrics>
<metric type="L2" id="1">
<value variable="u" tolerance="1e-12">0</value>
<value variable="v" tolerance="1e-12">0</value>
<value variable="w" tolerance="1e-12">1.13277e-15</value>
<value variable="p" tolerance="1e-8">4.56093e-14</value>
<value variable="v" tolerance="1e-12">5.94828e-16</value>
<value variable="w" tolerance="1e-12">1.34946e-15</value>
<value variable="p" tolerance="1e-8">9.43679e-14</value>
</metric>
<metric type="Linf" id="2">
<value variable="u" tolerance="1e-12">1.48905e-16</value>
<value variable="v" tolerance="1e-12">3.12187e-16</value>
<value variable="w" tolerance="1e-12">1.90958e-14</value>
<value variable="p" tolerance="1e-8">5.11546e-14</value>
<value variable="u" tolerance="1e-12">3.76927e-16</value>
<value variable="v" tolerance="1e-12">1.70832e-15</value>
<value variable="w" tolerance="1e-12">1.93179e-14</value>
<value variable="p" tolerance="1e-8">1.49283e-13</value>
</metric>
</metrics>
</test>
......@@ -154,7 +154,7 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
<I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
</SOLVERINFO>
<PARAMETERS>
......
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