Commit bdde0e5e by Chris Cantwell

Merge branch 'fix/varP-IMEX2' into 'master'

Fix DriverAdaptive with second order IMEX

See merge request !850
parents 7d009bf6 b23b58be
......@@ -75,6 +75,7 @@ v4.4.1
- Fix available classes being listed multiple times (!817)
- Fix Intel compiler warnings (!837)
- Fix overwriting and backup of chk/fld files on slow file systes (!741)
- Fix DriverAdaptive with second order IMEX (!850)
- Fixed typo in eIMEXGear part (!854)
- Added regression tests for IMEXOrder1, IMEXOrder2, IMEXOrder3, MCNAB,
IMEXGear, CNAB, 2nd order IMEX-DIRK, 3rd order IMEX-DIRK (!854)
......
......@@ -248,6 +248,7 @@ namespace Nektar
LibUtilities::Timer timer;
bool doCheckTime = false;
int step = m_initialStep;
int stepCounter = 0;
NekDouble intTime = 0.0;
NekDouble lastCheckTime = 0.0;
NekDouble cpuTime = 0.0;
......@@ -283,7 +284,7 @@ namespace Nektar
}
fields = m_intScheme->TimeIntegrate(
step, m_timestep, m_intSoln, m_ode);
stepCounter, m_timestep, m_intSoln, m_ode);
timer.Stop();
m_time += m_timestep;
......@@ -395,6 +396,7 @@ namespace Nektar
// Step advance
++step;
++stepCounter;
}
// Print out summary statistics
......
......@@ -113,6 +113,7 @@ IF( NEKTAR_SOLVER_INCNAVIERSTOKES )
ADD_NEKTAR_TEST(ChanFlow_Standard_BodyForce)
ADD_NEKTAR_TEST(Cyl_AdaptiveSFD)
ADD_NEKTAR_TEST(Womersley_PipeFlow)
ADD_NEKTAR_TEST(CylFlow_adaptiveP LENGTHY)
ADD_NEKTAR_TEST(CylFlow_Mov_mapping)
ADD_NEKTAR_TEST(PPF_R10000_ModifiedArnoldi_Shift)
ADD_NEKTAR_TEST(PPF_R15000_ModifiedArnoldi_Shift)
......
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>2D cylinder flow simulation using adaptive polynomial order</description>
<executable>IncNavierStokesSolver</executable>
<parameters>CylFlow_adaptiveP.xml</parameters>
<files>
<file description="Session File">CylFlow_adaptiveP.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value variable="u" tolerance="1e-12">21.4162</value>
<value variable="v" tolerance="1e-12">0.911291</value>
<value variable="p" tolerance="1e-12">0.875288</value>
</metric>
<metric type="Linf" id="2">
<value variable="u" tolerance="1e-12">1.76892</value>
<value variable="v" tolerance="1e-12">0.837794</value>
<value variable="p" tolerance="1e-12">1.29043</value>
</metric>
</metrics>
</test>
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 sign in to comment