diff --git a/CHANGELOG.md b/CHANGELOG.md
index b995c7bbd764743583f97c333798115da06d1d6d..73505dbf4a6e415c884b1f925987a580e74db96d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ v5.8.0
- Fixed Modified Arnoldi driver to remove discontinuities from random vectors (!2002)
- Addedd support for backing up filters output when the file name have already existis (!2006)
- Partially revert Geometry::v_ContainsPoint (!2007)
+- Make the CWIPI third-party patch work with IntelLLVM (!2053)
**CI**
- Fix CubeAllElements performance test tolerance (!1943)
@@ -41,6 +42,9 @@ v5.8.0
**PulseWaveSolver**
- Added ability to output history points (and other filters) (!2000)
+
+**Miscellaneous**
+- Deprecate use of TimeIntegrationMethod in SolverInfo (!2059)
v5.7.0
-----
diff --git a/cmake/thirdparty-patches/cwipi-disable-warnings.patch b/cmake/thirdparty-patches/cwipi-disable-warnings.patch
index 8de8b0bd7d774c3bf0a4f85588e8efe0540fa0fc..dc176a70fda286f6d8ed196e72bb16d5f3a0056c 100644
--- a/cmake/thirdparty-patches/cwipi-disable-warnings.patch
+++ b/cmake/thirdparty-patches/cwipi-disable-warnings.patch
@@ -12,7 +12,8 @@ diff -Naur cwipi-0.11.1.old/cmake/modules/default_flags.cmake cwipi-0.11.1/cmake
set (CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -fcheck=bounds -fbacktrace")
@@ -29,7 +29,7 @@
- elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+-elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
++elseif (CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
- set (CMAKE_Fortran_FLAGS "-cpp -fpic -warn -diag-disable 7712")
+ set (CMAKE_Fortran_FLAGS "-w -cpp -fpic -warn -diag-disable 7712")
@@ -39,7 +40,8 @@ diff -Naur cwipi-0.11.1.old/cmake/modules/default_flags.cmake cwipi-0.11.1/cmake
set (CMAKE_C_FLAGS_DEBUG "-O0 -g")
@@ -153,7 +153,7 @@
- elseif (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+-elseif (CMAKE_C_COMPILER_ID STREQUAL "Intel")
++elseif (CMAKE_C_COMPILER_ID MATCHES "^Intel")
- set (CMAKE_C_FLAGS "-std=gnu99 -restrict -fpic -funsigned-char -Wall -Wcheck -Wshadow -Wpointer-arith -Wmissing-prototypes -Wuninitialized -Wunused -wd869,3656,177")
+ set (CMAKE_C_FLAGS "-std=gnu99 -restrict -fpic -funsigned-char -w")
@@ -64,9 +66,10 @@ diff -Naur cwipi-0.11.1.old/cmake/modules/default_flags.cmake cwipi-0.11.1/cmake
set (CMAKE_CXX_FLAGS_RELEASE "-O3")
set (CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-@@ -253,7 +253,7 @@
+@@ -251,7 +251,7 @@
- elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
++elseif (CMAKE_CXX_COMPILER_ID MATCHES "^Intel")
- set (CMAKE_CXX_FLAGS "-std=c++11 -fpic -funsigned-char -Wall -Wcheck -Wshadow -Wpointer-arith -Wmissing-prototypes -Wuninitialized -Wunused -wd869,3656,177")
+ set (CMAKE_CXX_FLAGS "-std=c++11 -fpic -funsigned-char -w")
diff --git a/docs/tutorial b/docs/tutorial
index 9144dd9a55421c3d4f2b2109389985e852b8533a..cbd4a4ad75a44f5f2d17cc51b27cec0620b75c28 160000
--- a/docs/tutorial
+++ b/docs/tutorial
@@ -1 +1 @@
-Subproject commit 9144dd9a55421c3d4f2b2109389985e852b8533a
+Subproject commit cbd4a4ad75a44f5f2d17cc51b27cec0620b75c28
diff --git a/docs/user-guide/solvers/compressible-flow.tex b/docs/user-guide/solvers/compressible-flow.tex
index eb19c8c35670c3eb8aedf13f64205b2e59dbb4d0..df1fa5ddcd42611a8bd5e8ac18205b564255793d 100644
--- a/docs/user-guide/solvers/compressible-flow.tex
+++ b/docs/user-guide/solvers/compressible-flow.tex
@@ -294,7 +294,6 @@ Under this section it is possible to set the solver information.
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="NavierStokesImplicitCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="AdvectioType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
<I PROPERTY="UpwindType" VALUE="Roe" />
@@ -826,7 +825,6 @@ It should be noted that currently the CFS solver only supports
\begin{lstlisting}[style=XmlStyle]
<PARAMETERS>
<I PROPERTY="EQTYPE" VALUE="NavierStokesImplicitCFE" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
</PARAMETERS>
\end{lstlisting}
diff --git a/docs/user-guide/solvers/pulse-wave.tex b/docs/user-guide/solvers/pulse-wave.tex
index 85fe9acd1ff46674ae57757c71998ae5fb496955..5421613e5e1e55752cbdd6f8a8f2a990ad961fac 100644
--- a/docs/user-guide/solvers/pulse-wave.tex
+++ b/docs/user-guide/solvers/pulse-wave.tex
@@ -377,7 +377,6 @@ and other parameters are specified.
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
@@ -580,7 +579,6 @@ we use a basic Forward Euler method.
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
\end{lstlisting}
diff --git a/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3.xml b/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3.xml
index 2dd143709d79690c85497178688b41f231b40d03..dd2e2dc8438f7fa56eef456b6d278f64e65838b6 100644
--- a/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3.xml
+++ b/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3.xml
@@ -322,9 +322,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3_xml/P0000000.xml b/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3_xml/P0000000.xml
index d20905a73c01045bf423770b11d103c175f17304..d23f6e6efb03dab7246a780c7652481d13d71df6 100644
--- a/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3_xml/P0000000.xml
+++ b/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3_xml/P0000000.xml
@@ -189,8 +189,11 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P>TimeStep = 0.001</P>
<P>NumSteps = 10</P>
diff --git a/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3_xml/P0000001.xml b/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3_xml/P0000001.xml
index 9bbf603f5ddfbd6c56b40df43f32cf915239ba75..9e4de47ae55f3b0ee317b2bb7b63bac4f04bece3 100644
--- a/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3_xml/P0000001.xml
+++ b/library/Demos/Python/FieldUtils/Tests/Tet_channel_m3_xml/P0000001.xml
@@ -189,8 +189,11 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P>TimeStep = 0.001</P>
<P>NumSteps = 10</P>
diff --git a/library/Demos/Python/FieldUtils/Tests/bfs_tg.xml b/library/Demos/Python/FieldUtils/Tests/bfs_tg.xml
index 0d79b77a5b7354938f0bbd14b91ccd5e57983aaf..0b478439e2ff5bcfe6cc215405a00fe85ac4b303 100644
--- a/library/Demos/Python/FieldUtils/Tests/bfs_tg.xml
+++ b/library/Demos/Python/FieldUtils/Tests/bfs_tg.xml
@@ -1685,11 +1685,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="TransientGrowth" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> FinalTime = 0.1 </P>
<P> TimeStep = 0.005 </P>
diff --git a/library/Demos/Python/FieldUtils/Tests/chan3DH1D.xml b/library/Demos/Python/FieldUtils/Tests/chan3DH1D.xml
index 29e8afe068f76025494793c2a74f175950970334..9836ed2bc6476d98ba0cc7ff2ba4847d30ef6f04 100644
--- a/library/Demos/Python/FieldUtils/Tests/chan3DH1D.xml
+++ b/library/Demos/Python/FieldUtils/Tests/chan3DH1D.xml
@@ -12,10 +12,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/library/Demos/Python/FieldUtils/Tests/interptest.xml b/library/Demos/Python/FieldUtils/Tests/interptest.xml
index 81b271dea5cb148191036cec2c24386a13727aef..2ac78fd7a786ca655dee5aa008f638a4bcedd00c 100644
--- a/library/Demos/Python/FieldUtils/Tests/interptest.xml
+++ b/library/Demos/Python/FieldUtils/Tests/interptest.xml
@@ -28,10 +28,13 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
<I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<!-- Need to pick Delta t strategically, dont want CFL number to be too large! -->
<P>TimeStep = 1e-5</P>
diff --git a/library/Demos/Python/FieldUtils/Tests/smallmesh.xml b/library/Demos/Python/FieldUtils/Tests/smallmesh.xml
index 5aaef3d6c4ca53c37c3d42e966ebd21804a7ce8b..fa65e49f0e6da754d83fc85abb49a7bf438bfef2 100644
--- a/library/Demos/Python/FieldUtils/Tests/smallmesh.xml
+++ b/library/Demos/Python/FieldUtils/Tests/smallmesh.xml
@@ -26,8 +26,11 @@
<I PROPERTY="WeightPartitions" VALUE="NonUniform" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="TRUE" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P>OutputEvery = 1000</P>
<P>TimeStep = 1.00e-5</P>
diff --git a/library/Demos/Python/FieldUtils/Tests/taylor_vortex_2D.xml b/library/Demos/Python/FieldUtils/Tests/taylor_vortex_2D.xml
index 92396d187ad2698a6030a04437140886f5d5f922..56b4275aabdf15ed2dfbe0fe9031b0a4a136a186 100644
--- a/library/Demos/Python/FieldUtils/Tests/taylor_vortex_2D.xml
+++ b/library/Demos/Python/FieldUtils/Tests/taylor_vortex_2D.xml
@@ -40,9 +40,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0004 </P>
<P> NumSteps = 16000 </P>
diff --git a/library/Demos/Python/FieldUtils/Tests/wss_3D_periodic.xml b/library/Demos/Python/FieldUtils/Tests/wss_3D_periodic.xml
index f1511acd4f6ebbe5fd1e7723c770656fb266ca9d..d633f5692360b696ab024994557e4a309fb82e10 100644
--- a/library/Demos/Python/FieldUtils/Tests/wss_3D_periodic.xml
+++ b/library/Demos/Python/FieldUtils/Tests/wss_3D_periodic.xml
@@ -42,12 +42,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Variable" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/library/Demos/Python/MultiRegions/Tests/newsquare_2x2.xml b/library/Demos/Python/MultiRegions/Tests/newsquare_2x2.xml
index 763dbd486f15f410f4207ff22a1588064938b47b..57f57164a2f5279a2d645e1051cadcc3bce69a7e 100644
--- a/library/Demos/Python/MultiRegions/Tests/newsquare_2x2.xml
+++ b/library/Demos/Python/MultiRegions/Tests/newsquare_2x2.xml
@@ -75,9 +75,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Galerkin" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/library/SolverUtils/UnsteadySystem.cpp b/library/SolverUtils/UnsteadySystem.cpp
index b48f541e29c90c2dfdd530b4435612dc8cf20d20..6a19fb11bab25a3f6c07f4692f291753a9f6ff9f 100644
--- a/library/SolverUtils/UnsteadySystem.cpp
+++ b/library/SolverUtils/UnsteadySystem.cpp
@@ -114,6 +114,8 @@ void UnsteadySystem::v_InitObject(bool DeclareField)
}
else
{
+ std::cout << "TimeIntegrationMethod is deprecated, please use "
+ "TIMEINTEGRATIONSCHEME";
timeInt.method = m_session->GetSolverInfo("TimeIntegrationMethod");
}
diff --git a/solvers/ADRSolver/Examples/Helmholtz/Helmholtz2D_modal.xml b/solvers/ADRSolver/Examples/Helmholtz/Helmholtz2D_modal.xml
deleted file mode 120000
index ebc05f3c1700307512c44a0e6523b58cefabd8cc..0000000000000000000000000000000000000000
--- a/solvers/ADRSolver/Examples/Helmholtz/Helmholtz2D_modal.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/Helmholtz2D_modal.xml
\ No newline at end of file
diff --git a/solvers/ADRSolver/Examples/Helmholtz/Helmholtz2D_modal.xml b/solvers/ADRSolver/Examples/Helmholtz/Helmholtz2D_modal.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0a4ee89dea069423c5ef52d59a25f5c6232a7dbe
--- /dev/null
+++ b/solvers/ADRSolver/Examples/Helmholtz/Helmholtz2D_modal.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<NEKTAR>
+ <GEOMETRY DIM="2" SPACE="2">
+ <VERTEX COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJxjYEAGH/ZDaB4HmAgjVvkH9jARJqzyLHD9zFjlf8D1s0DpNDDgg+oTgutnhdKzZoLASXt0eTYobQwG7Bj62VHsZ8CQ50Ax/yOG+Zwo2kWg4gj/c2GVR4QfN1Z5hP95sMojwo8XxX0w/z/YD5Png9Ko4YeQ50fR/xFDvwCK/bDwQcgLQmnU8EXIC6GYfxMqLgB3vzCKvKADurwIVnkEEMVqPgKIQelqkXXuD6uW7IeoY4WbIw6lC225ri8ueGsPCad/8PCXgLkDpF3knz1qODEwSELpHXKtrwN3sDlAwuEyXF4KSk9yT/6Z1L1vP7Mh47KVE//A5aWh9FJe7nuq2b/tX545GKOw+yhcXgZKt6uX11xZ/9TeOt2k/d7DT3B5WSitzhvXWaVwYn/B6bh37ldfw+XloPTNtyxCPi+f2be8lf3I0X4VLi8Ppc2C7h/nDuByeL//7DRz2zdweQUofeDO3Z3PSngdWsrr76ayIdKnIpRe53Cbfc0xfgfGO745ovmM8PBVgtIpG09+LL0v4LCzV/3f/y42uLwylK4qrG9MahF02BXX2CrfxgWXV4HS3W8dvZ5E8jp09Ik+nnmYHy6vCqVNjp/U97TjdMjQL9gcns0Hl1eD0u5HvhfFajA5/OjacLPiLSL/qUPp2c/+zPhf+tX+6vuGXbPsEeZrQOnbSz7/+Pr8rf1kZ3GxK20I/ZpQOnzZFf3Qnrv2U9bfvmRgygmX14LSXuFlj94pf7PvV/ggvauEGS6vDaWZWP7PfTqDyaHT8EBBybRf8PDVgdJHbr3fvV6Z1yEtWTd80Q+E+bpQevPjvoBpYgIOxusuXj0lxAuX14PSbT6MTXNC/tp3xtqxvXzIDpfXh9I3PjbofeRiczB9dSwh6wIi/gyg9H6l1sv/8jgd9P8F/+2xRsQfAG4SGV0A</VERTEX>
+ <EDGE COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJyFlcVSA1EQRfGgISGEkAQJ7u7u7u7w/3/Bgj6bU5ViNrfu7Td9euxNRcXfURmalW9RXqW8NbRaPhVaI58OrQ1NKq8Tn74J5d2h9ZqPvEF5T2ij5idv0vzkzcqLOj+lPKk8r/PTylnHdXZrHZ552sQjz6gv9fZQnhucrHwhtEMefi60S3mncubJq05eUF6UVmldVxn/H5+Dfr3yXGdJHk5faE55v3K4A+LSb1Ce84bkuY5hee7jSGhS+ai4vB9j4uLHxcVPiIufFI/7OKV5eM+my8wxU2aO2TJzzIlHPi8e9YVQ9hX4i6HcJ/hL4jL3snjMvSJeKXQ1lP2GudY0D/x1ebgb8nA3xSPfEpf6trjsjzuhvEfwd0N57+Dvicdz2heP7+RA87CfHmoO+EehCdWPNQ/rT7Se+qk8c55pPvJzzUf9IpT/D5zLUL5XOFehfB/0v1Zf9osbcfmv3IoL504ezr36kj+oL/XHUP7DcJ5C2Z/gPKsv3/mL+rLfvYbyX4X/Ji6cd3n6f6gv+af6U/8KzWj9t7jUf9SH/BcT7CTJ</EDGE>
+ <ELEMENT>
+ <T COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJxdkEcOAkEQxIacl7DknPn/DzlQPuC5WGpZPdVVyu91w144Cxvl//XlNcNBOJfX0p6h/Lb2jOR1NB+HC+Xmn4k8clZhLY+c5JjKJyc5PvLIuQoP4VK56XMtn5yb8CiPnPS6lV9pvgtPyklfe3nkope3PP49h5fwob3cfZVXa34LnyE9cfddHj1xz0veFw/KBgAA</T>
+ <Q COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJxd0ttSQQEchXFPQUpE7BKFHKMccqpI5JCI3v8tuuhbN8vNb8ZY9jez/+HQ/+cSs3iH1xjBNN5gwXYnmMEcFm0XxQDzWLLdKV7hLd7b7sy6K/iAZYxZdxWbtju37hq2bBe37jo+2i5h3Q18st2FdXdwgG1MWncXR7ZLWXcPX2yn96/uZ3y1nd6/uvv4Zju9f3Wra4xDDOz7Kc5xgnr/6n7Hhe10r+qe4aftdK/q/sCl7XSv6lnjN65Q96qeDe5sp3tVzxfubac7V88Wf2yne1ePnnfAI+re9Rz9z6/9/g/2bB46</Q>
+ </ELEMENT>
+ <COMPOSITE>
+ <C ID="0"> Q[22-47] </C>
+ <C ID="1"> T[0-21] </C>
+ <C ID="2"> E[0-1] </C>
+ <C ID="3"> E[2-5] </C>
+ <C ID="4"> E[45] </C>
+ <C ID="5"> E[56] </C>
+ <C ID="6"> E[67] </C>
+ <C ID="7"> E[79] </C>
+ <C ID="8"> E[88] </C>
+ <C ID="9"> E[94-95] </C>
+ <C ID="10"> E[84,75,69,62,51,40,30,20,6] </C>
+ </COMPOSITE>
+ <DOMAIN> C[0,1] </DOMAIN>
+ </GEOMETRY>
+
+
+ <EXPANSIONS>
+ <E COMPOSITE="C[0]" NUMMODES="7" FIELDS="u" TYPE="MODIFIED" />
+ <E COMPOSITE="C[1]" NUMMODES="7" FIELDS="u" TYPE="MODIFIED" />
+ </EXPANSIONS>
+
+ <CONDITIONS>
+
+ <PARAMETERS>
+ <P> Lambda = 1 </P>
+ </PARAMETERS>
+
+ <SOLVERINFO>
+ <I PROPERTY="EQTYPE" VALUE="Helmholtz" />
+ <I PROPERTY="Projection" VALUE="Continuous" />
+ </SOLVERINFO>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[2] </B>
+ <B ID="1"> C[3] </B>
+ <B ID="2"> C[4] </B>
+ <B ID="3"> C[5] </B>
+ <B ID="4"> C[6] </B>
+ <B ID="5"> C[7] </B>
+ <B ID="6"> C[8] </B>
+ <B ID="7"> C[9] </B>
+ <B ID="8"> C[10] </B>
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <D VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
+ </REGION>
+ <REGION REF="1">
+ <R VAR="u" VALUE="sin(PI*x)*sin(PI*y)-PI*sin(PI*x)*cos(PI*y)"
+ PRIMCOEFF="1" />
+ </REGION>
+ <REGION REF="2">
+ <N VAR="u"
+ VALUE="(5/sqrt(61))*PI*cos(PI*x)*sin(PI*y)-(6/sqrt(61))*PI*sin(PI*x)*cos(PI*y)" />
+ </REGION>
+ <REGION REF="3">
+ <D VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
+ </REGION>
+ <REGION REF="4">
+ <D VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
+ </REGION>
+ <REGION REF="5">
+ <N VAR="u" VALUE="PI*cos(PI*x)*sin(PI*y)" />
+ </REGION>
+ <REGION REF="6">
+ <D VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
+ </REGION>
+ <REGION REF="7">
+ <R VAR="u"
+ VALUE="sin(PI*x)*sin(PI*y) + (5/sqrt(61))*PI*cos(PI*x)*sin(PI*y)+(6/sqrt(61))*PI*sin(PI*x)*cos(PI*y)"
+ PRIMCOEFF="1" />
+ </REGION>
+ <REGION REF="8">
+ <D VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+
+ <FUNCTION NAME="Forcing">
+ <E VAR="u" VALUE="-(Lambda + 2*PI*PI)*sin(PI*x)*sin(PI*y)" />
+ </FUNCTION>
+
+ <FUNCTION NAME="ExactSolution">
+ <E VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
+ </FUNCTION>
+
+ </CONDITIONS>
+
+ <GLOBALOPTIMIZATIONPARAMETERS>
+
+ <BwdTrans>
+ <DO_GLOBAL_MAT_OP VALUE="0" />
+ <DO_BLOCK_MAT_OP TRI="0" QUAD="0" />
+ </BwdTrans>
+
+ <IProductWRTBase>
+ <DO_GLOBAL_MAT_OP VALUE="0" />
+ <DO_BLOCK_MAT_OP TRI="0" QUAD="0" />
+ </IProductWRTBase>
+
+ <MassMatrixOp>
+ <DO_GLOBAL_MAT_OP VALUE="0" />
+ <DO_BLOCK_MAT_OP TRI="1" QUAD="1" />
+ </MassMatrixOp>
+
+ <HelmholtzMatrixOp>
+ <DO_GLOBAL_MAT_OP VALUE="0" />
+ <DO_BLOCK_MAT_OP TRI="1" QUAD="1" />
+ </HelmholtzMatrixOp>
+
+ </GLOBALOPTIMIZATIONPARAMETERS>
+</NEKTAR>
diff --git a/solvers/ADRSolver/Examples/UnsteadyAdvection/Advection1D_WeakDG_GLL_LAGRANGE.xml b/solvers/ADRSolver/Examples/UnsteadyAdvection/Advection1D_WeakDG_GLL_LAGRANGE.xml
deleted file mode 120000
index 362c51a624ac3bc08482873a2d6b41295945d5ab..0000000000000000000000000000000000000000
--- a/solvers/ADRSolver/Examples/UnsteadyAdvection/Advection1D_WeakDG_GLL_LAGRANGE.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/Advection1D_WeakDG_GLL_LAGRANGE.xml
\ No newline at end of file
diff --git a/solvers/ADRSolver/Examples/UnsteadyAdvection/Advection1D_WeakDG_GLL_LAGRANGE.xml b/solvers/ADRSolver/Examples/UnsteadyAdvection/Advection1D_WeakDG_GLL_LAGRANGE.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e5ed1ff8efaf44e59bd7cc8bc6997e92ee66962c
--- /dev/null
+++ b/solvers/ADRSolver/Examples/UnsteadyAdvection/Advection1D_WeakDG_GLL_LAGRANGE.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<NEKTAR>
+ <GEOMETRY DIM="1" SPACE="1">
+ <VERTEX>
+ <V ID="0"> -1.0 0.0 0.0</V>
+ <V ID="1"> -0.8 0.0 0.0</V>
+ <V ID="2"> -0.6 0.0 0.0</V>
+ <V ID="3"> -0.4 0.0 0.0</V>
+ <V ID="4"> -0.2 0.0 0.0</V>
+ <V ID="5"> 0.0 0.0 0.0</V>
+ <V ID="6"> 0.2 0.0 0.0</V>
+ <V ID="7"> 0.4 0.0 0.0</V>
+ <V ID="8"> 0.6 0.0 0.0</V>
+ <V ID="9"> 0.8 0.0 0.0</V>
+ <V ID="10"> 1.0 0.0 0.0</V>
+ </VERTEX>
+
+ <ELEMENT>
+ <S ID="0"> 0 1 </S>
+ <S ID="1"> 1 2 </S>
+ <S ID="2"> 2 3 </S>
+ <S ID="3"> 3 4 </S>
+ <S ID="4"> 4 5 </S>
+ <S ID="5"> 5 6 </S>
+ <S ID="6"> 6 7 </S>
+ <S ID="7"> 7 8 </S>
+ <S ID="8"> 8 9 </S>
+ <S ID="9"> 9 10 </S>
+ </ELEMENT>
+
+ <COMPOSITE>
+ <C ID="0"> S[0-9] </C>
+ <C ID="1"> V[0] </C>
+ <C ID="2"> V[10] </C>
+ </COMPOSITE>
+
+ <DOMAIN> C[0] </DOMAIN>
+ </GEOMETRY>
+
+ <EXPANSIONS>
+ <E COMPOSITE="C[0]" FIELDS="u" TYPE="GLL_LAGRANGE" NUMMODES="4"/>
+ </EXPANSIONS>
+
+ <CONDITIONS>
+
+ <PARAMETERS>
+ <P> FinTime = 20 </P>
+ <P> TimeStep = 0.01 </P>
+ <P> NumSteps = FinTime/TimeStep </P>
+ <P> IO_CheckSteps = 0 </P>
+ <P> IO_InfoSteps = 0 </P>
+ <P> advx = 1 </P>
+ <P> advy = 0 </P>
+ </PARAMETERS>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
+ <SOLVERINFO>
+ <I PROPERTY="EQTYPE" VALUE="UnsteadyAdvection" />
+ <I PROPERTY="Projection" VALUE="DisContinuous" />
+ <I PROPERTY="AdvectionType" VALUE="WeakDG" />
+ <I PROPERTY="UpwindType" VALUE="Upwind" />
+ </SOLVERINFO>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[1] </B>
+ <B ID="1"> C[2] </B>
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <P VAR="u" VALUE="[1]" />
+ </REGION>
+ <REGION REF="1">
+ <P VAR="u" VALUE="[0]" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+
+ <FUNCTION NAME="AdvectionVelocity">
+ <E VAR="Vx" VALUE="advx" />
+ </FUNCTION>
+
+ <FUNCTION NAME="InitialConditions">
+ <E VAR="u" VALUE="exp(-20.0*x*x)" />
+ </FUNCTION>
+
+ <FUNCTION NAME="ExactSolution">
+ <E VAR="u" VALUE="exp(-20.0*x*x)" />
+ </FUNCTION>
+
+ </CONDITIONS>
+
+</NEKTAR>
diff --git a/solvers/ADRSolver/Examples/UnsteadyDiffusion/ImDiffusion_VarCoeff.xml b/solvers/ADRSolver/Examples/UnsteadyDiffusion/ImDiffusion_VarCoeff.xml
deleted file mode 120000
index 76b7f37a02b0b25157abe0abf9a8d87dbc610c70..0000000000000000000000000000000000000000
--- a/solvers/ADRSolver/Examples/UnsteadyDiffusion/ImDiffusion_VarCoeff.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/ImDiffusion_VarCoeff.xml
\ No newline at end of file
diff --git a/solvers/ADRSolver/Examples/UnsteadyDiffusion/ImDiffusion_VarCoeff.xml b/solvers/ADRSolver/Examples/UnsteadyDiffusion/ImDiffusion_VarCoeff.xml
new file mode 100644
index 0000000000000000000000000000000000000000..01cc2bc04cef825aa68af38c75348e66eace7bef
--- /dev/null
+++ b/solvers/ADRSolver/Examples/UnsteadyDiffusion/ImDiffusion_VarCoeff.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<NEKTAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
+
+ <GEOMETRY DIM="2" SPACE="2">
+
+ <VERTEX>
+ <V ID="0"> -1.0 -1.0 0.0 </V>
+ <V ID="1"> 0.0 -1.0 0.0 </V>
+ <V ID="2"> 1.0 -1.0 0.0 </V>
+ <V ID="3"> -1.0 0.0 0.0 </V>
+ <V ID="4"> 0.0 0.0 0.0 </V>
+ <V ID="5"> 1.0 0.0 0.0 </V>
+ <V ID="6"> -1.0 1.0 0.0 </V>
+ <V ID="7"> 0.0 1.0 0.0 </V>
+ <V ID="8"> 1.0 1.0 0.0 </V>
+ </VERTEX>
+
+ <EDGE>
+ <E ID="0"> 0 1 </E>
+ <E ID="1"> 1 2 </E>
+ <E ID="2"> 0 3 </E>
+ <E ID="3"> 1 4 </E>
+ <E ID="4"> 2 5 </E>
+ <E ID="5"> 3 4 </E>
+ <E ID="6"> 4 5 </E>
+ <E ID="7"> 6 3 </E>
+ <E ID="8"> 4 7 </E>
+ <E ID="9"> 5 8 </E>
+ <E ID="10"> 6 7 </E>
+ <E ID="11"> 7 8 </E>
+ <E ID="12"> 0 4 </E>
+ <E ID="13"> 1 5 </E>
+ </EDGE>
+
+ <ELEMENT>
+ <T ID="0"> 0 3 12 </T>
+ <T ID="1"> 2 12 5 </T>
+ <T ID="2"> 1 4 13 </T>
+ <T ID="3"> 3 13 6 </T>
+ <Q ID="4"> 5 8 10 7 </Q>
+ <Q ID="5"> 8 6 9 11 </Q>
+ </ELEMENT>
+
+ <COMPOSITE>
+ <C ID="0"> T[0-3] </C>
+ <C ID="1"> Q[4-5] </C>
+ <C ID="2"> E[2,7,4,9] </C>
+ <C ID="3"> E[0,1,10,11] </C>
+ </COMPOSITE>
+
+ <DOMAIN> C[0-1] </DOMAIN>
+
+ </GEOMETRY>
+
+ <EXPANSIONS>
+ <E COMPOSITE="C[0]" NUMMODES="12" FIELDS="u" TYPE="MODIFIED" />
+ <E COMPOSITE="C[1]" NUMMODES="12" FIELDS="u" TYPE="MODIFIED" />
+ </EXPANSIONS>
+
+ <CONDITIONS>
+
+ <PARAMETERS>
+ <P> TimeStep = 0.0001 </P>
+ <P> NumSteps = 200 </P>
+ <P> FinTime = TimeStep*NumSteps</P>
+ <P> IO_CheckSteps = 200 </P>
+ <P> IO_InfoSteps = 200 </P>
+ <P> wavefreq = PI </P>
+ <P> epsilon = 1.0 </P>
+ <P> d00 = 0.5 </P>
+ <P> d11 = 2.0 </P>
+ </PARAMETERS>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
+ <SOLVERINFO>
+ <I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
+ <I PROPERTY="Projection" VALUE="Continuous" />
+ <I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
+ </SOLVERINFO>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[2] </B>
+ <B ID="1"> C[3] </B>
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <D VAR="u" VALUE="0" />
+ </REGION>
+ <REGION REF="1">
+ <N VAR="u" VALUE="0" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+
+ <FUNCTION NAME="ExactSolution">
+ <E VAR="u"
+ VALUE="exp(-(d00+d11)*wavefreq*wavefreq*FinTime)*sin(wavefreq*x)*cos(wavefreq*y)" />
+ </FUNCTION>
+
+ <FUNCTION NAME="InitialConditions">
+ <E VAR="u" VALUE="sin(wavefreq*x)*cos(wavefreq*y)" />
+ </FUNCTION>
+
+ </CONDITIONS>
+
+</NEKTAR>
+
diff --git a/solvers/ADRSolver/Examples/UnsteadyReactionDiffusion/ReactionDiffusion2D.xml b/solvers/ADRSolver/Examples/UnsteadyReactionDiffusion/ReactionDiffusion2D.xml
deleted file mode 120000
index 2d0f22c7607b8210f6eb1ee80289c96eb83b11d6..0000000000000000000000000000000000000000
--- a/solvers/ADRSolver/Examples/UnsteadyReactionDiffusion/ReactionDiffusion2D.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/ReactionDiffusion2D.xml
\ No newline at end of file
diff --git a/solvers/ADRSolver/Examples/UnsteadyReactionDiffusion/ReactionDiffusion2D.xml b/solvers/ADRSolver/Examples/UnsteadyReactionDiffusion/ReactionDiffusion2D.xml
new file mode 100644
index 0000000000000000000000000000000000000000..38f469ff9496577997b42bf1d6cfeeac4a5d3389
--- /dev/null
+++ b/solvers/ADRSolver/Examples/UnsteadyReactionDiffusion/ReactionDiffusion2D.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<NEKTAR>
+ <GEOMETRY DIM="2" SPACE="2">
+ <VERTEX COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJx9kUdOQ0EQBY2JJhkMBtvETzZgkgkmGzA5LmDJBdizQUgch0P4Fuw4go+AEBISmpmWSk/MpqVfv1/31MRi/586VzOFyv13VNsnj4Pzv3r8T96A77m/+hV4I/rJm9D/ERXfXj/jZc+b0U/eIvdPBJ6Q+xtvRf9j6SH/8pQMvA395O1y/1TgHXJ/453of36v1qo/6cCT6CfvkvfPBt4t72885SrfxZ8ecL5/Lzhz0uB8vz6Zb+/TD07/GZlvfrPg9JeT883PgKvc259BcPoZAqefYXDOGZH55mcUnH4imW9+xsDpZ1zONz8TrnIvfybB6WcKnH6mwelnRubbHnlw+pmV+eZnDpx+5uV881NwlXP9WQCnn0Vw+lkCp59lmW9+VsC5Z1Hmm59VcPpZk/PNz7qrzPVnA5x+SuD0swlOP1sy3/xsg9PPjsy3e+yC08+enG9+/EXY508ZnH4OwOnnEJx+jmS++amA08+xzDc/J+C856mcb37OXOV3f87B6ecCnH4uwennSuabn2tw+rmR+ebnFpx+7uR88/ALyo3F7gAA</VERTEX>
+ <EDGE COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJx1lGlXzVEYRyORoiQyNVyFhEoyVeg2iKRIA0UTzUVCIxVp0KSv7M3ZL+y1/vfNs/ZvnXvuuWc/50lI+P9zIKIejKiJEZXPIa2HkyL4sJj9jmg965LFrDsqZr+UiO+nivn+sYj9jms9+6aJ2TddzH4ntJ7fyxDzeyfF7Jep9ZzjlJhznBazX5bWc74zYs53Vsx+50Klfzj3eTHnviCmX7KV839yxPRFrnL+Z54Y/zHl/P+LYjznK+deCsT4vKSc+7osxtsV5dxjoRg/V5Vzv0VivF0Llfvn3q+LufcbYjwUK8dHiRgPpcrxdFOMhzLl+LslxkO58liot8V4uKMc33fFeLinnD64L8ZDhXL6o1KMn6pQuX/65oGYvnkoxsMj5fRTtRgPceX0WY0YD7XK6b86MR7qldOXj8WxUBuU069PxHh4qpw+bhTj4Zly+rtJjJ/noXL/9H2zmL5vEePhhXLew0sxHlqV805eifHQppz30y7GQ4dy3lWnGA+vlfPe3ojx0KWcd9gtxsNb5bzPd2L89ITK/fNue8W82z4xHvqV854HxHh4r5x3/kGMh0HlvP8hMR6GlTMXRsR4GFXOvBgT42FcOXNkQoyHSeXMl49i/HwKlftn7kyJ46F+FuNhWjnz6IsYD1+VM6e+ifEwo5z5NSvGw5xy5tq8GA8Lypl3i2I8fFfOHPwhxsOScubjshg/K6Fy/8zNn2Lm5i9xPNRV5czT32I8rClnzq6L8bChnPm7KcbDH+XM5S0xHraVM693xHjYVc4c3xPj4a9y5vu+GD//AMnlVQ0A</EDGE>
+ <ELEMENT>
+ <Q COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJx11FdPFGEAheFVUHpfQPrSWXpH6oJSBaXbRcCKgoWiYKMIqCD4l715z4UncW+e5N1k5puTyQQC//4u4EWM+k+Pxkt42f5Xj8FYjLPrqsdjAibafdSTMBlT7H7qqZiG6XZO9QwMYqadWz0Ls/GKnT8HczEPtVuc9XwsQD1nvPVCLLJzJVgPYbFdJ9F6CZZikqlehuWoPZOtV2Alas8U61UYRu2p61ZjDdai9kyzXof1qD3TrTdgI2rPDOtN2IwhDFpvwVbUnpnW27AdtWeW9Q68itoz23ondqH21HvYjT3Yi9ozx3ofRlB75lrvxwHUnnnWr+F11J751gdxCLVngfVhHEHtWWh9FMdQexZZv4HjqD1DOIE38RZqz2LrkziF2rPE+jTOYD+WWp/FOdSeZdbn8TZqz3Lrd/Auas8K6/fwPmrPSusP8CFqT72Hj3ABH6P2DFtfxCXUntXWl/EJas8a60/xGWrPWuvP8QVqzzrrL3EFtWe99Vf4GrVng/VVXEPtqe/PG3yL71B7Nll/j+u4iM3WN3ATtWeL9S38gNqz1fpH3Ebt2WZ9Bz+h9my3/hm/oPbssP4Vv6H21PdxF/dwH7Vnp/UD/I7as8v6IR6h9uy2fow/UHv2WP+Jv1B79lo/wVPUnn3Wf+MZas+I9XP8g9rzL7yMTv4A</Q>
+ </ELEMENT>
+ <COMPOSITE>
+ <C ID="0"> Q[0-63] </C>
+ <C ID="1"> E[0,25,42,59,76,93,110,127] </C>
+ <C ID="2"> E[128,130,132,134,136,138,140,142] </C>
+ <C ID="3"> E[23,41,58,75,92,109,126,143] </C>
+ <C ID="4"> E[3,6,9,12,15,18,21,24] </C>
+ </COMPOSITE>
+ <DOMAIN> C[0] </DOMAIN>
+ </GEOMETRY>
+ <EXPANSIONS>
+ <E COMPOSITE="C[0]" NUMMODES="6" TYPE="MODIFIED" FIELDS="u" />
+ </EXPANSIONS>
+ <FORCING>
+ <FORCE TYPE="Body">
+ <BODYFORCE> BodyForce </BODYFORCE>
+ </FORCE>
+ </FORCING>
+ <CONDITIONS>
+ <PARAMETERS>
+ <P> TimeStep = 0.001 </P>
+ <P> NumSteps = 100 </P>
+ <P> IO_CheckSteps = 0 </P>
+ <P> IO_InfoSteps = 100 </P>
+ <P> epsilon = 0.2 </P>
+ </PARAMETERS>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
+ <SOLVERINFO>
+ <I PROPERTY="EQTYPE" VALUE="UnsteadyReactionDiffusion" />
+ <I PROPERTY="Projection" VALUE="Continuous" />
+ <I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
+ </SOLVERINFO>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[1] </B>
+ <B ID="1"> C[2] </B>
+ <B ID="2"> C[3] </B>
+ <B ID="3"> C[4] </B>
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <P VAR="u" VALUE="[2]" />
+ </REGION>
+ <REGION REF="1">
+ <P VAR="u" VALUE="[3]" />
+ </REGION>
+ <REGION REF="2">
+ <P VAR="u" VALUE="[0]" />
+ </REGION>
+ <REGION REF="3">
+ <P VAR="u" VALUE="[1]" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+
+ <FUNCTION NAME="ExactSolution">
+ <E VAR="u" VALUE="exp(-0.1*t)*(cos(x) + cos(y))" />
+ </FUNCTION>
+
+ <FUNCTION NAME="InitialConditions">
+ <E VAR="u" VALUE="cos(x) + cos(y)" />
+ </FUNCTION>
+
+ <!-- Body force to enforce reaction term -->
+ <FUNCTION NAME="BodyForce">
+ <E VAR="u" EVARS="u" VALUE="0.1*u" />
+ </FUNCTION>
+ </CONDITIONS>
+</NEKTAR>
diff --git a/solvers/ADRSolver/Tests/AdvDiff3D_AllElmt_GJP.xml b/solvers/ADRSolver/Tests/AdvDiff3D_AllElmt_GJP.xml
index 165cd5afd4e84858095f184a1044f16091864d14..065b81074510f2867a872263ab46250436206a8f 100644
--- a/solvers/ADRSolver/Tests/AdvDiff3D_AllElmt_GJP.xml
+++ b/solvers/ADRSolver/Tests/AdvDiff3D_AllElmt_GJP.xml
@@ -20,10 +20,12 @@
<I PROPERTY="GJPStabilisation" VALUE="SemiImplicit" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/>
- <!--I PROPERTY="GlobalSysSoln" VALUE="IterativeMultiLevelStaticCond"/-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<VARIABLES>
<V ID="0"> u </V>
diff --git a/solvers/ADRSolver/Tests/AdvDiff_QuadTri_GJP.xml b/solvers/ADRSolver/Tests/AdvDiff_QuadTri_GJP.xml
index 18468000ab389c9ed2d7c71de236a1eb3aca89fa..339af86c97c74fbee2c05b17f8025c702e599e11 100644
--- a/solvers/ADRSolver/Tests/AdvDiff_QuadTri_GJP.xml
+++ b/solvers/ADRSolver/Tests/AdvDiff_QuadTri_GJP.xml
@@ -49,10 +49,13 @@
<I PROPERTY="GJPStabilisation" VALUE="SemiImplicit" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/>
- <!--I PROPERTY="GlobalSysSoln" VALUE="IterativeMultiLevelStaticCond"/-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
<V ID="1"> v </V>
diff --git a/solvers/ADRSolver/Tests/Advection1D_FRDG_GAUSS_LAGRANGE.xml b/solvers/ADRSolver/Tests/Advection1D_FRDG_GAUSS_LAGRANGE.xml
index de123f0010b936e50880eb7175316286f979935d..89a17aff69ee2cb05c42d5d105754f4513b7b7cd 100644
--- a/solvers/ADRSolver/Tests/Advection1D_FRDG_GAUSS_LAGRANGE.xml
+++ b/solvers/ADRSolver/Tests/Advection1D_FRDG_GAUSS_LAGRANGE.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection1D_FRDG_GLL_LAGRANGE.xml b/solvers/ADRSolver/Tests/Advection1D_FRDG_GLL_LAGRANGE.xml
index f0fcd1580b405479d931829acb65da15d3ebfa51..2a05899e854d6dafdb1093806d3bca80dd05f254 100644
--- a/solvers/ADRSolver/Tests/Advection1D_FRDG_GLL_LAGRANGE.xml
+++ b/solvers/ADRSolver/Tests/Advection1D_FRDG_GLL_LAGRANGE.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection1D_FRDG_GLL_LAGRANGE_SEM.xml b/solvers/ADRSolver/Tests/Advection1D_FRDG_GLL_LAGRANGE_SEM.xml
index 5e3946823ac65da7517eb9e6fa924acffd630831..800a090b99e8ef46b9f71da6f02ac97b65d5b461 100644
--- a/solvers/ADRSolver/Tests/Advection1D_FRDG_GLL_LAGRANGE_SEM.xml
+++ b/solvers/ADRSolver/Tests/Advection1D_FRDG_GLL_LAGRANGE_SEM.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection1D_FRDG_MODIFIED.xml b/solvers/ADRSolver/Tests/Advection1D_FRDG_MODIFIED.xml
index 04e007763ef99f56b20b78f33f2f6811151ba511..7bac458f0ec921f0b6045bf5f4b695755763d80f 100644
--- a/solvers/ADRSolver/Tests/Advection1D_FRDG_MODIFIED.xml
+++ b/solvers/ADRSolver/Tests/Advection1D_FRDG_MODIFIED.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection1D_FRHU_GLL_LAGRANGE.xml b/solvers/ADRSolver/Tests/Advection1D_FRHU_GLL_LAGRANGE.xml
index c70e2379ebf890986e21b6971c1e9cefd4d75b3c..69299bbd91686ccf870b02e8cbd7926e63539fd2 100644
--- a/solvers/ADRSolver/Tests/Advection1D_FRHU_GLL_LAGRANGE.xml
+++ b/solvers/ADRSolver/Tests/Advection1D_FRHU_GLL_LAGRANGE.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection1D_FRHU_GLL_LAGRANGE_SEM.xml b/solvers/ADRSolver/Tests/Advection1D_FRHU_GLL_LAGRANGE_SEM.xml
index 6912a9b8a5ffbde45afc4350d730434bd653a2b2..00cb0e000fd4aae1f958faa73ccec18f831cff84 100644
--- a/solvers/ADRSolver/Tests/Advection1D_FRHU_GLL_LAGRANGE_SEM.xml
+++ b/solvers/ADRSolver/Tests/Advection1D_FRHU_GLL_LAGRANGE_SEM.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection1D_FRHU_MODIFIED.xml b/solvers/ADRSolver/Tests/Advection1D_FRHU_MODIFIED.xml
index 989622a295501b7ef2b32429ebdeafba9e0c7f48..535efe984f0a4a050b9c9f2e42af433f812c9bea 100644
--- a/solvers/ADRSolver/Tests/Advection1D_FRHU_MODIFIED.xml
+++ b/solvers/ADRSolver/Tests/Advection1D_FRHU_MODIFIED.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection1D_FRSD_GLL_LAGRANGE.xml b/solvers/ADRSolver/Tests/Advection1D_FRSD_GLL_LAGRANGE.xml
index 7b06d54cd0160d013020da7981b53c506dd16df5..e7381ebf46172d49a9fe5a856e3bca053e4dcc91 100644
--- a/solvers/ADRSolver/Tests/Advection1D_FRSD_GLL_LAGRANGE.xml
+++ b/solvers/ADRSolver/Tests/Advection1D_FRSD_GLL_LAGRANGE.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection1D_FRSD_GLL_LAGRANGE_SEM.xml b/solvers/ADRSolver/Tests/Advection1D_FRSD_GLL_LAGRANGE_SEM.xml
index aab94d3958ba9c66c775517e238ec96a8d301e5a..d1745442fd251ba9ea9156cd65b3905e52b420cf 100644
--- a/solvers/ADRSolver/Tests/Advection1D_FRSD_GLL_LAGRANGE_SEM.xml
+++ b/solvers/ADRSolver/Tests/Advection1D_FRSD_GLL_LAGRANGE_SEM.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection1D_FRSD_MODIFIED.xml b/solvers/ADRSolver/Tests/Advection1D_FRSD_MODIFIED.xml
index d4335228f2f849a1f686768139463a601a3b29ba..c5c72ef34287bd0fe6f5c27605b0b036bff363fc 100644
--- a/solvers/ADRSolver/Tests/Advection1D_FRSD_MODIFIED.xml
+++ b/solvers/ADRSolver/Tests/Advection1D_FRSD_MODIFIED.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GAUSS_LAGRANGE_3x3.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GAUSS_LAGRANGE_3x3.xml
index 2e7ceb699958895c3f827c62e371430e697b1f48..1e8af99786bf4a0a2ae155cd627c54aa84130432 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GAUSS_LAGRANGE_3x3.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GAUSS_LAGRANGE_3x3.xml
@@ -83,9 +83,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GLL_LAGRANGE_3x3.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GLL_LAGRANGE_3x3.xml
index d9a32d5664500b01318078a1e6ffeabbff00c51e..279c74184f7f623ffdf52142afe53d27229e22b4 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GLL_LAGRANGE_3x3.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GLL_LAGRANGE_3x3.xml
@@ -83,9 +83,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GLL_LAGRANGE_SEM_3x3.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GLL_LAGRANGE_SEM_3x3.xml
index 3607301566324d0deff39e6d5b181b996917f7c7..1ebb34f9b184d002f0a1970b83755ac96bca71fc 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GLL_LAGRANGE_SEM_3x3.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_GLL_LAGRANGE_SEM_3x3.xml
@@ -83,9 +83,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_MODIFIED_3x3.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_MODIFIED_3x3.xml
index 57d97d6fbe9b4dccad743b90bc80d620c5c29201..0b018811fb50664e54482906a8fb7950ccbde5be 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_MODIFIED_3x3.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_deformed_MODIFIED_3x3.xml
@@ -83,9 +83,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_reg_def_MODIFIED_3x3.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_reg_def_MODIFIED_3x3.xml
index ce7953a74406f8638e3679511ffce759872e7f90..e0c56b1938664ee6486299f11e3f69ab6e164e84 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_reg_def_MODIFIED_3x3.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_reg_def_MODIFIED_3x3.xml
@@ -83,9 +83,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GAUSS_LAGRANGE_3x3.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GAUSS_LAGRANGE_3x3.xml
index fad77aa87fbb1ab47cec0712660e3a96da63c268..ccd96979a9ddefde350cc9bc07f9bbd49275b0c2 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GAUSS_LAGRANGE_3x3.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GAUSS_LAGRANGE_3x3.xml
@@ -83,9 +83,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GLL_LAGRANGE_3x3.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GLL_LAGRANGE_3x3.xml
index d4881cbd35f7a7ffe5c6734bcf05d08fb560ddb6..b3586e1f7a3818d291cab63857483ba8a9841a80 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GLL_LAGRANGE_3x3.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GLL_LAGRANGE_3x3.xml
@@ -83,9 +83,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GLL_LAGRANGE_SEM_3x3.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GLL_LAGRANGE_SEM_3x3.xml
index 708eced89ad38ecd5aa463d04965cde9d5243baf..8500f5dd0addc3783184f1406ab7d6fa0e8e6ac5 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GLL_LAGRANGE_SEM_3x3.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_GLL_LAGRANGE_SEM_3x3.xml
@@ -83,9 +83,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_MODIFIED_3x3.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_MODIFIED_3x3.xml
index 0adb012c142c8f66ab1078acff4b541697eeb6f3..856d673f3e344aab7c527f0a04e83c32e7064c60 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_MODIFIED_3x3.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_MODIFIED_3x3.xml
@@ -83,9 +83,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_SSPRK2.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_SSPRK2.xml
index 7b1ed6ef6df2cf3b46209462b8f72c8f3e71ae62..cb77bddfe9ae4c00e6eb0505ac81961b05c32693 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_SSPRK2.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_SSPRK2.xml
@@ -83,9 +83,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_SSP"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 2 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_SSPRK3.xml b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_SSPRK3.xml
index b6d2a309bf491abe0a433b2f933e6c55dec596cc..f561682afbc84075e5a5991f6a934d07cdf6778a 100644
--- a/solvers/ADRSolver/Tests/Advection2D_ISO_regular_SSPRK3.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_ISO_regular_SSPRK3.xml
@@ -83,9 +83,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta3_SSP"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 3 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_Quad_GJP.xml b/solvers/ADRSolver/Tests/Advection2D_Quad_GJP.xml
index 947df4bc45ece9bc63d71ef338c57295d833cd90..78011dc9bbbef91472e1d9d7bb34a5b9b603f96b 100644
--- a/solvers/ADRSolver/Tests/Advection2D_Quad_GJP.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_Quad_GJP.xml
@@ -99,9 +99,13 @@
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="GJPStabilisation" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="NonConservative" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_Tri_GJP.xml b/solvers/ADRSolver/Tests/Advection2D_Tri_GJP.xml
index 25e4792e9428e0a10e60b9dfeef0fc9374cd4399..e0f74e53863c4b6445133a44d96c5e2642ed2059 100644
--- a/solvers/ADRSolver/Tests/Advection2D_Tri_GJP.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_Tri_GJP.xml
@@ -117,9 +117,13 @@
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="GJPStabilisation" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="NonConservative" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GAUSS_LAGRANGE_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GAUSS_LAGRANGE_10x10.xml
index 767f5195aab8990c18d2f298d285be78f6390737..98b6bb5faba2027ddf5a77a6751f7ece94bc8e05 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GAUSS_LAGRANGE_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GAUSS_LAGRANGE_10x10.xml
@@ -22,9 +22,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GLL_LAGRANGE_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GLL_LAGRANGE_10x10.xml
index fa7679294d8947718ca2d80ca6dba7090b8baf4c..804d3eb11d4d73dffe002c15cf2501bb35b1a1e2 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GLL_LAGRANGE_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GLL_LAGRANGE_10x10.xml
@@ -22,9 +22,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GLL_LAGRANGE_SEM_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GLL_LAGRANGE_SEM_10x10.xml
index f1e12d6245666553e29e58e233877b9a96aff90c..0d75177a0d64335c441e0c3cab4b9931e83b5114 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GLL_LAGRANGE_SEM_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_GLL_LAGRANGE_SEM_10x10.xml
@@ -22,9 +22,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_MODIFIED_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_MODIFIED_10x10.xml
index 18c4a335aeed0770f8f7f099977307286737fa87..3310ec5499a684ef60d219045a11476d1b63c03c 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_MODIFIED_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_MODIFIED_10x10.xml
@@ -22,9 +22,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_MODIFIED_10x10_varP.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_MODIFIED_10x10_varP.xml
index 7accd326129ccc4a1f93973030d6614de40b2e0b..8608959eb930bc4d65e1546bcda3b9e58e7fd3e6 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_MODIFIED_10x10_varP.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_deformed_MODIFIED_10x10_varP.xml
@@ -27,9 +27,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GAUSS_LAGRANGE_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GAUSS_LAGRANGE_10x10.xml
index bb079d394673f2ada70ffbb769089e5127a36c9f..7221b6f7f89de31dc4e1c54d78ba13ce303eccd5 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GAUSS_LAGRANGE_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GAUSS_LAGRANGE_10x10.xml
@@ -23,9 +23,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GAUSS_LAGRANGE_10x10_MF.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GAUSS_LAGRANGE_10x10_MF.xml
index 36a89ce389f832e26d2bc96046ea4732ff0a522d..4a9d0268bffc828a078d869da20e1deed4b658ec 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GAUSS_LAGRANGE_10x10_MF.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GAUSS_LAGRANGE_10x10_MF.xml
@@ -23,9 +23,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GLL_LAGRANGE_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GLL_LAGRANGE_10x10.xml
index f9dfdf8c9adad0ea8efaea101823ddce72bce2ed..632fb9858ef735f64fa63ea4c7adc1f57af033ca 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GLL_LAGRANGE_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GLL_LAGRANGE_10x10.xml
@@ -22,9 +22,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GLL_LAGRANGE_SEM_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GLL_LAGRANGE_SEM_10x10.xml
index e82e9a33f6f5ac1b0def41d21360b8b21a60a690..bb2bfec8f49b6c1efa12cf1b70e941f24c8accce 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GLL_LAGRANGE_SEM_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_GLL_LAGRANGE_SEM_10x10.xml
@@ -22,9 +22,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_10x10.xml
index 8d1354ca301a7717ab889e6cd78408abc0070454..c413477b1d559c0eb5bc2da305a6662c2f7df103 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_10x10.xml
@@ -22,9 +22,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_triangle_98.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_triangle_98.xml
index 2b1fdb59b0c0264f6f186bfae5882fd2e9cf4921..130ac916a65e5515cbdea42808382dec0a2f1ba2 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_triangle_98.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_triangle_98.xml
@@ -22,9 +22,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_triangle_98_MF.xml b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_triangle_98_MF.xml
index 28d2f8065d708011353dd6aaf313328f8650978b..7fee85752c3f11827604ade4349a45e48c6adb3f 100644
--- a/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_triangle_98_MF.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_dirichlet_regular_MODIFIED_triangle_98_MF.xml
@@ -22,9 +22,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_m12_DG_quad_VarP.xml b/solvers/ADRSolver/Tests/Advection2D_m12_DG_quad_VarP.xml
index 80a538189d924204f7a5276115143dcab531dfce..52211f8b0e5ce5a49e7389a6e5c52e57d6e791c1 100644
--- a/solvers/ADRSolver/Tests/Advection2D_m12_DG_quad_VarP.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_m12_DG_quad_VarP.xml
@@ -129,9 +129,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_m12_DG_tri_VarP.xml b/solvers/ADRSolver/Tests/Advection2D_m12_DG_tri_VarP.xml
index caf8da45ef0f369ffe276383850ce80290498bdc..c439d7972f4b5e3c6acd1e089dfda9f5dff4e382 100644
--- a/solvers/ADRSolver/Tests/Advection2D_m12_DG_tri_VarP.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_m12_DG_tri_VarP.xml
@@ -177,14 +177,19 @@
<P> advy = 1.5 </P>
<P> advz = 2 </P>
</PARAMETERS>
+
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GAUSS_LAGRANGE_2x2.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GAUSS_LAGRANGE_2x2.xml
index 59bbe67012793534c4d45c547576d9baa327445d..adc6ad91864c5a0afe71b1a5ca6d65b8dc7c43a4 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GAUSS_LAGRANGE_2x2.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GAUSS_LAGRANGE_2x2.xml
@@ -73,9 +73,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_10x10.xml
index 851bec9457b15efb626f1f92d844ec4da7d627f1..f86005efbda6f4a30193297a44173a627fd21c7e 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_10x10.xml
@@ -21,9 +21,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_2x2.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_2x2.xml
index 4af5f213ccdf03e66744a4912ba92989887069ca..023291df9cc9d150d2fbb891a7910dcb7414a6c4 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_2x2.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_2x2.xml
@@ -73,9 +73,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_10x10.xml
index fc52272004d589d5de38ab2028971887bb83a353..b332a3688e8a1b2cc20f7a3f9eca9d1caedf3fb5 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_10x10.xml
@@ -21,9 +21,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_2x2.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_2x2.xml
index 0559df81d3a5f9a522510ca51ae03b3b6a821233..744205367ef5df93632f7393405c6e40abcdcd9a 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_2x2.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_2x2.xml
@@ -73,9 +73,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_MODIFIED_10x10.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_MODIFIED_10x10.xml
index 240e24c35d293f48c4dbff197115d6a5c1e87fa1..9634ee81175736e93b35aa2508db44a0a82b7573 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_MODIFIED_10x10.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_MODIFIED_10x10.xml
@@ -21,9 +21,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_MODIFIED_2x2.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_MODIFIED_2x2.xml
index 7929fea5e47087d293c93c785bb50ae96de316ea..1d4f6b5d8351efebe7a3cabc295c57b1cca93a25 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_MODIFIED_2x2.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_deformed_MODIFIED_2x2.xml
@@ -73,9 +73,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GAUSS_LAGRANGE_2x2.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GAUSS_LAGRANGE_2x2.xml
index 6c2fb02508a33f16e5da24500ddfa965f2f5a14e..09a0337d28ae903dfe33df77682987c0ec82fb51 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GAUSS_LAGRANGE_2x2.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GAUSS_LAGRANGE_2x2.xml
@@ -73,9 +73,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GLL_LAGRANGE_2x2.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GLL_LAGRANGE_2x2.xml
index 05772c6661d808ef3c7badf2237ef548dd81da87..9288582e9f85ab436bf61f7e71f82bf59d419ca1 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GLL_LAGRANGE_2x2.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GLL_LAGRANGE_2x2.xml
@@ -73,9 +73,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GLL_LAGRANGE_SEM_2x2.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GLL_LAGRANGE_SEM_2x2.xml
index 9ad1b0e7b64a802f83dd53f41b390ad7131618ca..9c2ff203c33eea812ff12247abce530646335cfa 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GLL_LAGRANGE_SEM_2x2.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_regular_GLL_LAGRANGE_SEM_2x2.xml
@@ -73,9 +73,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection2D_periodic_regular_MODIFIED_2x2.xml b/solvers/ADRSolver/Tests/Advection2D_periodic_regular_MODIFIED_2x2.xml
index c96653171300e363bb453ebd3babb2a04696f6f8..08aa1473d2c5e2002f3c7d81514d070b9a65a06a 100644
--- a/solvers/ADRSolver/Tests/Advection2D_periodic_regular_MODIFIED_2x2.xml
+++ b/solvers/ADRSolver/Tests/Advection2D_periodic_regular_MODIFIED_2x2.xml
@@ -73,9 +73,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_2_2_hex.xml b/solvers/ADRSolver/Tests/Advection3D_2_2_hex.xml
index 83cd7d15e74849d68e87bc4ac9cd15a5d670ab16..de01b0ffc028e01d3699eadf4e2e08644734b2b4 100644
--- a/solvers/ADRSolver/Tests/Advection3D_2_2_hex.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_2_2_hex.xml
@@ -27,10 +27,15 @@
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="AdvectionType" VALUE="NonConservative" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="GJPStabilisation" VALUE="SemiImplicit" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_AllElmt_GJP.xml b/solvers/ADRSolver/Tests/Advection3D_AllElmt_GJP.xml
index cd19a00a56c2575c73974f8db9243a7c3eb45f0f..9d98f475ba50c795c054d387c1c43b5bec08abc1 100644
--- a/solvers/ADRSolver/Tests/Advection3D_AllElmt_GJP.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_AllElmt_GJP.xml
@@ -18,9 +18,13 @@
<I PROPERTY="AdvectionType" VALUE="NonConservative" />
<I PROPERTY="GJPStabilisation" VALUE="Explicit" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<VARIABLES>
<V ID="0"> u </V>
diff --git a/solvers/ADRSolver/Tests/Advection3D_DG_hex_faceRotation.xml b/solvers/ADRSolver/Tests/Advection3D_DG_hex_faceRotation.xml
index c4ac074491da6e63bd56b1777ec63e2abc1cf029..4a01eca25f6377e78dd5cb24ea83a5b36701d42a 100644
--- a/solvers/ADRSolver/Tests/Advection3D_DG_hex_faceRotation.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_DG_hex_faceRotation.xml
@@ -26,9 +26,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_DG_hex_varP_faceRotation.xml b/solvers/ADRSolver/Tests/Advection3D_DG_hex_varP_faceRotation.xml
index 6691fbf92a12fefd8da64a7b66341303304c1967..feecf665a4ccda6865c4bb76d746444820615cef 100644
--- a/solvers/ADRSolver/Tests/Advection3D_DG_hex_varP_faceRotation.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_DG_hex_varP_faceRotation.xml
@@ -33,9 +33,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_DG_prism.xml b/solvers/ADRSolver/Tests/Advection3D_DG_prism.xml
index 1d8f2f41c4f1acabbfca03f27de160b703f3b62f..f2efe0533486cb994fb4add0ecc5081e4091faac 100644
--- a/solvers/ADRSolver/Tests/Advection3D_DG_prism.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_DG_prism.xml
@@ -114,12 +114,17 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="UnsteadyAdvection" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_DG_prism_varP.xml b/solvers/ADRSolver/Tests/Advection3D_DG_prism_varP.xml
index 1c71156af07448bcde704c62a37a7d484c241607..e228fa2c665a4c9a45a23147220765d296dc9287 100644
--- a/solvers/ADRSolver/Tests/Advection3D_DG_prism_varP.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_DG_prism_varP.xml
@@ -136,12 +136,17 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="UnsteadyAdvection" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_DG_pyr.xml b/solvers/ADRSolver/Tests/Advection3D_DG_pyr.xml
index b2f34162bbe1427963dafcb20a4d1e8481446537..2d2be1079bdf247952c2d3a62bf6679815d08fac 100644
--- a/solvers/ADRSolver/Tests/Advection3D_DG_pyr.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_DG_pyr.xml
@@ -95,9 +95,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_DG_pyr_varP.xml b/solvers/ADRSolver/Tests/Advection3D_DG_pyr_varP.xml
index 17c1e53177edd2dbaf3793916d1282555cbc0b65..dd72c527b164fe0042f97f497383c9db0ce76e9b 100644
--- a/solvers/ADRSolver/Tests/Advection3D_DG_pyr_varP.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_DG_pyr_varP.xml
@@ -108,9 +108,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_m10_DG_hex_VarP.xml b/solvers/ADRSolver/Tests/Advection3D_m10_DG_hex_VarP.xml
index 388408f7ae211eb83bf0280c817c0195000d4f01..e412fe0f1822297840a76ab47279aac9a3ef0291 100644
--- a/solvers/ADRSolver/Tests/Advection3D_m10_DG_hex_VarP.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_m10_DG_hex_VarP.xml
@@ -233,9 +233,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_m10_DG_hex_periodic_nodal.xml b/solvers/ADRSolver/Tests/Advection3D_m10_DG_hex_periodic_nodal.xml
index d3e185bc76f9c67b13680ffb221cdc6cfa0bfd8e..4da8d6504862c93940aa67b7bf58b6df61e85f0e 100644
--- a/solvers/ADRSolver/Tests/Advection3D_m10_DG_hex_periodic_nodal.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_m10_DG_hex_periodic_nodal.xml
@@ -69,9 +69,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_m10_DG_prism_VarP.xml b/solvers/ADRSolver/Tests/Advection3D_m10_DG_prism_VarP.xml
index 3a5ac5b4779ad5fb9bf74ba8f284e45246e08295..86c4bdfd6f144f1de9135d552ccbf7701c49461e 100644
--- a/solvers/ADRSolver/Tests/Advection3D_m10_DG_prism_VarP.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_m10_DG_prism_VarP.xml
@@ -524,10 +524,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="GlobalSysSoln" VALUE="IterativeFull" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_m12_DG_hex_periodic.xml b/solvers/ADRSolver/Tests/Advection3D_m12_DG_hex_periodic.xml
index 7741a0735992c14bff8cf6ed11e4e91d645539a4..2cf87371bba10d4fed97907da6aa81a2371ffc54 100644
--- a/solvers/ADRSolver/Tests/Advection3D_m12_DG_hex_periodic.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_m12_DG_hex_periodic.xml
@@ -19,9 +19,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_m12_DG_prism.xml b/solvers/ADRSolver/Tests/Advection3D_m12_DG_prism.xml
index 960931428de2602503c4a786afbe7b9df2ddd140..f8e436146ca363eca78f0ab32dd17ec94e764af6 100644
--- a/solvers/ADRSolver/Tests/Advection3D_m12_DG_prism.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_m12_DG_prism.xml
@@ -508,10 +508,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="GlobalSysSoln" VALUE="IterativeFull" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_m12_DG_tet.xml b/solvers/ADRSolver/Tests/Advection3D_m12_DG_tet.xml
index 2cfc12fa7a6c5f264e3af71f62a846fdd8272b59..c1f257c65fa1c929c7d52eaf3ad5d21244917bb9 100644
--- a/solvers/ADRSolver/Tests/Advection3D_m12_DG_tet.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_m12_DG_tet.xml
@@ -332,9 +332,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_m12_DG_tet_VarP.xml b/solvers/ADRSolver/Tests/Advection3D_m12_DG_tet_VarP.xml
index 09208edb0e88d12f2aa6a82cd4f5322285ef5f36..1653cca9a3394bee7ecaa4feb216eb97a6b55e87 100644
--- a/solvers/ADRSolver/Tests/Advection3D_m12_DG_tet_VarP.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_m12_DG_tet_VarP.xml
@@ -348,9 +348,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex.xml b/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex.xml
index 4c95de50be4147e1d696db8082e02290125b87f1..9d4a81ad220b8ef757febc351e786fcec0d7f67a 100644
--- a/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex.xml
@@ -144,9 +144,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex_MF.xml b/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex_MF.xml
index 42269216cfb36964e00276296892641412500fab..6ccb77100edee4c7c5106a8f15070a540d867a4e 100644
--- a/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex_MF.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex_MF.xml
@@ -155,9 +155,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex_nodal.xml b/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex_nodal.xml
index ef939f9f48759ab3977e66c1547e3b70cfa3295c..14f0297d2d8a416152bdf333e2ff745496b330a1 100644
--- a/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex_nodal.xml
+++ b/solvers/ADRSolver/Tests/Advection3D_m8_DG_hex_nodal.xml
@@ -144,9 +144,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection_m12_DG_periodic.xml b/solvers/ADRSolver/Tests/Advection_m12_DG_periodic.xml
index 5c0bd2cc9d5577c88b94c6bd0eabe4765fc71d50..d0ebd7cbf9d126c67f4e1bed26ec0c52b8f00f2e 100644
--- a/solvers/ADRSolver/Tests/Advection_m12_DG_periodic.xml
+++ b/solvers/ADRSolver/Tests/Advection_m12_DG_periodic.xml
@@ -115,9 +115,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection_m12_Order1.xml b/solvers/ADRSolver/Tests/Advection_m12_Order1.xml
index aa1012ce4b4fcc61688e856f508ce52855698762..f918fa80c0d845fa1ff25f94b66567dbac94c0fc 100644
--- a/solvers/ADRSolver/Tests/Advection_m12_Order1.xml
+++ b/solvers/ADRSolver/Tests/Advection_m12_Order1.xml
@@ -77,9 +77,14 @@
<I PROPERTY="AdvectionType" VALUE="NonConservative" />
<I PROPERTY="FRSchemeRecovered" VALUE="DG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection_m12_Order2.xml b/solvers/ADRSolver/Tests/Advection_m12_Order2.xml
index 04306870846810ed1496cbbb79b6847b62badce6..a4840234372c22b3a9c2d2a9d1fb72eb46ba286a 100644
--- a/solvers/ADRSolver/Tests/Advection_m12_Order2.xml
+++ b/solvers/ADRSolver/Tests/Advection_m12_Order2.xml
@@ -77,9 +77,13 @@
<I PROPERTY="AdvectionType" VALUE="NonConservative" />
<I PROPERTY="FRSchemeRecovered" VALUE="DG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="AdamsBashforthOrder2"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> AdamsBashforth </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Advection_m14_Order4.xml b/solvers/ADRSolver/Tests/Advection_m14_Order4.xml
index dc114d1f4c110a0009835a7f9a6f502ecb5de421..4fbd562e222f51a05cc9a3bc7650f922ded08994 100644
--- a/solvers/ADRSolver/Tests/Advection_m14_Order4.xml
+++ b/solvers/ADRSolver/Tests/Advection_m14_Order4.xml
@@ -77,9 +77,13 @@
<I PROPERTY="AdvectionType" VALUE="NonConservative" />
<I PROPERTY="FRSchemeRecovered" VALUE="DG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_1D_LDG.xml b/solvers/ADRSolver/Tests/ExDiffusion_1D_LDG.xml
index 4988fe7dd8d1b0407a88384bb303ec58bd6d6860..a4810bc80a73efeaec544b9f608763722c32ea6d 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_1D_LDG.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_1D_LDG.xml
@@ -56,9 +56,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_1D_LDG_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_1D_LDG_GAUSS.xml
index 97db7fa4bc23b5bb5505246355bd56663806cfa4..5be807ffedb4be944253d1134ea2ce2b4914780a 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_1D_LDG_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_1D_LDG_GAUSS.xml
@@ -56,9 +56,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRDG.xml b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRDG.xml
index b2b5194d248db2da8fecae4dd8bcd8e01c1246c1..d67d39a8f56b7a30ef16fbef5ab41a14598851e5 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRDG.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRDG.xml
@@ -56,9 +56,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRDG_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRDG_GAUSS.xml
index 0f55242870b5be830809ae81c995f06ce8ebe4dd..73ae6e951d0975b1e5eceebe18dc50fa0d3de6bf 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRDG_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRDG_GAUSS.xml
@@ -56,9 +56,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRHU.xml b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRHU.xml
index 0931c3d7c0bc450e4f0590bf0025276e54627ed4..ab1fe2ffefbf575fe142831c67c843aab7557a41 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRHU.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRHU.xml
@@ -56,9 +56,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRHU" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRHU_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRHU_GAUSS.xml
index 8cd70185b78922f9ac60b1cd6066366fbea6118c..35f285b19d1b1cc5f59151ecd305196da0791089 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRHU_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRHU_GAUSS.xml
@@ -56,9 +56,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRHU" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRSD.xml b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRSD.xml
index 5bc23759efaf7ea657876a3fa9fa72267e0082db..78f7d8ddf5e4fe43d879655c96b4f7ce490f6827 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRSD.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRSD.xml
@@ -56,9 +56,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRSD" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRSD_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRSD_GAUSS.xml
index 4a6480713598c2b88a377399d8c6d3eb5278a829..e57316be4cf6d3417537c4575f777dbb9c4cfedd 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRSD_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_1D_LFRSD_GAUSS.xml
@@ -56,9 +56,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRSD" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_deformed.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_deformed.xml
index 0a1d19147404553a98ad23817d063b8e5d55e78b..2b2c897c34428762e48196853dc8c11a380b184d 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_deformed.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_deformed.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_deformed_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_deformed_GAUSS.xml
index 051fb872ceb1f35c5f872d13eb445bac2f5b2fb9..82d32747b4893142cbc7a27c4a6d9b5578ae3537 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_deformed_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_deformed_GAUSS.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m3.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m3.xml
index 92605407f7d6c578bc58708e44d3b6f27fa4b35d..74a7f40208290e32bf1f07d13618335be6108ccc 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m3.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m3.xml
@@ -74,9 +74,13 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m3_periodic.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m3_periodic.xml
index 5195a22c61bf7a0a8a82cc0fa1bb36887457fcce..26eff12a76cb66081c36e47e2c7b6b54f8c3616b 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m3_periodic.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m3_periodic.xml
@@ -74,9 +74,13 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m8.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m8.xml
index 994b3753e1cd2b8530ed4bb85c1d26487995da5c..6f126097d247ec92903f96bbfadc154770ec8c14 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m8.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_hybrid_m8.xml
@@ -74,9 +74,13 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_regular_Neumann.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_regular_Neumann.xml
index 9912fe5d886f4f93355d4ee4f66b6d40d0e8ab1b..512f145caf81d034b813a384d3769b289c695f00 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_regular_Neumann.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_regular_Neumann.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_regular_Neumann_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_regular_Neumann_GAUSS.xml
index aea17fea3aaec8d53f6848abc0405ba8bae9c6ac..c73250371bafb9f2ee20575bc969f145b95a58c5 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_regular_Neumann_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LDG_regular_Neumann_GAUSS.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_deformed.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_deformed.xml
index 40f06ba342be02830db529172334a654f31609c5..924135be1729dfc6d1a050e0aa60fcb96564e365 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_deformed.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_deformed.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_deformed_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_deformed_GAUSS.xml
index ee549e2903c74ea76fbb90437909d2a416d4b494..98cbe7dd49d066bf328966098b6fa541d4cc8b8d 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_deformed_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_deformed_GAUSS.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_regular_Neumann.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_regular_Neumann.xml
index 1e03237079a665e7a9f3da19a92767f48f52e7d3..f61b1e3f5d05554329d38ed7923fdf6a83922682 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_regular_Neumann.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_regular_Neumann.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_regular_Neumann_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_regular_Neumann_GAUSS.xml
index 87d415a7fd68fdaf5c2110336e613d42cb8210d4..ca5c60dff7700bf7ae03a843b242c3b917aadea5 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_regular_Neumann_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRDG_regular_Neumann_GAUSS.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_deformed.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_deformed.xml
index 22bd6f5db1251236711ce8d2836a2df1309b7c31..412a58ca40b0d16eee7d54466a3292d94c838c3c 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_deformed.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_deformed.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRHU" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_deformed_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_deformed_GAUSS.xml
index b7c3d879950186c0c9d089f5ed08b1f2d2817c9d..361984ac2e477eaefdb27172ec47bb4a723ab7db 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_deformed_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_deformed_GAUSS.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRHU" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_regular_Neumann.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_regular_Neumann.xml
index e710d5a0e2de0270219e0cec8846428854a7325b..adf3c2b6f06731d94f08083208bb6ba22203e8a3 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_regular_Neumann.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_regular_Neumann.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRHU" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_regular_Neumann_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_regular_Neumann_GAUSS.xml
index f9edd2089a03c6e834cbbb204319b629bb471185..4cfd9cf3cb076cc9def57c2baabce60bae20895b 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_regular_Neumann_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRHU_regular_Neumann_GAUSS.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRHU" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_deformed.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_deformed.xml
index ace324a4a97a6b92162492685dbc1d2c2ddee7cc..6fac360e2aa7395fb78a836b0087fde81923b7ee 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_deformed.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_deformed.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRSD" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_deformed_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_deformed_GAUSS.xml
index 82510f8466f71fd479c2ed0a600f11f354de68b9..81a5dcc955c93e48a2dfcee87d0a715c7ae607f1 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_deformed_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_deformed_GAUSS.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRSD" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_regular_Neumann.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_regular_Neumann.xml
index 58c98bacc2f189e6c40caeb87b37b318be4bbbba..c98eb033c09c1b378bc32ffe738c8baebbf8e541 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_regular_Neumann.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_regular_Neumann.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRSD" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_regular_Neumann_GAUSS.xml b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_regular_Neumann_GAUSS.xml
index e99acd43492adae136306224eb9bae18373b487a..5df25dde4ad7af690420c38d20f5dde7beac2905 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_regular_Neumann_GAUSS.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_2D_LFRSD_regular_Neumann_GAUSS.xml
@@ -67,9 +67,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LFRSD" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ExDiffusion_VarCoeff.xml b/solvers/ADRSolver/Tests/ExDiffusion_VarCoeff.xml
index b75a28c54c048867633aa419a406c05cbdcb84c8..32676764ee67f4b3e6b49ccdb4a20ae71f3e550c 100644
--- a/solvers/ADRSolver/Tests/ExDiffusion_VarCoeff.xml
+++ b/solvers/ADRSolver/Tests/ExDiffusion_VarCoeff.xml
@@ -77,9 +77,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/FilterPython.xml b/solvers/ADRSolver/Tests/FilterPython.xml
index 707269770cd8dd6c183541c9b3ccae905a1165f7..14b1b3bc8a7b72551b6c463ade5974fa516aeb81 100644
--- a/solvers/ADRSolver/Tests/FilterPython.xml
+++ b/solvers/ADRSolver/Tests/FilterPython.xml
@@ -87,9 +87,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder3" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ImDiffusion_Hex_Periodic_m5.xml b/solvers/ADRSolver/Tests/ImDiffusion_Hex_Periodic_m5.xml
index cf7cd678f6a896d076585f436d7fe9bab49a57f9..f26cb2e822fc9392838a56d5df79c96c86e2db28 100644
--- a/solvers/ADRSolver/Tests/ImDiffusion_Hex_Periodic_m5.xml
+++ b/solvers/ADRSolver/Tests/ImDiffusion_Hex_Periodic_m5.xml
@@ -18,9 +18,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ImDiffusion_Quad_Periodic_m7.xml b/solvers/ADRSolver/Tests/ImDiffusion_Quad_Periodic_m7.xml
index bf74b39a0a1caca8c63da82fe64d7f2718cd54e6..9cc78cd40090836324b00d96cd5c3f4d6574d11f 100644
--- a/solvers/ADRSolver/Tests/ImDiffusion_Quad_Periodic_m7.xml
+++ b/solvers/ADRSolver/Tests/ImDiffusion_Quad_Periodic_m7.xml
@@ -18,9 +18,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder3" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ImDiffusion_m12.xml b/solvers/ADRSolver/Tests/ImDiffusion_m12.xml
index 0faf01ce19dc860607f1ea7f9a9a8785bb89f391..e5359d07d3528df0c0958a82337df8b54ee38204 100644
--- a/solvers/ADRSolver/Tests/ImDiffusion_m12.xml
+++ b/solvers/ADRSolver/Tests/ImDiffusion_m12.xml
@@ -76,9 +76,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder3" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ImDiffusion_m12_DIRKOrder3_ES5.xml b/solvers/ADRSolver/Tests/ImDiffusion_m12_DIRKOrder3_ES5.xml
index 68ef8f92fcff3e10631c32076ea01230c27199e9..93df391f77791cb85fa3f95060d3b95ff52bb7b3 100644
--- a/solvers/ADRSolver/Tests/ImDiffusion_m12_DIRKOrder3_ES5.xml
+++ b/solvers/ADRSolver/Tests/ImDiffusion_m12_DIRKOrder3_ES5.xml
@@ -76,9 +76,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder3_ES5" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 3 </ORDER>
+ <VARIANT> ES5 </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ImDiffusion_m12_DIRKOrder4_ES6.xml b/solvers/ADRSolver/Tests/ImDiffusion_m12_DIRKOrder4_ES6.xml
index 9156889a38420c5631e63f97f7ef2a95adb76f36..fe2897180c525be6f94f9394a9cb957fda85072a 100644
--- a/solvers/ADRSolver/Tests/ImDiffusion_m12_DIRKOrder4_ES6.xml
+++ b/solvers/ADRSolver/Tests/ImDiffusion_m12_DIRKOrder4_ES6.xml
@@ -76,9 +76,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder4_ES6" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 4 </ORDER>
+ <VARIANT> ES6 </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/ImDiffusion_m6.xml b/solvers/ADRSolver/Tests/ImDiffusion_m6.xml
index d65da0cd25597eb64dc3e4f04b483fec22ba10b6..d1c627b80f5a92c1927ed0a57205755d0e219624 100644
--- a/solvers/ADRSolver/Tests/ImDiffusion_m6.xml
+++ b/solvers/ADRSolver/Tests/ImDiffusion_m6.xml
@@ -76,9 +76,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder3" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GAUSS_LAGRANGE.xml b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GAUSS_LAGRANGE.xml
index 5dd0bc1e47d808b9e77d4a1f31dc82a901bae828..fa7cf04a9a2958c64c3383cecadae2f284bf0619 100644
--- a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GAUSS_LAGRANGE.xml
+++ b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GAUSS_LAGRANGE.xml
@@ -50,9 +50,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GLL_LAGRANGE.xml b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GLL_LAGRANGE.xml
index f0457cfc38b75ccb6878dab87810ddd4b753e736..a3d597dd17887e125aedf45f6d1ca77d352f217e 100644
--- a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GLL_LAGRANGE.xml
+++ b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GLL_LAGRANGE.xml
@@ -50,9 +50,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GLL_LAGRANGE_SEM.xml b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GLL_LAGRANGE_SEM.xml
index 907e8fc61acdb22010e6812662a38b67694c2eb2..ccf092e3c7168a9c955080db3fb6f9e982788348 100644
--- a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GLL_LAGRANGE_SEM.xml
+++ b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_GLL_LAGRANGE_SEM.xml
@@ -50,9 +50,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_MODIFIED.xml b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_MODIFIED.xml
index 46eae735fed20408c9e42c753efc7f1ff4905492..9f8e66abb74f621fcd651653540ebf400f463a23 100644
--- a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_MODIFIED.xml
+++ b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRDG_MODIFIED.xml
@@ -50,9 +50,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_GLL_LAGRANGE.xml b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_GLL_LAGRANGE.xml
index 8787aa7a01f45cbb0edc53f26b951c647204ed95..59140e1a7ab3886b5feb690aa05e010a0f19c249 100644
--- a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_GLL_LAGRANGE.xml
+++ b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_GLL_LAGRANGE.xml
@@ -50,9 +50,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_GLL_LAGRANGE_SEM.xml b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_GLL_LAGRANGE_SEM.xml
index 34e09b4d5dc83b0b0b801fcd23c243725743caa6..4e728e33e0bb9c47367a67cbcad790ca781c408c 100644
--- a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_GLL_LAGRANGE_SEM.xml
+++ b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_GLL_LAGRANGE_SEM.xml
@@ -50,9 +50,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_MODIFIED.xml b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_MODIFIED.xml
index 2c804eaf678a6a0bf1ce5b985775092d2c08a909..3002bf73439a91bc7f37eb98b770a9ff9c2054c4 100644
--- a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_MODIFIED.xml
+++ b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRHU_MODIFIED.xml
@@ -50,9 +50,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_GLL_LAGRANGE.xml b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_GLL_LAGRANGE.xml
index ed3b39541389d6dd4c7aab4e57fb53bb8a90ba2f..7ea03308da1cb010bd1497d7c9467cf6f9cc6a1d 100644
--- a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_GLL_LAGRANGE.xml
+++ b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_GLL_LAGRANGE.xml
@@ -50,9 +50,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_GLL_LAGRANGE_SEM.xml b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_GLL_LAGRANGE_SEM.xml
index 5362468648e8a93f83375cf01a56d339ad67f983..fa2f011d5eeecc708d5293830c4b35896ef4cae8 100644
--- a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_GLL_LAGRANGE_SEM.xml
+++ b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_GLL_LAGRANGE_SEM.xml
@@ -50,9 +50,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_MODIFIED.xml b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_MODIFIED.xml
index 118553fda789f9d3ab072aa1b13b365235629309..32efe78e9c8472ee205fdd69b7f0a08859755aa1 100644
--- a/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_MODIFIED.xml
+++ b/solvers/ADRSolver/Tests/InviscidBurgers1D_FRSD_MODIFIED.xml
@@ -50,9 +50,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/MMFAdvCube.xml b/solvers/ADRSolver/Tests/MMFAdvCube.xml
index a4195297dc47ff09b103950f95a10ee44a84e5be..d6c42b0a816fc959b01e3ea083911507c46858de 100644
--- a/solvers/ADRSolver/Tests/MMFAdvCube.xml
+++ b/solvers/ADRSolver/Tests/MMFAdvCube.xml
@@ -772,13 +772,17 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="MMFAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<I PROPERTY="TestType" VALUE="TestCube" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/MMFAdvPlane.xml b/solvers/ADRSolver/Tests/MMFAdvPlane.xml
index cb99ef0adb79b2ecdb2ee53531bfdbee4b6dfce5..5887b2c449bc4f789227dea710de080541966285 100644
--- a/solvers/ADRSolver/Tests/MMFAdvPlane.xml
+++ b/solvers/ADRSolver/Tests/MMFAdvPlane.xml
@@ -303,13 +303,17 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="MMFAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<I PROPERTY="TestType" VALUE="TestPlane" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/MMFAdvSphere.xml b/solvers/ADRSolver/Tests/MMFAdvSphere.xml
index bad961d9960e8a5b3536e3ace9908fd20d7a8556..9fdd6ac3204bd692a0541f0f3bc5e1a45b629e4f 100644
--- a/solvers/ADRSolver/Tests/MMFAdvSphere.xml
+++ b/solvers/ADRSolver/Tests/MMFAdvSphere.xml
@@ -2642,13 +2642,17 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="MMFAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="SurfaceType" VALUE="Sphere" />
<I PROPERTY="TestType" VALUE="AdvectionBell" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Movement_fixed_2D_curved_quads.xml b/solvers/ADRSolver/Tests/Movement_fixed_2D_curved_quads.xml
index 82868fab143d942902b1428b509b6fcf3921be0e..30b694144e9fa1060043117e0a5b1c684080296f 100644
--- a/solvers/ADRSolver/Tests/Movement_fixed_2D_curved_quads.xml
+++ b/solvers/ADRSolver/Tests/Movement_fixed_2D_curved_quads.xml
@@ -351,10 +351,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="WEIGHTPARTITIONS" VALUE="DOF" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Movement_fixed_2D_varied.xml b/solvers/ADRSolver/Tests/Movement_fixed_2D_varied.xml
index d22e0b93a6461e079d4fe4df82b3e37a55108f90..5e17a59781ed2b97d2141394b3d4eccc791fad2f 100644
--- a/solvers/ADRSolver/Tests/Movement_fixed_2D_varied.xml
+++ b/solvers/ADRSolver/Tests/Movement_fixed_2D_varied.xml
@@ -362,10 +362,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="WEIGHTPARTITIONS" VALUE="DOF" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
<V ID="1"> v </V>
diff --git a/solvers/ADRSolver/Tests/Movement_fixed_3D_Hex41.xml b/solvers/ADRSolver/Tests/Movement_fixed_3D_Hex41.xml
index f612f7d2f4cbea3345bad510d88429a26b267c83..3580639d997b9059e7d8d4f296e9244cfc442460 100644
--- a/solvers/ADRSolver/Tests/Movement_fixed_3D_Hex41.xml
+++ b/solvers/ADRSolver/Tests/Movement_fixed_3D_Hex41.xml
@@ -178,10 +178,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="WEIGHTPARTITIONS" VALUE="DOF" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Movement_fixed_3D_Hex_3zones_Periodic_par.xml b/solvers/ADRSolver/Tests/Movement_fixed_3D_Hex_3zones_Periodic_par.xml
index b47cb11cfc8bf57600703a0156476f70eaece710..85ca60241aa43424d69d155a6faef89b480e1145 100644
--- a/solvers/ADRSolver/Tests/Movement_fixed_3D_Hex_3zones_Periodic_par.xml
+++ b/solvers/ADRSolver/Tests/Movement_fixed_3D_Hex_3zones_Periodic_par.xml
@@ -82,10 +82,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="WEIGHTPARTITIONS" VALUE="DOF" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Movement_fixed_3D_stacked_cylinders_curved.xml b/solvers/ADRSolver/Tests/Movement_fixed_3D_stacked_cylinders_curved.xml
index eb64cd0ac193dc5d6e0685e12560177e9eec9929..043c94b1ffd4c534b0b276b3ca936890d888f846 100644
--- a/solvers/ADRSolver/Tests/Movement_fixed_3D_stacked_cylinders_curved.xml
+++ b/solvers/ADRSolver/Tests/Movement_fixed_3D_stacked_cylinders_curved.xml
@@ -68,10 +68,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="WEIGHTPARTITIONS" VALUE="DOF" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Movement_fixed_3D_stacked_cylinders_curved_hdf5.xml b/solvers/ADRSolver/Tests/Movement_fixed_3D_stacked_cylinders_curved_hdf5.xml
index 02d30159397661cb317ef39e939c280500cb60a6..24b9be4d7d59dd896899d20417f910cb7876f8c5 100644
--- a/solvers/ADRSolver/Tests/Movement_fixed_3D_stacked_cylinders_curved_hdf5.xml
+++ b/solvers/ADRSolver/Tests/Movement_fixed_3D_stacked_cylinders_curved_hdf5.xml
@@ -36,10 +36,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="WEIGHTPARTITIONS" VALUE="DOF" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0">u</V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Movement_fixed_interfaces232_dirichlet.xml b/solvers/ADRSolver/Tests/Movement_fixed_interfaces232_dirichlet.xml
index 534ece420e3caf13906807dfe30bce793d098543..dd3c996434c48858d4cdd9a055f920a60dfb6279 100644
--- a/solvers/ADRSolver/Tests/Movement_fixed_interfaces232_dirichlet.xml
+++ b/solvers/ADRSolver/Tests/Movement_fixed_interfaces232_dirichlet.xml
@@ -80,9 +80,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Movement_fixed_interfaces232_periodic.xml b/solvers/ADRSolver/Tests/Movement_fixed_interfaces232_periodic.xml
index c4b3ecacf432e910b422f50cd32a32bf533b252e..e7fc58a6a43292b2793d4edb8acfa9f413d50a5e 100644
--- a/solvers/ADRSolver/Tests/Movement_fixed_interfaces232_periodic.xml
+++ b/solvers/ADRSolver/Tests/Movement_fixed_interfaces232_periodic.xml
@@ -81,9 +81,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Movement_rotate_3D_stacked_cylinders_curved_par.xml b/solvers/ADRSolver/Tests/Movement_rotate_3D_stacked_cylinders_curved_par.xml
index 7c2da0aa77f3eea1fafe2c264415b7d8b5f1dd91..bf32b9e59ad1b8bdd241e60e949cc2645c5b84aa 100644
--- a/solvers/ADRSolver/Tests/Movement_rotate_3D_stacked_cylinders_curved_par.xml
+++ b/solvers/ADRSolver/Tests/Movement_rotate_3D_stacked_cylinders_curved_par.xml
@@ -1259,10 +1259,14 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="WEIGHTPARTITIONS" VALUE="DOF" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/Movement_translate_interfaces232_dirichlet.xml b/solvers/ADRSolver/Tests/Movement_translate_interfaces232_dirichlet.xml
index 51506808c6c674b9c36a01dc1109fc117352309f..ca202d02b85cc1c327fe843d4e511706cb6ca6c2 100644
--- a/solvers/ADRSolver/Tests/Movement_translate_interfaces232_dirichlet.xml
+++ b/solvers/ADRSolver/Tests/Movement_translate_interfaces232_dirichlet.xml
@@ -81,11 +81,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="SkipInterfaceCheck" VALUE="True"/>
</SOLVERINFO>
-
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<VARIABLES>
<V ID="0"> u </V>
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0.xml
index 330421d0ba9b95542f8e728f160252f44fdc1276..3a6b32cc36ed0a1184a2e799cfd61874b4ccf881 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0.xml
@@ -69,19 +69,30 @@
<TIMELEVEL VALUE="0">
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</TIMELEVEL>
<TIMELEVEL VALUE="1">
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</TIMELEVEL>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P> TimeStep = 0.0001 </P>
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0_xml/P0000000.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0_xml/P0000000.xml
index 88e53453f26c2f003d07c4747296e7b3883843da..f8e3d8e081eeb560a15ed8adc8a3912d48c022ad 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0_xml/P0000000.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0_xml/P0000000.xml
@@ -36,10 +36,21 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P>TimeStep = 0.0001</P>
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0_xml/P0000001.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0_xml/P0000001.xml
index 3b769955d8284aa6fe30d44e4c81002979af8d25..b13a6cdb9b2e51e0733348408c3ec943fe885ca4 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0_xml/P0000001.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter0_xml/P0000001.xml
@@ -41,10 +41,21 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P>TimeStep = 0.0001</P>
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2.xml
index 698b927ecd419084cea4bc614962307a0eb5f577..aecd6635a03e495e898df5802e62fbbb77f27fdf 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2.xml
@@ -69,19 +69,30 @@
<TIMELEVEL VALUE="0">
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</TIMELEVEL>
<TIMELEVEL VALUE="1">
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</TIMELEVEL>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P> TimeStep = 0.0001 </P>
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2_xml/P0000000.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2_xml/P0000000.xml
index e6c47277a4fd21f57229e051c3cbc30e533c6660..12d237cb8dbf460f7dbaf5e8c06a11bfce041d13 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2_xml/P0000000.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2_xml/P0000000.xml
@@ -36,10 +36,21 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P>TimeStep = 0.0001</P>
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2_xml/P0000001.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2_xml/P0000001.xml
index 9f9222abbe8c592cdd35953443bc5844e0195307..78f7028446eda79999fa51467c2113f0607f3b85 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2_xml/P0000001.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter2_xml/P0000001.xml
@@ -41,10 +41,21 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P>TimeStep = 0.0001</P>
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4.xml
index 5c8d6f9d7621f9ba3837a5b71fe69abf4a3ad4ac..5b7d6be998ce4855aa869dcfb5a68297dcf86483 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4.xml
@@ -69,19 +69,30 @@
<TIMELEVEL VALUE="0">
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</TIMELEVEL>
<TIMELEVEL VALUE="1">
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</TIMELEVEL>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P> TimeStep = 0.0001 </P>
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4_xml/P0000000.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4_xml/P0000000.xml
index 3b041cb8090ca75dcc29e0dea35211c253f83cc1..2fadebe7f3e6a81ab8dcf4dabe2f6ccda0c6b91a 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4_xml/P0000000.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4_xml/P0000000.xml
@@ -36,10 +36,21 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P>TimeStep = 0.0001</P>
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4_xml/P0000001.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4_xml/P0000001.xml
index c94f37a6712a611b725fd5f4e6f24bcae22d692e..fe9862f9054e33cea958d907ac2c49432eff9ef4 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4_xml/P0000001.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m12_iter4_xml/P0000001.xml
@@ -41,10 +41,21 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P>TimeStep = 0.0001</P>
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter0.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter0.xml
index 67500794e2cd98ce951a693cea30b572d7a8f71c..2cc9fd2b30b004926391691bbd0ca994d7c4e9aa 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter0.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter0.xml
@@ -27,11 +27,16 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P> TimeStep = 0.0001 </P> <!-- Time step -->
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter2.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter2.xml
index 3b302e1e30936cbeb3641b88353a5c08e648cfc9..6a61080394a574f23aee1f5c08a9d87513f15add 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter2.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter2.xml
@@ -27,11 +27,16 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P> TimeStep = 0.0001 </P> <!-- Time step -->
diff --git a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter4.xml b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter4.xml
index de191e0a9b59ec54af90fb7da9b61a8c468bb41e..b98149b234268bcce35fd3a63c5ce6e98e0094f2 100644
--- a/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter4.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverImDiffusion_m6_iter4.xml
@@ -27,11 +27,16 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="Driver" VALUE="Parareal" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P> TimeStep = 0.0001 </P> <!-- Time step -->
diff --git a/solvers/ADRSolver/Tests/PararealDriverUnsteadyAdvection2D.xml b/solvers/ADRSolver/Tests/PararealDriverUnsteadyAdvection2D.xml
index c7ac5d1adf563cac78d7f386d3384047a6f0718b..456bca71976481856da3b1a37e16c40237e60c00 100644
--- a/solvers/ADRSolver/Tests/PararealDriverUnsteadyAdvection2D.xml
+++ b/solvers/ADRSolver/Tests/PararealDriverUnsteadyAdvection2D.xml
@@ -53,7 +53,6 @@
<TIMELEVEL VALUE="0">
<I PROPERTY="EQTYPE" VALUE="UnsteadyAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
@@ -62,7 +61,6 @@
<TIMELEVEL VALUE="1">
<I PROPERTY="EQTYPE" VALUE="UnsteadyAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
@@ -70,6 +68,17 @@
</TIMELEVEL>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<TIMELEVEL VALUE="0">
<P> TimeStep = 1.0e-04 </P>
diff --git a/solvers/ADRSolver/Tests/PararealDriver_Movement_fixed_3D_stacked_cylinders_curved_hdf5.xml b/solvers/ADRSolver/Tests/PararealDriver_Movement_fixed_3D_stacked_cylinders_curved_hdf5.xml
index 0e57eb6555b93b26995d352ac43c95657574843c..818e40c889af1a0a8d96956533d6ecbc52f824b2 100644
--- a/solvers/ADRSolver/Tests/PararealDriver_Movement_fixed_3D_stacked_cylinders_curved_hdf5.xml
+++ b/solvers/ADRSolver/Tests/PararealDriver_Movement_fixed_3D_stacked_cylinders_curved_hdf5.xml
@@ -48,7 +48,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="WEIGHTPARTITIONS" VALUE="DOF" />
<I PROPERTY="Driver" VALUE="Parareal" />
</TIMELEVEL>
@@ -57,10 +56,20 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta1" />
</TIMELEVEL>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <TIMELEVEL VALUE="0">
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMELEVEL>
+ <TIMELEVEL VALUE="1">
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMELEVEL>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0">u</V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/SVV_Prism.xml b/solvers/ADRSolver/Tests/SVV_Prism.xml
index 8cd18913a382709042ba19b5c96c49a7f68da8bd..37ff4faddc9b4c494a4f8edf9fd2ad71a699aa1c 100644
--- a/solvers/ADRSolver/Tests/SVV_Prism.xml
+++ b/solvers/ADRSolver/Tests/SVV_Prism.xml
@@ -497,10 +497,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/ADRSolver/Tests/SVV_Quad.xml b/solvers/ADRSolver/Tests/SVV_Quad.xml
index bc7e40d2905f8e9fa1b1852f3d4e174fd47c772c..34378fbcb82685c48cf01b3f83261f8c872d0038 100644
--- a/solvers/ADRSolver/Tests/SVV_Quad.xml
+++ b/solvers/ADRSolver/Tests/SVV_Quad.xml
@@ -150,10 +150,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder3" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<FUNCTION NAME="InitialConditions">
<E VAR="u" VALUE="sin(wavefreq*x)*sin(wavefreq*y)" />
</FUNCTION>
diff --git a/solvers/ADRSolver/Tests/SVV_Tet.xml b/solvers/ADRSolver/Tests/SVV_Tet.xml
index cb9a1e57b29c9703be356058c19e928ec3de009d..b983100bfabe44c4fa0727c569e3f4f2a98c6297 100644
--- a/solvers/ADRSolver/Tests/SVV_Tet.xml
+++ b/solvers/ADRSolver/Tests/SVV_Tet.xml
@@ -911,10 +911,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/ADRSolver/Tests/SVV_Tri.xml b/solvers/ADRSolver/Tests/SVV_Tri.xml
index 1901ade0cc4b15a3c4ee6e1147e249d77f3f3ddc..8c6d10ef0cc5583d4446892b2fb6b5e9278cff53 100644
--- a/solvers/ADRSolver/Tests/SVV_Tri.xml
+++ b/solvers/ADRSolver/Tests/SVV_Tri.xml
@@ -594,10 +594,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyDiffusion" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder3" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<FUNCTION NAME="InitialConditions">
<!--E VAR="u" VALUE="sin(wavefreq*x)*sin(wavefreq*y)+3*exp(-((x-x0)*(x-x0)+(y-y0)*(y-y0))/(a*a))" /!-->
<E VAR="u" VALUE="sin(wavefreq*x)*sin(wavefreq*y)" />
diff --git a/solvers/ADRSolver/Tests/TestMMFAdvCube.xml b/solvers/ADRSolver/Tests/TestMMFAdvCube.xml
index a4195297dc47ff09b103950f95a10ee44a84e5be..d6c42b0a816fc959b01e3ea083911507c46858de 100644
--- a/solvers/ADRSolver/Tests/TestMMFAdvCube.xml
+++ b/solvers/ADRSolver/Tests/TestMMFAdvCube.xml
@@ -772,13 +772,17 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="MMFAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<I PROPERTY="TestType" VALUE="TestCube" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/TestMMFAdvPlane.xml b/solvers/ADRSolver/Tests/TestMMFAdvPlane.xml
index cb99ef0adb79b2ecdb2ee53531bfdbee4b6dfce5..5887b2c449bc4f789227dea710de080541966285 100644
--- a/solvers/ADRSolver/Tests/TestMMFAdvPlane.xml
+++ b/solvers/ADRSolver/Tests/TestMMFAdvPlane.xml
@@ -303,13 +303,17 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="MMFAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<I PROPERTY="TestType" VALUE="TestPlane" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/TestMMFAdvSphere.xml b/solvers/ADRSolver/Tests/TestMMFAdvSphere.xml
index 920362efdede441a1d5a2bab2d07812bcedc2764..f487d3c6e2baf07a8da8db1e67e01f139381b932 100644
--- a/solvers/ADRSolver/Tests/TestMMFAdvSphere.xml
+++ b/solvers/ADRSolver/Tests/TestMMFAdvSphere.xml
@@ -1995,13 +1995,17 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="MMFAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="SurfaceType" VALUE="Sphere" />
<I PROPERTY="TestType" VALUE="AdvectionBell" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_1_1.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_1_1.xml
index a8c3ca370217396a8f68985e211c64b97afc0e0b..f13a0e59df0e1eac3aef29b1a6c3952627ab8b45 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_1_1.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_1_1.xml
@@ -53,9 +53,15 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_1_1_1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 1 </ORDER>
+ <FREEPARAMETERS> 1 1 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0005 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_2_1.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_2_1.xml
index b4eb9ad7abb6340223fbdcd5b445d3acc7467ad6..145d56efb8210648ee58b20561c8f46290c31c97 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_2_1.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_2_1.xml
@@ -53,9 +53,15 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_1_2_1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 1 </ORDER>
+ <FREEPARAMETERS> 1 2 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0005 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_2_2.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_2_2.xml
index b96ab90ed947908895c05bd6766d3f3b3ac1abfe..7ee355a3abbd1cfa30b0ddd01634b50b6b1bccfc 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_2_2.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_1_2_2.xml
@@ -53,9 +53,15 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_1_2_2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 2 </ORDER>
+ <FREEPARAMETERS> 1 2 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0005 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_2_2.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_2_2.xml
index 129b906b7b2e267024c54cbca2fa4c134d807a18..efec7f756e54559f101c9b671e6df5e6cfad97c8 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_2_2.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_2_2.xml
@@ -53,9 +53,15 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_2_2_2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 2 </ORDER>
+ <FREEPARAMETERS> 2 2 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0005 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_3_2.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_3_2.xml
index a458b6c419901f19be2528c769f111e398ac5b29..5aaa6dbd8076d39c0596f78023803ba49e21696a 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_3_2.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_3_2.xml
@@ -53,9 +53,15 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_2_3_2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 2 </ORDER>
+ <FREEPARAMETERS> 2 3 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0005 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_3_3.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_3_3.xml
index 83b746c8ae26a2ad714a5dee8a77ea21eb29482e..90727eff48be1c3ab24f0a7521947984109a67c8 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_3_3.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_2_3_3.xml
@@ -53,9 +53,15 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_2_3_3" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 3 </ORDER>
+ <FREEPARAMETERS> 2 3 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0005 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_3_4_3.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_3_4_3.xml
index 855dea669186b95c5667fa35453a3612c55776b3..d04cf8b2588c1480cbe0182d939a691375f9eb42 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_3_4_3.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_3_4_3.xml
@@ -53,9 +53,15 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_3_4_3" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 3 </ORDER>
+ <FREEPARAMETERS> 3 4 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0005 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_4_4_3.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_4_4_3.xml
index 170c4b5ac1a091ba8039f41b7eb3d9fef4bd900b..51d31e168d7c1ca2ce266a6644761264f5068da8 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_4_4_3.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion2D_IMEXdirk_4_4_3.xml
@@ -53,9 +53,15 @@
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_4_4_3" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 3 </ORDER>
+ <FREEPARAMETERS> 4 4 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0005 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_2D_ImexDG.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_2D_ImexDG.xml
index bdf947d726f4434f2bbfd97cb5ff89d498da9f95..ef7857fed2c1a15b305aba63c30d3fd7a5f8558a 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_2D_ImexDG.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_2D_ImexDG.xml
@@ -52,10 +52,14 @@
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 1.0e-04 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_2D_WeakDG.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_2D_WeakDG.xml
index 23a48bf4dc8a2a6b5bad5c4304bbeec1bacea210..dbf4908a13e626f71b58fb98d119dd439512c4d3 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_2D_WeakDG.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_2D_WeakDG.xml
@@ -52,10 +52,14 @@
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 1.0e-04 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo1D_FFT.xml
index ba87459de0615c2ef84bc8e2aea0cd7af2ec37b8..52149e780421a5342d88cfa324b597da8e30d8f4 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo1D_FFT.xml
@@ -60,10 +60,14 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo1D_MVM.xml
index ff9a221b6272fbba88d3a856a626368d53563e75..e2cf19fead05092cbcf39e7eb52676e0438b850b 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo1D_MVM.xml
@@ -60,9 +60,13 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo2D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo2D_FFT.xml
index e8e04cd3824b77e772bd4d998a5ae0d4b18c855f..941c5857b0d759e996c74bbd79599460d6568707 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo2D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo2D_FFT.xml
@@ -42,9 +42,13 @@
<I PROPERTY="USEFFT" VALUE="FFTW" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo2D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo2D_MVM.xml
index 0ec1875fcfa130604a23e0756a65b948fc4f7901..470db4a78d1e768517ad3f3158d5e780d1798181 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo2D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_3DHomo2D_MVM.xml
@@ -39,9 +39,13 @@
<I PROPERTY="HOMOGENEOUS" VALUE="2D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRDG_LFRDG_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRDG_LFRDG_3DHomo1D_FFT.xml
index 3bb8e0540d43c415f1e07b6aff9837fe057ae2c7..14a9217a9866a6f730bc7aad02ac23af53398b0e 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRDG_LFRDG_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRDG_LFRDG_3DHomo1D_FFT.xml
@@ -62,11 +62,15 @@
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRDG3DHomogeneous1D" />
<I PROPERTY="DiffusionnAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRDG_LFRDG_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRDG_LFRDG_3DHomo1D_MVM.xml
index b070fbcb329ca20bf9f9c5ec5d3d742730534391..00287a160679737f04668e1afe6d6119c406a31c 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRDG_LFRDG_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRDG_LFRDG_3DHomo1D_MVM.xml
@@ -62,10 +62,14 @@
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRDG3DHomogeneous1D" />
<I PROPERTY="DiffusionnAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRHU_LFRHU_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRHU_LFRHU_3DHomo1D_FFT.xml
index 2715548e3a5dcdb098f1d8af5e1fa5f234c40d6d..c5bebc6f12b8da731da7d780a7d43c8b0138ccc5 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRHU_LFRHU_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRHU_LFRHU_3DHomo1D_FFT.xml
@@ -62,11 +62,15 @@
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRHU3DHomogeneous1D" />
<I PROPERTY="DiffusionnAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRHU_LFRHU_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRHU_LFRHU_3DHomo1D_MVM.xml
index b4cb7d460bd48e8c728a921f043991dc95066883..2aacbcc0dd61f4838847a5c0df7873e1d7cd63fd 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRHU_LFRHU_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRHU_LFRHU_3DHomo1D_MVM.xml
@@ -62,10 +62,14 @@
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRHU3DHomogeneous1D" />
<I PROPERTY="DiffusionnAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRSD_LFRSD_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRSD_LFRSD_3DHomo1D_FFT.xml
index ee6077fa6d1b1da0352d46f153a6d857841065b3..ca04e017e3bccc43e505e6b02616eb7795d6749e 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRSD_LFRSD_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRSD_LFRSD_3DHomo1D_FFT.xml
@@ -62,11 +62,15 @@
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRSD3DHomogeneous1D" />
<I PROPERTY="DiffusionnAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRSD_LFRSD_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRSD_LFRSD_3DHomo1D_MVM.xml
index 952a79d22918d2662284ff8a1f66cc3e94f1bbc7..edb59c2c645b2eee21c79441eea247bd04d408fb 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRSD_LFRSD_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_FRSD_LFRSD_3DHomo1D_MVM.xml
@@ -62,10 +62,14 @@
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRSD3DHomogeneous1D" />
<I PROPERTY="DiffusionnAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order1_0001.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order1_0001.xml
index 855bce6d4765aab92593f75a75c3a34238b0d703..9c3f9b5da56b2b5ac45bb2bc134dd21f8842b667 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order1_0001.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order1_0001.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order1_001.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order1_001.xml
index 5d6baea01b86a8259686e9f20b668946e05be538..d35ec2196980b402c31294b7e9ce800c44e6e2c8 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order1_001.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order1_001.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order2_0001.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order2_0001.xml
index a39c404515e08c36e704921379f564d01f7757ce..d50ded5c8b8ae86a19a11428aedae5151bfe63f1 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order2_0001.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order2_0001.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order2_001.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order2_001.xml
index 4a07e735038a0ddf2e455a4b620d1a08f5eef95f..2634a62c7ca4708ebb722910c85c27754496f163 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order2_001.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_Order2_001.xml
@@ -58,9 +58,13 @@
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_WeakDG_LDG_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_WeakDG_LDG_3DHomo1D_FFT.xml
index e1ce92a718273ce739e052eccc3138bb3130d2a1..73f899ea2ec8137ba8036f62bc1d948e054f169b 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_WeakDG_LDG_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_WeakDG_LDG_3DHomo1D_FFT.xml
@@ -62,11 +62,15 @@
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LDG3DHomogeneous1D" />
<I PROPERTY="DiffusionnAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_WeakDG_LDG_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_WeakDG_LDG_3DHomo1D_MVM.xml
index 99803b0d434d47d6a7b6816c745012f4b5d58a53..ff32a9c0f19c07df8374cf6c1003e6cbda236727 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_WeakDG_LDG_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvectionDiffusion_WeakDG_LDG_3DHomo1D_MVM.xml
@@ -62,10 +62,14 @@
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LDG3DHomogeneous1D" />
<I PROPERTY="DiffusionnAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRDG_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRDG_3DHomo1D_FFT.xml
index f41cfdc1b2ede727edd4c4d0bb50b23fcff4046d..5b25dcab53192ec1ba8a7806ab0b8c5c9385d3a2 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRDG_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRDG_3DHomo1D_FFT.xml
@@ -60,11 +60,15 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="FRDG3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRDG_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRDG_3DHomo1D_MVM.xml
index 90dbe26739ed1aee8f1dec0995f6d03aebaa164f..c29bfd2a4d726c46472068d4f81e51f471e8e866 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRDG_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRDG_3DHomo1D_MVM.xml
@@ -60,10 +60,14 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="FRDG3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRHU_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRHU_3DHomo1D_FFT.xml
index 3a7f8cf92262291c00f7e52f4fd318744106045b..d7f844903f9f9706b46db6e06d4e006cd3d92536 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRHU_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRHU_3DHomo1D_FFT.xml
@@ -60,11 +60,15 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="FRHU3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRHU_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRHU_3DHomo1D_MVM.xml
index 4ee62cd94f35e0f648d5e997f18ca2a422d699b4..7de623ffc1c62b1b8bfbea9ae06ab0e734c7fd77 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRHU_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRHU_3DHomo1D_MVM.xml
@@ -60,10 +60,14 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="FRHU3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRSD_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRSD_3DHomo1D_FFT.xml
index e193c7f0e439a6242884c14c68ee0d5baf6562f1..41658d9b733d1201b950b9c1d23b5c252e649e68 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRSD_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRSD_3DHomo1D_FFT.xml
@@ -60,11 +60,15 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="FRSD3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRSD_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRSD_3DHomo1D_MVM.xml
index ac7e1bd92d321045d025449067c5cb985b076e62..b083ccd82e9a4f5a19fe666763c192cc3c84fdb4 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvection_FRSD_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvection_FRSD_3DHomo1D_MVM.xml
@@ -60,10 +60,14 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="FRSD3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_DG.xml b/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_DG.xml
index 823c82a6f3886b7651dacec7075694541cddae53..d271ed7f91e5234954a1e5cf2564998e8eb9a956 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_DG.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_DG.xml
@@ -102,9 +102,13 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="WeakDG3DHomogeneous1D" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
<V ID="1"> v </V>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_FFT.xml
index 2fd3857c3a2ac77cc750669902bb69aaaa07c690..f444030b69638b074c464ed9a66d0bf18293d4d8 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_FFT.xml
@@ -60,11 +60,15 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="WeakDG3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_MVM.xml
index ae89503b9c0fbed4062fd0405a7b48ebfe9a2a7b..e515e3897fee5fbc00e15f050451dc131aa4b607 100644
--- a/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyAdvection_WDG_3DHomo1D_MVM.xml
@@ -60,10 +60,14 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionAdvancement" VALUE="Explicit" />
<I PROPERTY="AdvectionType" VALUE="WeakDG3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LDG_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LDG_3DHomo1D_FFT.xml
index cc703e079d23cac74b7e35ce2c3e975de55c62f2..1482907c2a8802c18e9969190e77eacdb80c38e0 100644
--- a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LDG_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LDG_3DHomo1D_FFT.xml
@@ -60,11 +60,15 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LDG3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LDG_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LDG_3DHomo1D_MVM.xml
index 91c82f05a38b16b9ea08566f03c8a12352f562a6..2e062bfd9912530a8bf84acda9513e5b2ee20be0 100644
--- a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LDG_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LDG_3DHomo1D_MVM.xml
@@ -60,10 +60,14 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LDG3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRDG_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRDG_3DHomo1D_FFT.xml
index d282dde27bf91eef9b9e0272382ff72f0c44a2e4..1dba357401e674587ab197d393abf0b690fc76e0 100644
--- a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRDG_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRDG_3DHomo1D_FFT.xml
@@ -60,11 +60,15 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRDG3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRDG_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRDG_3DHomo1D_MVM.xml
index f3cf329d9dce0a89cbb5c4edddf7430ce99f024f..4b48c02c7d283edc9303b3b644144a5a11b4bb53 100644
--- a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRDG_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRDG_3DHomo1D_MVM.xml
@@ -60,10 +60,14 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRDG3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRHU_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRHU_3DHomo1D_FFT.xml
index 1b4601f40716a6396805446a001d524e30db79eb..6257ff7b228ba7c7b61c83225af8806ebdbababb 100644
--- a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRHU_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRHU_3DHomo1D_FFT.xml
@@ -60,11 +60,15 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRHU3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRHU_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRHU_3DHomo1D_MVM.xml
index 14166d5df6168af133aee30a0b38c6c91f80d4f7..1ec96ed824f0613226a7a6f31a93d4127c0e9456 100644
--- a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRHU_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRHU_3DHomo1D_MVM.xml
@@ -60,10 +60,14 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRHU3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRSD_3DHomo1D_FFT.xml b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRSD_3DHomo1D_FFT.xml
index 7e74249e1dc66ea881a3e82ed4343ef220701cf7..3e1e06aa616f809a3830e0727aca5a07a1aecff8 100644
--- a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRSD_3DHomo1D_FFT.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRSD_3DHomo1D_FFT.xml
@@ -60,11 +60,15 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRSD3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRSD_3DHomo1D_MVM.xml b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRSD_3DHomo1D_MVM.xml
index 5002241399b96fe3a48b12136e2d9ed5b9206d22..be9ecef6fdbf9709409ca039d0d211d8e0b3b06b 100644
--- a/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRSD_3DHomo1D_MVM.xml
+++ b/solvers/ADRSolver/Tests/UnsteadyDiffusion_LFRSD_3DHomo1D_MVM.xml
@@ -60,10 +60,14 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
<I PROPERTY="DiffusionType" VALUE="LFRSD3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/AcousticSolver/Tests/APE_1DPulseSource_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/APE_1DPulseSource_WeakDG_MODIFIED.xml
index 28c3d5a0f49e1bd080d860fc26239069a363a0de..5291c758590c51bb67b7e9577e4dc5a61be1891c 100644
--- a/solvers/AcousticSolver/Tests/APE_1DPulseSource_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/APE_1DPulseSource_WeakDG_MODIFIED.xml
@@ -40,9 +40,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="APE"/> <!-- Acoustic perturbation equations -->
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="LaxFriedrichs"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 300 </P>
diff --git a/solvers/AcousticSolver/Tests/APE_1DPulseWall_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/APE_1DPulseWall_WeakDG_MODIFIED.xml
index 490af4387575a03dfd5b97c16ab66ee85be06f4a..e3c21d0f88c6f11392b165a39892d78aea5ffeed 100644
--- a/solvers/AcousticSolver/Tests/APE_1DPulseWall_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/APE_1DPulseWall_WeakDG_MODIFIED.xml
@@ -41,9 +41,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="APE"/> <!-- Acoustic perturbation equations -->
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Upwind"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 300 </P>
diff --git a/solvers/AcousticSolver/Tests/APE_2DChannel_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/APE_2DChannel_WeakDG_MODIFIED.xml
index 6857f6a2bd26df69c3e4dc1d9f9e8fbbf36a8e8f..d5075da7f3d8837ce7216d510d2b03c969ff5986 100644
--- a/solvers/AcousticSolver/Tests/APE_2DChannel_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/APE_2DChannel_WeakDG_MODIFIED.xml
@@ -754,9 +754,12 @@
<I PROPERTY="EQType" VALUE="APE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00002 </P>
<P> NumSteps = 5 </P>
diff --git a/solvers/AcousticSolver/Tests/APE_2DPulseAdv_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/APE_2DPulseAdv_WeakDG_MODIFIED.xml
index d7e444028815d93a0d8c24bd1e8254cc0926c84e..d8e548a3ef3e2424037b7f7d857d46380a248825 100644
--- a/solvers/AcousticSolver/Tests/APE_2DPulseAdv_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/APE_2DPulseAdv_WeakDG_MODIFIED.xml
@@ -311,9 +311,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="APE"/>
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="LaxFriedrichs"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 1e-05 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/AcousticSolver/Tests/APE_2DPulseInterp_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/APE_2DPulseInterp_WeakDG_MODIFIED.xml
index 78f2e948067c55c7a2166070a7b8078cd9787928..e7d4425e54e662d9f9dacbd64c48bcae196ec920 100644
--- a/solvers/AcousticSolver/Tests/APE_2DPulseInterp_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/APE_2DPulseInterp_WeakDG_MODIFIED.xml
@@ -313,9 +313,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="APE"/> <!-- Acoustic perturbation equations -->
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="LaxFriedrichs"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 2 </P>
diff --git a/solvers/AcousticSolver/Tests/APE_2DPulseWall_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/APE_2DPulseWall_WeakDG_MODIFIED.xml
index dc80ae803cf8f8f803823f3059df6fa4b1cd85ce..e8637df3da918dcd5b44c3927d3c6a020fabb074 100644
--- a/solvers/AcousticSolver/Tests/APE_2DPulseWall_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/APE_2DPulseWall_WeakDG_MODIFIED.xml
@@ -313,9 +313,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="APE"/> <!-- Acoustic perturbation equations -->
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Upwind"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 400 </P>
diff --git a/solvers/AcousticSolver/Tests/APE_2DVariableC_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/APE_2DVariableC_WeakDG_MODIFIED.xml
index c4e02ccd6878834ba2b1d8b1f1f1924ccf32bdc1..ba0780d21a0b307599ca91d528ab748e255d7744 100644
--- a/solvers/AcousticSolver/Tests/APE_2DVariableC_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/APE_2DVariableC_WeakDG_MODIFIED.xml
@@ -88,9 +88,13 @@
<I PROPERTY="EQType" VALUE="APE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00002 </P>
<P> NumSteps = 500 </P>
diff --git a/solvers/AcousticSolver/Tests/APE_3DMMF_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/APE_3DMMF_WeakDG_MODIFIED.xml
index 79ff4869600b8b5a5e194383251daa4ce6a343ed..f1f3f113e8bb63789a44105c84d096a78af6e44d 100644
--- a/solvers/AcousticSolver/Tests/APE_3DMMF_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/APE_3DMMF_WeakDG_MODIFIED.xml
@@ -27,9 +27,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="APE"/>
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="APEUpwind"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 1e-15 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/AcousticSolver/Tests/APE_3DPulseWall_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/APE_3DPulseWall_WeakDG_MODIFIED.xml
index 1c9057e5e59345e9d1eee21a8dd57a69faacde81..518c66077ed376a4a14c2684c2a8c0eff24a1440 100644
--- a/solvers/AcousticSolver/Tests/APE_3DPulseWall_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/APE_3DPulseWall_WeakDG_MODIFIED.xml
@@ -1361,9 +1361,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="APE"/> <!-- Acoustic perturbation equations -->
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Upwind"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 300 </P>
diff --git a/solvers/AcousticSolver/Tests/APE_3DPulse_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/APE_3DPulse_WeakDG_MODIFIED.xml
index 8334bdebed664bfa9773b81cfd81d83002781ee9..c068610bce84175d0f810d32fec9a14c11bed3b9 100644
--- a/solvers/AcousticSolver/Tests/APE_3DPulse_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/APE_3DPulse_WeakDG_MODIFIED.xml
@@ -1361,9 +1361,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="APE"/> <!-- Acoustic perturbation equations -->
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Upwind"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/AcousticSolver/Tests/LEE_1DPulseSource_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/LEE_1DPulseSource_WeakDG_MODIFIED.xml
index 620b57779e32a6f8b40ca0cb198527d0066d1e24..15a5a4d95c050b83a398600c2eb02cefb48c1936 100644
--- a/solvers/AcousticSolver/Tests/LEE_1DPulseSource_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/LEE_1DPulseSource_WeakDG_MODIFIED.xml
@@ -40,9 +40,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="LEE"/>
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="LaxFriedrichs"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 300 </P>
diff --git a/solvers/AcousticSolver/Tests/LEE_2DPulseAdv_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/LEE_2DPulseAdv_WeakDG_MODIFIED.xml
index 676e25cf1e4e296f3641c16c58e9146d9aa43bb0..c4ecd4b374ad1ca4aeb91dd59a98ce07159465b9 100644
--- a/solvers/AcousticSolver/Tests/LEE_2DPulseAdv_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/LEE_2DPulseAdv_WeakDG_MODIFIED.xml
@@ -311,9 +311,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="LEE"/>
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="LaxFriedrichs"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 1e-05 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/AcousticSolver/Tests/LEE_2DPulseWall_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/LEE_2DPulseWall_WeakDG_MODIFIED.xml
index 7b52040f2bd72db9e1aadabb7e1b54e7310bdef0..02772c1b506f2190eadcaaae7524fc5367ccdfe5 100644
--- a/solvers/AcousticSolver/Tests/LEE_2DPulseWall_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/LEE_2DPulseWall_WeakDG_MODIFIED.xml
@@ -311,9 +311,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="LEE"/> <!-- Acoustic perturbation equations -->
<I PROPERTY="Projection" VALUE="DisContinuous"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Upwind"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00001 </P>
<P> NumSteps = 400 </P>
diff --git a/solvers/AcousticSolver/Tests/LEE_2DVariableC_WeakDG_MODIFIED.xml b/solvers/AcousticSolver/Tests/LEE_2DVariableC_WeakDG_MODIFIED.xml
index a6b77c6e4e00805f51ae3a22ee2a44e36aed647f..97d9f97fb5f2fef1a7392e1569a5318a50b11364 100644
--- a/solvers/AcousticSolver/Tests/LEE_2DVariableC_WeakDG_MODIFIED.xml
+++ b/solvers/AcousticSolver/Tests/LEE_2DVariableC_WeakDG_MODIFIED.xml
@@ -86,9 +86,13 @@
<I PROPERTY="EQType" VALUE="LEE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
<I PROPERTY="UpwindType" VALUE="Upwind" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.00002 </P>
<P> NumSteps = 500 </P>
diff --git a/solvers/CompressibleFlowSolver/Tests/ChanFlow3D_infTurbExpl.xml b/solvers/CompressibleFlowSolver/Tests/ChanFlow3D_infTurbExpl.xml
index ab970f3e366d3f107e8214a835969af60575e4d8..58ddd450f04dbc4b11ddeb2687e5ee5e50383081 100644
--- a/solvers/CompressibleFlowSolver/Tests/ChanFlow3D_infTurbExpl.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ChanFlow3D_infTurbExpl.xml
@@ -36,13 +36,18 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="OutputExtraFields" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/CompressibleFlowSolver/Tests/ChanFlow3D_infTurbImpl.xml b/solvers/CompressibleFlowSolver/Tests/ChanFlow3D_infTurbImpl.xml
index 6d6cc6aef53f76da0942f34bef24ee62bf4b074f..fa564f3b2339d1b0ada6289de9f5d089f5f7b0e7 100644
--- a/solvers/CompressibleFlowSolver/Tests/ChanFlow3D_infTurbImpl.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ChanFlow3D_infTurbImpl.xml
@@ -36,7 +36,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="AdvectionAdvancement" VALUE="Implicit" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
<I PROPERTY="UpwindType" VALUE="Roe" />
@@ -44,7 +43,10 @@
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="OutputExtraFields" VALUE="True" />
</SOLVERINFO>
-
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.02 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LDG_GAUSS.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LDG_GAUSS.xml
index 0ebbff922b54b5462e5fc16b6bfd93a8bd5f081f..b47049391687afd47ec972574cad16cdcd11e9f5 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LDG_GAUSS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LDG_GAUSS.xml
@@ -90,12 +90,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GAUSS.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GAUSS.xml
index e88712b880fbd1c5c0a9d7a12e95d04d8b8c3d90..72b87f5cb815e12f3d618360e48407fef3245eca 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GAUSS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GAUSS.xml
@@ -91,12 +91,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="DiffusionType" VALUE="LFRDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml
index 53f6beb5b21bc5a22e67c69d7198ca900aea6778..fd85f6f6b7986dbfd81d894c17eee2f1e64c7826 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml
@@ -95,13 +95,17 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRDG3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRDGNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_MVM.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_MVM.xml
index 342a33529dd9d969ba8ea15ac9888b6215b4d528..bc2d4085e41850cab2ad37deef1065d822b282eb 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_MVM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_MVM.xml
@@ -95,13 +95,17 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRDG3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRDGNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="MVM" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_adiabatic.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_adiabatic.xml
index 7e5eadac99d33d0a258550ba9a08ef6620c51af8..1430e5d3ceef0ca2aa81e821250b6397bfa4baee 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_adiabatic.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRDG_LFRDG_adiabatic.xml
@@ -90,12 +90,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="DiffusionType" VALUE="LFRDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LDG_SEM.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LDG_SEM.xml
index 6aac9c26a10025a47a1257f7f1adc5ea7f831b03..a150f30b0ecd8b02d252a6065e3050152c9c3a7d 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LDG_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LDG_SEM.xml
@@ -90,12 +90,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM.xml
index 5b23c540f9806c30dcf30aec9ae32a775b006561..8a600e0c98e6a59caa54776c67ebc07c0601a4e3 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM.xml
@@ -90,12 +90,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="DiffusionType" VALUE="LFRHUNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM_3DHOMO1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM_3DHOMO1D_FFT.xml
index d80b03102af05831d5dc6a72738919e2798a6326..5e5061d2cda997e89f671f7eb4cad692b676f736 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM_3DHOMO1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM_3DHOMO1D_FFT.xml
@@ -95,13 +95,17 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRHU3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRHUNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM_3DHOMO1D_MVM.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM_3DHOMO1D_MVM.xml
index 85021b71b1bc5b87b25c230b51e0f0fc7db12387..6968776f6dda35ae5cbc387ee47a6d0361c960b0 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM_3DHOMO1D_MVM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRHU_LFRHU_SEM_3DHOMO1D_MVM.xml
@@ -95,13 +95,17 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRHU3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRHUNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="MVM" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRSD_LFRSD_MODIFIED_3DHOMO1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRSD_LFRSD_MODIFIED_3DHOMO1D_FFT.xml
index 0a7687ed36dd7202b06d265e5209bddf77042680..82c513a0a32b5dc94fb6d0a13511eca639535420 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRSD_LFRSD_MODIFIED_3DHOMO1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRSD_LFRSD_MODIFIED_3DHOMO1D_FFT.xml
@@ -95,13 +95,17 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRSD3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRSDNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM.xml b/solvers/CompressibleFlowSolver/Tests/Couette_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM.xml
index e51eeec4657d76f5145c7d4dacab9fb8245d08fa..834fe7161107efa5b8c6b5cfe6802307bb8da91a 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM.xml
@@ -95,13 +95,17 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRSD3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRSDNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="MVM" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_Adiabatic.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_Adiabatic.xml
index 758b532008d7e50c58f7e060e2629cdfbbbe0fc8..b068bdab4a294b1ebf753bd5be5b4946343ed540 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_Adiabatic.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_Adiabatic.xml
@@ -60,12 +60,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM.xml
index a71cb22a935bb61a2e9660214f8ae8d964050817..b972df9972477bb382b6116aed52afaabbf2f6e9 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM.xml
@@ -64,13 +64,18 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="LinSysIterSolverTypeInNonlin" VALUE="GMRES" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON.xml
index f926079a960062308162e71be2546854b2c3ff8a..f111df3f3e32eee50c70b3359440b2f900e76e70 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON.xml
@@ -65,7 +65,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
@@ -73,6 +72,12 @@
<I PROPERTY="flagImplicitItsStatistics" VALUE = "True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON_NonDim_Pri.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON_NonDim_Pri.xml
index 6a3d127f1b3dbee7ec6de33630eda336a27dfa8e..624d7b7e31cde8e9fe9c5138dc6deac191815fd1 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON_NonDim_Pri.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON_NonDim_Pri.xml
@@ -139,13 +139,18 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="LinSysIterSolverTypeInNonlin" VALUE="GMRES" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON_NonDim_Tet.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON_NonDim_Tet.xml
index 29027b32cec7cb6c48a28c61d0bbf0be5a7530cd..831ceec581246305ca5488ff6cf98ff5095595e0 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON_NonDim_Tet.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_IP_MODIFIED_IM_PRECON_NonDim_Tet.xml
@@ -172,13 +172,18 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="LinSysIterSolverTypeInNonlin" VALUE="GMRES" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDGNS_MODIFIED_IM.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDGNS_MODIFIED_IM.xml
index 67c8cd545db5fe4a2f0cd422178d77a672fea878..60e180d41c6ff512dcefba71357019933ba5230b 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDGNS_MODIFIED_IM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDGNS_MODIFIED_IM.xml
@@ -64,13 +64,18 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="LinSysIterSolverTypeInNonlin" VALUE="GMRES" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDGNS_MODIFIED_IM_PRECON.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDGNS_MODIFIED_IM_PRECON.xml
index 3514d3530ad9da3c41cc5dc464cf107d572d1ee7..40a97ca10298edcc49f717300e0814f7527b2985 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDGNS_MODIFIED_IM_PRECON.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDGNS_MODIFIED_IM_PRECON.xml
@@ -65,7 +65,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
@@ -73,6 +72,11 @@
<I PROPERTY="flagImplicitItsStatistics" VALUE = "True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_Exact_par.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_Exact_par.xml
index ee2f1900c96ad209c5d7e70a538c1b54c783ffd9..8597b1b6bb63774c1315d20f5344ed76fffc5b64 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_Exact_par.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_Exact_par.xml
@@ -88,12 +88,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 2 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_GAUSS.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_GAUSS.xml
index db54c8eda387bae8660eea32566e7c4979ae01b8..d7787fef505b52120fda3f3a1209a4c6b9a8d6e0 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_GAUSS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_GAUSS.xml
@@ -91,12 +91,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_MODIFIED.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_MODIFIED.xml
index 34dacac03f15eb41fc5996bc8b91fb0fec478e0f..6f4f9a8b0951012d15abf44724589f58e211a8a5 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_MODIFIED.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_MODIFIED.xml
@@ -90,12 +90,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM.xml
index 8f1becbf0b0cc01eca3110bb40466dfa57f863cf..d6dd3ededd19b05fe2cf638cd9acc2268e127111 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM.xml
@@ -90,12 +90,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_3DHOMO1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_3DHOMO1D_FFT.xml
index 497a74961251fe50264ee41e7ee5f8cbbc8578b4..94aba1b7b8d05995a6d1c1fba6c610b9f5687379 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_3DHOMO1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_3DHOMO1D_FFT.xml
@@ -95,13 +95,17 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="WeakDG3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LDGNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_3DHOMO1D_MVM.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_3DHOMO1D_MVM.xml
index 5154e370879f695e2d5bded0fdbc4e6960d212db..ad2dca59ebe9c9b11bf540ba801ead598b375484 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_3DHOMO1D_MVM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_3DHOMO1D_MVM.xml
@@ -95,13 +95,17 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="WeakDG3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LDGNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="MVM" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_VariableMu.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_VariableMu.xml
index b67d747783385183dbc1f39a7b326cd939eb9fa4..8b5d689670f0789715df9e9cc9a46dd7c3bb90ba 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_VariableMu.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_SEM_VariableMu.xml
@@ -91,12 +91,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Variable" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 2 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_adiabatic.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_adiabatic.xml
index f6e30e169091daeb64538f63e2ccb677276b0b46..db98a9ef799b74038d54bde6cd61014115ac54b6 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_adiabatic.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LDG_adiabatic.xml
@@ -90,12 +90,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LFRHU_SEM.xml b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LFRHU_SEM.xml
index 9cdb4b992f95faa2797d33bca2c5537ecfecf72c..c8c66acfdaf1552142763210663933ddb29fd8cd 100644
--- a/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LFRHU_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Couette_WeakDG_LFRHU_SEM.xml
@@ -90,12 +90,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LFRHUNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonicMix.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonicMix.xml
index 5987360c0f7b253763871ce594f68a705cd7092b..71f1fc2f15ee3cd107e2b431428d63e3d286be6d 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonicMix.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonicMix.xml
@@ -755,11 +755,15 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRDG_GAUSS.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRDG_GAUSS.xml
index 31a67f8a435523bd10a4ce662ecdbdcfec26b01f..c915d8521d25739e44e6f207c25fe4477877a1c3 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRDG_GAUSS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRDG_GAUSS.xml
@@ -2846,11 +2846,15 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRDG_SEM.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRDG_SEM.xml
index deb0a01a5fc732d2501a25c917e1d58bf3655731..ac33ef5df4eefcf94d24482d3bb3392319ac1c2a 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRDG_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRDG_SEM.xml
@@ -2846,11 +2846,15 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRHU_SEM.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRHU_SEM.xml
index b9428928238656d43c40973a553134c3c559b218..934bfad8b6fd9c682047244b8db330e672af7743 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRHU_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_FRHU_SEM.xml
@@ -2846,11 +2846,15 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GAUSS.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GAUSS.xml
index 321da17660cc4c1fe9d4a46fe05ee7819692a22c..528a4122a64d4ba874bfb8478df17cf670ddbd74 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GAUSS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GAUSS.xml
@@ -4087,12 +4087,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
<I PROPERTY="DiffusionType" VALUE="LFRDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml
index 703c7ecf63bbb167f40e34d16ba912f8a589bbe0..a3039690565b0d4945d73abe69d37b9232368480 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml
@@ -4093,13 +4093,18 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRDG3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRDGNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_MVM.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_MVM.xml
index 15e523b84a3976e46597ede37fa8cdf19fa5f8ea..d5c6f85c188e38e96a1e971ff79d17d67485dde9 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_MVM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_MVM.xml
@@ -4093,13 +4093,18 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRDG3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRDGNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="MVM" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRHU_LFRHU_SEM_3DHOMO1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRHU_LFRHU_SEM_3DHOMO1D_FFT.xml
index 0902837e2990cbcd9b9739de30621057345674be..4a18abd90ce0b290287f54596adc036b72007f99 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRHU_LFRHU_SEM_3DHOMO1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRHU_LFRHU_SEM_3DHOMO1D_FFT.xml
@@ -4093,13 +4093,18 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRHU3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRHUNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRHU_LFRHU_SEM_3DHOMO1D_MVM.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRHU_LFRHU_SEM_3DHOMO1D_MVM.xml
index c946fbe71f99a0c3aadf5aca80aac111259f9dbb..a8d9befa60657e8d4be3a70d219f089fdd08c10b 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRHU_LFRHU_SEM_3DHOMO1D_MVM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRHU_LFRHU_SEM_3DHOMO1D_MVM.xml
@@ -4093,13 +4093,18 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRHU3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRHUNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="MVM" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRSD_LFRSD_MODIFIED_3DHOMO1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRSD_LFRSD_MODIFIED_3DHOMO1D_FFT.xml
index 9ec0572a3e71a14bde85615eae8ed8d792564380..8dafa5ee9c69fc63ea9ae9f82868ee74f047c66b 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRSD_LFRSD_MODIFIED_3DHOMO1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRSD_LFRSD_MODIFIED_3DHOMO1D_FFT.xml
@@ -4093,13 +4093,18 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRSD3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRSDNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM.xml
index 8eddf9ff83e1f1a7b466b8373886e63b12c88392..13a11246ef5181d381178aad9a8c6cacc2ca68eb 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM.xml
@@ -4093,13 +4093,18 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRSD3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LFRSDNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="MVM" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_IP_GAUSS.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_IP_GAUSS.xml
index fd5e7898d68f5966a6d1c978070e1070eae63cc9..17a687082b04452ab35f2368927f1b07300ab423 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_IP_GAUSS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_IP_GAUSS.xml
@@ -4088,12 +4088,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_IP_SEM_VariableMu.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_IP_SEM_VariableMu.xml
index 5a1b120018d740a09d94134f5bef4555130d93f3..0cf3c04364026e0875e7a4d1f2fd16c752dbe47d 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_IP_SEM_VariableMu.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_IP_SEM_VariableMu.xml
@@ -4090,12 +4090,17 @@
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
<I PROPERTY="AdvectionAdvancement" VALUE="Implicit" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Variable" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDGNS_SEM_VariableMu.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDGNS_SEM_VariableMu.xml
index a02aa922063077f43ed6c8669a4226644cb3593b..7dcf1cfd042036517e8862f72ef91013f36676b3 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDGNS_SEM_VariableMu.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDGNS_SEM_VariableMu.xml
@@ -4090,12 +4090,17 @@
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
<I PROPERTY="AdvectionAdvancement" VALUE="Implicit" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Variable" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_GAUSS.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_GAUSS.xml
index 85c82c5fe79853f13388a87fc34bcb2b85838859..40f42980271dfcc1f57d1365aa93985315fb9ecb 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_GAUSS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_GAUSS.xml
@@ -4087,12 +4087,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM.xml
index 42c44dcde3970aaca338b2b98b3463e3b9cb0469..1f7a70d2723ba5ec45da77792ced1151e6f94f52 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM.xml
@@ -4087,12 +4087,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_3DHomo1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_3DHomo1D_FFT.xml
index 9d50eeebd097c258c36d5ae6fd0ed8f635f4bd93..e000ed6adf32584365ea6a6482d644469d7de708 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_3DHomo1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_3DHomo1D_FFT.xml
@@ -4093,13 +4093,18 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="WeakDG3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LDGNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_3DHomo1D_MVM.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_3DHomo1D_MVM.xml
index 2f77633dfd989814a9b25b8ab6652586efe55a9a..eff4f005b5d217860ce38705f502c3becccb3309 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_3DHomo1D_MVM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_3DHomo1D_MVM.xml
@@ -4093,13 +4093,18 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="WeakDG3DHomogeneous1D" />
<I PROPERTY="DiffusionType" VALUE="LDGNS3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="USEFFT" VALUE="MVM" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_VariableMu.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_VariableMu.xml
index a3a9dc47b3472aada609a61bf007fab7b457513b..a0455dba90d9556c55f25206237e1d717366a2db 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_VariableMu.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_NS_WeakDG_LDG_SEM_VariableMu.xml
@@ -4087,12 +4087,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Variable" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_P3.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_P3.xml
index 9f5396169dcbfb363a14ba807871cb5353cdf6ea..139fe53966b08539f644d21d1baa0c81b25d4c2e 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_P3.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_P3.xml
@@ -740,11 +740,15 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_P8.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_P8.xml
index e4305cc244fca77de3e5fdbca00335eeb26eacdb..0e0b5332cbc71c8191792bb81bba8cc9362e93f3 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_P8.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_P8.xml
@@ -739,11 +739,15 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_WeakDG_Implicit.xml b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_WeakDG_Implicit.xml
index ee167b8984fc8e9e3e3557de18696d442120c46b..dd695b7bf70f0a3c80f1275f026a64ad87b79ee7 100644
--- a/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_WeakDG_Implicit.xml
+++ b/solvers/CompressibleFlowSolver/Tests/CylinderSubsonic_WeakDG_Implicit.xml
@@ -2846,12 +2846,16 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="EulerImplicitCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="AdvectioType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
<I PROPERTY="UpwindType" VALUE="Roe" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Duct_Euler_2D_AxiSym_ForcedVortexSwirl.xml b/solvers/CompressibleFlowSolver/Tests/Duct_Euler_2D_AxiSym_ForcedVortexSwirl.xml
index 8c34dccf31b59b09d26087ad2f501b290d5792e4..c34da64ffb460015d4eebfd7033f0d275fd5222f 100644
--- a/solvers/CompressibleFlowSolver/Tests/Duct_Euler_2D_AxiSym_ForcedVortexSwirl.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Duct_Euler_2D_AxiSym_ForcedVortexSwirl.xml
@@ -89,11 +89,15 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/EmbededCylinder2D_session.xml b/solvers/CompressibleFlowSolver/Tests/EmbededCylinder2D_session.xml
index 35cfd5644aa5a92cd21220d745f2fb3db3a7e7ca..b192753d789c9e9882e04e05f2f7a7006a623e61 100644
--- a/solvers/CompressibleFlowSolver/Tests/EmbededCylinder2D_session.xml
+++ b/solvers/CompressibleFlowSolver/Tests/EmbededCylinder2D_session.xml
@@ -11,12 +11,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" /> <!-- ClassicalRungeKutta4 -->
<I PROPERTY="UpwindType" VALUE="ExactToro" /> <!--HLLC-->
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="EquationOfState" VALUE="IdealGas" />
<!--<I PROPERTY="ViscosityType" VALUE="Variable" />-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<!--Computational parameters-->
<P> TimeStep = 0.0002 </P> <!--5e-4-->
diff --git a/solvers/CompressibleFlowSolver/Tests/Euler1D.xml b/solvers/CompressibleFlowSolver/Tests/Euler1D.xml
index 736ee97238f2ceb2486a41e5fcfdf70e63ab577b..db99d5aa39f82eb0075c3b187d92e59e5fe8f99c 100644
--- a/solvers/CompressibleFlowSolver/Tests/Euler1D.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Euler1D.xml
@@ -83,12 +83,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="ExactToro"/>
<I PROPERTY="ProblemType" VALUE="General"/>
<I PROPERTY="ViscosityType" VALUE="Constant"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16Implicit_P4.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16Implicit_P4.xml
index 3bcb97c4bebccfcc1245593af6907358c5b9f247..8fb36274257cc66a9b14c6add893ca752c525ac6 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16Implicit_P4.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16Implicit_P4.xml
@@ -1137,11 +1137,16 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder4_ES6" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="LinSysIterSolverTypeInNonlin" VALUE="GMRES" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 4 </ORDER>
+ <VARIANT> ES6 </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml
index 1f3ec9ef21f066f8733825e52cb962cef36c6f27..c744321dfa8a12c38955bd84b11284154cfcc14a 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRDG_GLL_LAGRANGE_3DHOMO1D_FFT.xml
@@ -1139,11 +1139,15 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRDG3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRHU_SEM_3DHOMO1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRHU_SEM_3DHOMO1D_FFT.xml
index 9136f478cd4787f9beb1e1eea7916d7e145f96c1..d508132940e90857758a2d541e37a9db36e7b17f 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRHU_SEM_3DHOMO1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRHU_SEM_3DHOMO1D_FFT.xml
@@ -1139,11 +1139,15 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRHU3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRSD_MODIFIED_3DHOMO1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRSD_MODIFIED_3DHOMO1D_FFT.xml
index b73f89feffa20dbebdb52fd064b77979172b5edc..43839d71591dfa7dc62d9099d6352c24b9967b59 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRSD_MODIFIED_3DHOMO1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_FRSD_MODIFIED_3DHOMO1D_FFT.xml
@@ -1139,11 +1139,15 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="FRSD3DHomogeneous1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P1.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P1.xml
index e4571bb0daf6394e244d78c4e03af25794bd3b35..e785802bbad008b63d5c2c0f56dc0111d2d7189c 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P1.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P1.xml
@@ -1141,10 +1141,14 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P3.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P3.xml
index d9ec1c5b8f0e87fce74fa0a0f6c5ac9deca3ecd3..b1929dd03b06340742b7022ac8db7347afcacf05 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P3.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P3.xml
@@ -1137,10 +1137,14 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P3_GAUSS.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P3_GAUSS.xml
index 6ed1f9ca23249530123bec0ec0ecfca62968f3ac..15f76019180d0cff189e757ea0d65a66bf52ab90 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P3_GAUSS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P3_GAUSS.xml
@@ -1137,10 +1137,14 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P8.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P8.xml
index 4b7f83ce7473d5c239b45e3903a9847fdd908197..04bf3151c456833715e8439386e0dbdf121d4125 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P8.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P8.xml
@@ -1137,10 +1137,14 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P8_GAUSS.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P8_GAUSS.xml
index 51ee1fda428a1e75ea8e9e68d0da5cc771928511..ab8160721437b3f13ba8c65ae3e15476a7ad9d53 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P8_GAUSS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_P8_GAUSS.xml
@@ -1137,10 +1137,14 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_WeakDG_SEM_3DHomo1D_FFT.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_WeakDG_SEM_3DHomo1D_FFT.xml
index acec76a9289b858e7bcf4adc30f29f7d62956e0c..0bb076571f0a0f0bd67258fdc1b67405fe32aeac 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_WeakDG_SEM_3DHomo1D_FFT.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex16_WeakDG_SEM_3DHomo1D_FFT.xml
@@ -1139,11 +1139,15 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="AdvectionType" VALUE="WeakDG3DHomogeneous1D"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRDG_SEM.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRDG_SEM.xml
index 4b73a998cf19782c773411d162330de7ce3aedd8..08548ca575c2ef03948eb28dd4a9fa36d981bd07 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRDG_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRDG_SEM.xml
@@ -67,10 +67,14 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRHU_SEM.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRHU_SEM.xml
index 70689139c95735931cad0df2a40de05282fc2667..68fc4715125fb5ea2642f1fd1da1779271b67020 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRHU_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRHU_SEM.xml
@@ -67,10 +67,14 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRSD_SEM.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRSD_SEM.xml
index e6d68af956fcc6aa1352b9f0fa19cc2e6e8b40b2..95fd040b3a4883d465a4887cbe8fc7742d71050c 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRSD_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_FRSD_SEM.xml
@@ -67,10 +67,14 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRSD" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_WeakDG_HexDeformed.xml b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_WeakDG_HexDeformed.xml
index 4b3622956dd79c0d502b53c97ff134a108ba165f..c19f0557d48f549364254e10e190265fd3bbd61e 100644
--- a/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_WeakDG_HexDeformed.xml
+++ b/solvers/CompressibleFlowSolver/Tests/IsentropicVortex_WeakDG_HexDeformed.xml
@@ -911,10 +911,14 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/MMS_Compressible_Poiseuille_testIP.xml b/solvers/CompressibleFlowSolver/Tests/MMS_Compressible_Poiseuille_testIP.xml
index 38631ba10715ee5fae484702cd04e3b9bbf11791..cbd6bd9e2c078942d8518d761fc775c1eebb8e2b 100644
--- a/solvers/CompressibleFlowSolver/Tests/MMS_Compressible_Poiseuille_testIP.xml
+++ b/solvers/CompressibleFlowSolver/Tests/MMS_Compressible_Poiseuille_testIP.xml
@@ -355,12 +355,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/MMS_Compressible_Poiseuille_unifiedWeakIntg.xml b/solvers/CompressibleFlowSolver/Tests/MMS_Compressible_Poiseuille_unifiedWeakIntg.xml
index 3923c340a6600672ee8321df28f6f1252ae064d2..fadd00080e09e79ecdec7ecf9beff07837a0fb3f 100644
--- a/solvers/CompressibleFlowSolver/Tests/MMS_Compressible_Poiseuille_unifiedWeakIntg.xml
+++ b/solvers/CompressibleFlowSolver/Tests/MMS_Compressible_Poiseuille_unifiedWeakIntg.xml
@@ -355,15 +355,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
-
<I PROPERTY="useUnifiedWeakIntegration" VALUE="True"/>
-
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Movement_fixed_couette.xml b/solvers/CompressibleFlowSolver/Tests/Movement_fixed_couette.xml
index 15f9c92dac121c69b24189557c34fd80ad204752..7d235ab01bf1caba3ffc18072b4185d004a3855b 100644
--- a/solvers/CompressibleFlowSolver/Tests/Movement_fixed_couette.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Movement_fixed_couette.xml
@@ -357,12 +357,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Movement_rotate_couette.xml b/solvers/CompressibleFlowSolver/Tests/Movement_rotate_couette.xml
index a2b55b1294dd2ec4f4df8a545ba09a5c972069ef..df959738104656f873c1d918bb73478da04a20a7 100644
--- a/solvers/CompressibleFlowSolver/Tests/Movement_rotate_couette.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Movement_rotate_couette.xml
@@ -357,12 +357,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Movement_translate_3D_couette_IM.xml b/solvers/CompressibleFlowSolver/Tests/Movement_translate_3D_couette_IM.xml
index 51b5963d4071473a4dc9c4357d12840b801c40c5..8c7dbd9accc3c984c55ec2729b93b6d24d559a04 100644
--- a/solvers/CompressibleFlowSolver/Tests/Movement_translate_3D_couette_IM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Movement_translate_3D_couette_IM.xml
@@ -241,12 +241,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Movement_translate_couette_IM.xml b/solvers/CompressibleFlowSolver/Tests/Movement_translate_couette_IM.xml
index 7e00db19e8ea4eb7f574aa4cc893caf9615d386f..edfa4d929c467f15a867744ba04e219ae5644975 100644
--- a/solvers/CompressibleFlowSolver/Tests/Movement_translate_couette_IM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Movement_translate_couette_IM.xml
@@ -101,12 +101,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Nozzle_AxiSym_NoSwirl.xml b/solvers/CompressibleFlowSolver/Tests/Nozzle_AxiSym_NoSwirl.xml
index caedece5dad5e91d05340391baa80a16cb33f0b6..e2901e497ddcc83084183cbf1e2b54e6a09bbc8b 100644
--- a/solvers/CompressibleFlowSolver/Tests/Nozzle_AxiSym_NoSwirl.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Nozzle_AxiSym_NoSwirl.xml
@@ -76,12 +76,17 @@
<I PROPERTY="EQTYPE" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta3_SSP" />
<I PROPERTY="UpwindType" VALUE="HLLC"/>
<I PROPERTY="ShockCaptureType" VALUE="Off"/>
<I PROPERTY="ExponentialFiltering" VALUE="True"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 3 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Nozzle_AxiSym_Swirl.xml b/solvers/CompressibleFlowSolver/Tests/Nozzle_AxiSym_Swirl.xml
index 994994d17874e024b534043ffa781c945c83a5e0..b6af30dcc07f96424a5b0fd2354f101cb8ac7675 100644
--- a/solvers/CompressibleFlowSolver/Tests/Nozzle_AxiSym_Swirl.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Nozzle_AxiSym_Swirl.xml
@@ -77,12 +77,17 @@
<I PROPERTY="EQTYPE" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta3_SSP" />
<I PROPERTY="UpwindType" VALUE="HLLC"/>
<I PROPERTY="ShockCaptureType" VALUE="Off"/>
<I PROPERTY="ExponentialFiltering" VALUE="True"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 3 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Nozzle_Quasi1D_P6.xml b/solvers/CompressibleFlowSolver/Tests/Nozzle_Quasi1D_P6.xml
index cfd3c4f87430def23c279768e066389e3867c6f9..577c2787cae9f6ec938589cc941b82d803fb1f8e 100644
--- a/solvers/CompressibleFlowSolver/Tests/Nozzle_Quasi1D_P6.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Nozzle_Quasi1D_P6.xml
@@ -132,12 +132,17 @@
<I PROPERTY="EQTYPE" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta3_SSP" />
<I PROPERTY="UpwindType" VALUE="HLLC"/>
<I PROPERTY="ShockCaptureType" VALUE="NonSmooth"/>
<I PROPERTY="ExponentialFiltering" VALUE="True"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 3 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Perf_CylinderSubsonic_P3.xml b/solvers/CompressibleFlowSolver/Tests/Perf_CylinderSubsonic_P3.xml
index 5f8c7129659ace9cbd626948ca999902d1f8bb5a..0f4b1f9023318c53a94ed091c33e1bb1ecfaae2c 100644
--- a/solvers/CompressibleFlowSolver/Tests/Perf_CylinderSubsonic_P3.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Perf_CylinderSubsonic_P3.xml
@@ -740,11 +740,15 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Perf_IsentropicVortex16Implicit_P8.xml b/solvers/CompressibleFlowSolver/Tests/Perf_IsentropicVortex16Implicit_P8.xml
index 82cb4c349921af625fb506fdfd0294fb995ef5bf..d5d5cd769c5a66b1e9bc532871b645ec8be5146b 100644
--- a/solvers/CompressibleFlowSolver/Tests/Perf_IsentropicVortex16Implicit_P8.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Perf_IsentropicVortex16Implicit_P8.xml
@@ -1138,11 +1138,15 @@
<I PROPERTY="ICType" VALUE="IsentropicVortex" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder3" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="LinSysIterSolverTypeInNonlin" VALUE="GMRES" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_circle_CBC_back_par.xml b/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_circle_CBC_back_par.xml
index a3826ce18b153f676125f6af1b1995ecd16e6043..682b11ff07405e73470fc77a912ed47b159d1027 100644
--- a/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_circle_CBC_back_par.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_circle_CBC_back_par.xml
@@ -11868,12 +11868,17 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_square_CBC_back_par.xml b/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_square_CBC_back_par.xml
index 491919006ee88a5d6c432fa505e5c755a22313c9..93a375a072682c2bb3b71a7f1f9b7f881e4f73c5 100644
--- a/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_square_CBC_back_par.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_square_CBC_back_par.xml
@@ -16695,12 +16695,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_square_CBC_par.xml b/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_square_CBC_par.xml
index bb4f9d64def96df9295768d7a4d559b38f473bd9..2b71b1527dfbe75fb3a847511058af80249a3704 100644
--- a/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_square_CBC_par.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Perturbation_M05_square_CBC_par.xml
@@ -16695,12 +16695,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_circle_CBC_back_par.xml b/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_circle_CBC_back_par.xml
index 6298989fc67f7716a07c877cba85332f8d576cd4..1cf19bc93ea98c0a6656baa7540ddc9aa9ebb3de 100644
--- a/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_circle_CBC_back_par.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_circle_CBC_back_par.xml
@@ -11868,12 +11868,17 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_square_CBC_back_par.xml b/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_square_CBC_back_par.xml
index ff5de80ce601eea032a604f589b630ebf4bae518..caf7b3e9bb4de8dbfb2ba5909187074f054913c3 100644
--- a/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_square_CBC_back_par.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_square_CBC_back_par.xml
@@ -16695,12 +16695,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_square_CBC_par.xml b/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_square_CBC_par.xml
index 49172e9291edcc8d9c9ffc6417f24d1cc3c830d8..46d228bef4c313b577c837efef98ce3e3fbdc2a5 100644
--- a/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_square_CBC_par.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Perturbation_M15_square_CBC_par.xml
@@ -16695,12 +16695,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Perturbation_NS_M05_square_CBC_par.xml b/solvers/CompressibleFlowSolver/Tests/Perturbation_NS_M05_square_CBC_par.xml
index 0da185bab5949dbe502ec1656b4bac7f1f5424e7..88b1a6c52fcf8dc5b2ce74874fee052deed64f23 100644
--- a/solvers/CompressibleFlowSolver/Tests/Perturbation_NS_M05_square_CBC_par.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Perturbation_NS_M05_square_CBC_par.xml
@@ -16695,12 +16695,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Perturbation_NS_M15_square_CBC_par.xml b/solvers/CompressibleFlowSolver/Tests/Perturbation_NS_M15_square_CBC_par.xml
index af54341a0172db25daa961ee634506a22d5b91e1..70ef522498590ba5514becb85e68bf977ab1109f 100644
--- a/solvers/CompressibleFlowSolver/Tests/Perturbation_NS_M15_square_CBC_par.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Perturbation_NS_M15_square_CBC_par.xml
@@ -16695,12 +16695,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="FRHU" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/PipeFlow_NSAxisym.xml b/solvers/CompressibleFlowSolver/Tests/PipeFlow_NSAxisym.xml
index 86a52336b10ba4cbd43ed1a09825fe1797da7c7f..a417da276e21e890aee1be6db12177301af9d578 100644
--- a/solvers/CompressibleFlowSolver/Tests/PipeFlow_NSAxisym.xml
+++ b/solvers/CompressibleFlowSolver/Tests/PipeFlow_NSAxisym.xml
@@ -43,11 +43,16 @@
<I PROPERTY="EQTYPE" VALUE="NavierStokesCFEAxisym" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC"/>
<I PROPERTY="ExponentialFiltering" VALUE="True"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/RAE5240_BSF_LE_bcsfromfile_par.xml b/solvers/CompressibleFlowSolver/Tests/RAE5240_BSF_LE_bcsfromfile_par.xml
index 13ea187a46279c857141a17fa201a416f9c6e573..0de838bb05ee296ccae23259de46fc174de2ed11 100644
--- a/solvers/CompressibleFlowSolver/Tests/RAE5240_BSF_LE_bcsfromfile_par.xml
+++ b/solvers/CompressibleFlowSolver/Tests/RAE5240_BSF_LE_bcsfromfile_par.xml
@@ -17333,12 +17333,17 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 2 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/Rarefaction_vanderWaals.xml b/solvers/CompressibleFlowSolver/Tests/Rarefaction_vanderWaals.xml
index 0ed37569dbae28553acedb8109b7e338aae7b891..1943a7ffdd23db387190a1a4c87f228103724902 100644
--- a/solvers/CompressibleFlowSolver/Tests/Rarefaction_vanderWaals.xml
+++ b/solvers/CompressibleFlowSolver/Tests/Rarefaction_vanderWaals.xml
@@ -53,11 +53,16 @@
<I PROPERTY="EQTYPE" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC"/>
<I PROPERTY="ExponentialFiltering" VALUE="True"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/RinglebFlow_P3.xml b/solvers/CompressibleFlowSolver/Tests/RinglebFlow_P3.xml
index 74cd8c49e43bb93a71166d21af5b17bcb4045772..7e24bd905af05804fe68d2eedfda6f2d5373f9fd 100644
--- a/solvers/CompressibleFlowSolver/Tests/RinglebFlow_P3.xml
+++ b/solvers/CompressibleFlowSolver/Tests/RinglebFlow_P3.xml
@@ -351,10 +351,14 @@
<I PROPERTY="ICType" VALUE="RinglebFlow" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/RinglebFlow_P8.xml b/solvers/CompressibleFlowSolver/Tests/RinglebFlow_P8.xml
index d4e1d93c6a67e3850539f226834abcadff16e7c2..1b23636dfda3761e3f46d650dc61111e9e63dd27 100644
--- a/solvers/CompressibleFlowSolver/Tests/RinglebFlow_P8.xml
+++ b/solvers/CompressibleFlowSolver/Tests/RinglebFlow_P8.xml
@@ -350,10 +350,14 @@
<I PROPERTY="ICType" VALUE="RinglebFlow" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Lap.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Lap.xml
index 391fe5f917fdeea5e6d3777a51534ec3f1e794f4..ec03a5d3b75cd9036f5aa7fc03fb04b640b840ac 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Lap.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Lap.xml
@@ -55,12 +55,17 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="NonSmooth" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Lap_NS.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Lap_NS.xml
index 9619c1658fdc8583e4e3beb04b5c9fa628c319a9..28e9aa79fa1e4ab756992324acceae95c2119b9f 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Lap_NS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Lap_NS.xml
@@ -57,12 +57,17 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="NonSmooth" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM0.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM0.xml
index c677d551a25d174743eb7f678e229d6b0d7773d9..d554f71a2fee6526bb498678889fc42fe4657dd9 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM0.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM0.xml
@@ -59,7 +59,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="AUSM0" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -67,6 +66,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM1.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM1.xml
index 6f620f2274de1627b4096a4d61b539ddff84b070..2a2a30cb6d514adeddfb251a1b64f14d22cd2e0e 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM1.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM1.xml
@@ -59,7 +59,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="AUSM1" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -67,6 +66,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM2.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM2.xml
index 5c829f100e619a06b661f4c503fab22d356bcd65..663960fe180cfefded89e734ce0fdd5771a9e631 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM2.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM2.xml
@@ -59,7 +59,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="AUSM2" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -67,6 +66,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM3.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM3.xml
index bc13e00bd106d4c6bb67e34fd4c5cf363775f8f4..73e78cc3ef544c963a028466327bc8513b293321 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM3.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_AUSM3.xml
@@ -60,7 +60,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="AUSM3" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -68,6 +67,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_ExactToro.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_ExactToro.xml
index 36619bc186977d87ac3fa9ca6d521959ed7d5f49..01851a7bd94613d9dfe9c32830ebed4e7e4622bc 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_ExactToro.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_ExactToro.xml
@@ -60,7 +60,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -68,6 +67,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_HLL.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_HLL.xml
index 9a5d06a1857ebd71a9dc30aead443c977c1215f0..94f5650c4301c87713debe6b2c3f8b5c8f58aecd 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_HLL.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_HLL.xml
@@ -59,7 +59,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLL" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -67,6 +66,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_HLLC.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_HLLC.xml
index 8ff4d4953b36714c1ae138c3b877a190c8850dfc..dede340bb96de5a3762efc4fadb3ed066958a848 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_HLLC.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_HLLC.xml
@@ -59,7 +59,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -67,6 +66,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_Impl.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_Impl.xml
index 20c7d667d5fc37b36b5a5717bba6c95721a58641..71aea72f9bad7a95e8b071d049cb6b4df7268c04 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_Impl.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_Impl.xml
@@ -59,7 +59,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -67,6 +66,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_LaxFriedrichs.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_LaxFriedrichs.xml
index dfd2313fe7ce194848773b1bc0cc7372d2638e29..e55320c754dd07c9714505d25040a4e292143c85 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_LaxFriedrichs.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_LaxFriedrichs.xml
@@ -59,7 +59,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="LaxFriedrichs" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -67,6 +66,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_Roe.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_Roe.xml
index d35f9a1236e232db4c5e60e4a29d69d8de18f356..16ecb5ae8813d3055c9c63aae28f6e3baf8883c5 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_Roe.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_IP_Roe.xml
@@ -59,7 +59,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -67,6 +66,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_LDGNS.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_LDGNS.xml
index 17b4206488cbb2875478150c33b5ee57f2fa6996..51252603ed2fbe2cdaf25d6a34aef9c765067457 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_LDGNS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Dil_LDGNS.xml
@@ -59,7 +59,6 @@
<I PROPERTY="EQType" VALUE="NavierStokesCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -67,6 +66,12 @@
<I PROPERTY="DucrosSensor" VALUE="On" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Mod_IP.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Mod_IP.xml
index 5584448c38b6b49fd2afbb479d8a89a25b008bc6..ec3fa2e8a3d0e3c5fa706961ff618f53cb4b747d 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Mod_IP.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Mod_IP.xml
@@ -59,7 +59,6 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -68,6 +67,12 @@
<I PROPERTY="Smoothing" VALUE="C0" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Mod_LDGNS.xml b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Mod_LDGNS.xml
index 40fa991b88ee94c05d383d8eac5f8f96aa54dc8e..df0e613c2b143aafb8f6a93c1adb1e6f8bce48fe 100644
--- a/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Mod_LDGNS.xml
+++ b/solvers/CompressibleFlowSolver/Tests/ShockTube_2D_mixedMesh_AV_Phys_Mod_LDGNS.xml
@@ -58,7 +58,6 @@
<I PROPERTY="EQType" VALUE="NavierStokesCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="Physical" />
@@ -67,6 +66,12 @@
<I PROPERTY="Smoothing" VALUE="C0" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/SquareDomain_Euler_2D_AxialFlow.xml b/solvers/CompressibleFlowSolver/Tests/SquareDomain_Euler_2D_AxialFlow.xml
index c74f70bfe395eac2f5e323545592e0036ae7a6bd..5832cf569ef53950dfe1173d0773581b6983e248 100644
--- a/solvers/CompressibleFlowSolver/Tests/SquareDomain_Euler_2D_AxialFlow.xml
+++ b/solvers/CompressibleFlowSolver/Tests/SquareDomain_Euler_2D_AxialFlow.xml
@@ -74,11 +74,15 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/SquareDomain_Euler_2D_DiagonalFlow.xml b/solvers/CompressibleFlowSolver/Tests/SquareDomain_Euler_2D_DiagonalFlow.xml
index e90ae81e27974dfd88ed7d48dc41dc39fd6e09db..21371c90a79f105d0e06944570ae535fa68b2018 100644
--- a/solvers/CompressibleFlowSolver/Tests/SquareDomain_Euler_2D_DiagonalFlow.xml
+++ b/solvers/CompressibleFlowSolver/Tests/SquareDomain_Euler_2D_DiagonalFlow.xml
@@ -76,11 +76,15 @@
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/TimeDependentAbsorption.xml b/solvers/CompressibleFlowSolver/Tests/TimeDependentAbsorption.xml
index 9d8ef4013e91f179f4c9360ab2adb796ed27b3c6..49174666b314092d5e548754e0ba1d09733d4538 100644
--- a/solvers/CompressibleFlowSolver/Tests/TimeDependentAbsorption.xml
+++ b/solvers/CompressibleFlowSolver/Tests/TimeDependentAbsorption.xml
@@ -58,12 +58,16 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="EulerImplicitCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="AdvectioType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
<I PROPERTY="UpwindType" VALUE="Roe" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/hump3D_GLL.xml b/solvers/CompressibleFlowSolver/Tests/hump3D_GLL.xml
index a4507839a538bfed437f21034e895d7ad4dcf087..a4d60a4a7c5958168955c427f7013cb845ffc73b 100644
--- a/solvers/CompressibleFlowSolver/Tests/hump3D_GLL.xml
+++ b/solvers/CompressibleFlowSolver/Tests/hump3D_GLL.xml
@@ -64,12 +64,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Variable" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 2 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<VARIABLES>
<V ID="0"> rho </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/hump3D_SEM.xml b/solvers/CompressibleFlowSolver/Tests/hump3D_SEM.xml
index 0c34aeeb82a92f8583adb9ebff53c13ed7d60e71..20419ed4e47c0723cadded074adb6037f3c7c480 100644
--- a/solvers/CompressibleFlowSolver/Tests/hump3D_SEM.xml
+++ b/solvers/CompressibleFlowSolver/Tests/hump3D_SEM.xml
@@ -64,12 +64,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Variable" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 2 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<VARIABLES>
<V ID="0"> rho </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/hump3D_SEM_IP.xml b/solvers/CompressibleFlowSolver/Tests/hump3D_SEM_IP.xml
index 070623d313b4ed2210b89d8a46d2074103d8006e..c760ca9fe73a369a396c5c50e5150311ab8e1b72 100644
--- a/solvers/CompressibleFlowSolver/Tests/hump3D_SEM_IP.xml
+++ b/solvers/CompressibleFlowSolver/Tests/hump3D_SEM_IP.xml
@@ -64,12 +64,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler"/>
<I PROPERTY="UpwindType" VALUE="ExactToro" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Variable" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 2 </ORDER>
+ <VARIANT> SSP </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<VARIABLES>
<V ID="0"> rho </V>
diff --git a/solvers/CompressibleFlowSolver/Tests/implicitSolverCallsSFD_session.xml b/solvers/CompressibleFlowSolver/Tests/implicitSolverCallsSFD_session.xml
index ce7e9352d440010451875e7c2ed14e52138c70f9..3f7e5241f12f7053a1e1ebbb33c7110d77899311 100644
--- a/solvers/CompressibleFlowSolver/Tests/implicitSolverCallsSFD_session.xml
+++ b/solvers/CompressibleFlowSolver/Tests/implicitSolverCallsSFD_session.xml
@@ -14,12 +14,15 @@
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
<I PROPERTY="AdvectionAdvancement" VALUE="Implicit" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
<I PROPERTY="Driver" VALUE="SteadyState" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<!-- Flow parameters -->
<P> Gamma = 1.4 </P>
diff --git a/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyPressure.xml b/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyPressure.xml
index fb2d90b87c11cf16c236be7a8cfd98a0e884c516..c0c6add3f1cfd61babc5a0a1649757bbf845a401 100644
--- a/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyPressure.xml
+++ b/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyPressure.xml
@@ -13,11 +13,14 @@
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
<I PROPERTY="AdvectionAdvancement" VALUE="Implicit" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<!--Computational parameters-->
<P> TimeStep = 0.05 </P>
diff --git a/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyTotalEnthalpy.xml b/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyTotalEnthalpy.xml
index 141807c56138ea697f3991b143a580e2bb4e4aa8..8da7bf37a88837e4abb24aa56a78c2eac624cd1a 100644
--- a/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyTotalEnthalpy.xml
+++ b/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyTotalEnthalpy.xml
@@ -13,11 +13,14 @@
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
<I PROPERTY="AdvectionAdvancement" VALUE="Implicit" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<!--Computational parameters-->
<P> TimeStep = 0.05 </P>
diff --git a/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyVelocity.xml b/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyVelocity.xml
index add583fae87027f047b34ffeec16b0f8de2eb065..68c6f3a45fe3ced0197e18b2bdba2ac9d6c83d0e 100644
--- a/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyVelocity.xml
+++ b/solvers/CompressibleFlowSolver/Tests/session_enforceEntropyVelocity.xml
@@ -13,11 +13,14 @@
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
<I PROPERTY="AdvectionAdvancement" VALUE="Implicit" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<!--Computational parameters-->
<P> TimeStep = 0.05 </P>
diff --git a/solvers/DiffusionSolver/Tests/ImDiffusion_m6.xml b/solvers/DiffusionSolver/Tests/ImDiffusion_m6.xml
index 3ed45518274e3054441700f807985e160f622de3..b6f3115c021b8d0b14c6281ede7d05dc313e0e1b 100644
--- a/solvers/DiffusionSolver/Tests/ImDiffusion_m6.xml
+++ b/solvers/DiffusionSolver/Tests/ImDiffusion_m6.xml
@@ -74,9 +74,13 @@
<SOLVERINFO>
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder3" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
diff --git a/solvers/DiffusionSolver/Tests/MMFDiffCube.xml b/solvers/DiffusionSolver/Tests/MMFDiffCube.xml
index 21263cd3d6ec5eb2d7fdea9291396c7764588ff3..39b2362727122e7a7ee1e02f7333bcc91361f0e7 100644
--- a/solvers/DiffusionSolver/Tests/MMFDiffCube.xml
+++ b/solvers/DiffusionSolver/Tests/MMFDiffCube.xml
@@ -758,13 +758,19 @@
<I PROPERTY="EQTYPE" VALUE="MMFDiffusion" />
<I PROPERTY="Projection" VALUE="DisContinuous"/>
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_3_4_3" />
<I PROPERTY="TestType" VALUE="TestCube" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 3 </ORDER>
+ <FREEPARAMETERS> 3 4 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 5 </P>
diff --git a/solvers/DiffusionSolver/Tests/MMFDiffPlane.xml b/solvers/DiffusionSolver/Tests/MMFDiffPlane.xml
index 29ffa9c9b0795498bc7507db987da51ee9140d34..0287268447dc332d398a28631400aa782d81a21c 100644
--- a/solvers/DiffusionSolver/Tests/MMFDiffPlane.xml
+++ b/solvers/DiffusionSolver/Tests/MMFDiffPlane.xml
@@ -290,12 +290,18 @@
<I PROPERTY="EQTYPE" VALUE="MMFDiffusion" />
<I PROPERTY="Projection" VALUE="DisContinuous"/>
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_3_4_3" />
<I PROPERTY="TestType" VALUE="TestPlane" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<I PROPERTY="MMFDir" VALUE="LOCAL" /> <!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 3 </ORDER>
+ <FREEPARAMETERS> 3 4 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/DiffusionSolver/Tests/MMFDiffSphere.xml b/solvers/DiffusionSolver/Tests/MMFDiffSphere.xml
index 5d6a22e19d580fda805dbbd7f467ba0e127ae2c6..a652fcb5fe197d106bcf52b2689b0b1f6bb41548 100644
--- a/solvers/DiffusionSolver/Tests/MMFDiffSphere.xml
+++ b/solvers/DiffusionSolver/Tests/MMFDiffSphere.xml
@@ -1997,13 +1997,19 @@
<I PROPERTY="EQTYPE" VALUE="MMFDiffusion" />
<I PROPERTY="Projection" VALUE="DisContinuous"/>
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_3_4_3" />
<I PROPERTY="TestType" VALUE="TestLinearSphere" />
<I PROPERTY="SurfaceType" VALUE="Sphere" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 3 </ORDER>
+ <FREEPARAMETERS> 3 4 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
<V ID="1"> v </V>
diff --git a/solvers/DiffusionSolver/Tests/Perf_TestMMFDiffCube.xml b/solvers/DiffusionSolver/Tests/Perf_TestMMFDiffCube.xml
index a2b0639d64207f6207872e71b7f1d16307bcda5d..a90a6d932c0c047ab13bac13e2321c143408c9e6 100644
--- a/solvers/DiffusionSolver/Tests/Perf_TestMMFDiffCube.xml
+++ b/solvers/DiffusionSolver/Tests/Perf_TestMMFDiffCube.xml
@@ -758,13 +758,19 @@
<I PROPERTY="EQTYPE" VALUE="MMFDiffusion" />
<I PROPERTY="Projection" VALUE="DisContinuous"/>
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_3_4_3" />
<I PROPERTY="TestType" VALUE="TestCube" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 3 </ORDER>
+ <FREEPARAMETERS> 3 4 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 5 </P>
diff --git a/solvers/DiffusionSolver/Tests/TestMMFDiffCube.xml b/solvers/DiffusionSolver/Tests/TestMMFDiffCube.xml
index 21263cd3d6ec5eb2d7fdea9291396c7764588ff3..39b2362727122e7a7ee1e02f7333bcc91361f0e7 100644
--- a/solvers/DiffusionSolver/Tests/TestMMFDiffCube.xml
+++ b/solvers/DiffusionSolver/Tests/TestMMFDiffCube.xml
@@ -758,13 +758,19 @@
<I PROPERTY="EQTYPE" VALUE="MMFDiffusion" />
<I PROPERTY="Projection" VALUE="DisContinuous"/>
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_3_4_3" />
<I PROPERTY="TestType" VALUE="TestCube" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 3 </ORDER>
+ <FREEPARAMETERS> 3 4 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 5 </P>
diff --git a/solvers/DiffusionSolver/Tests/TestMMFDiffPlane.xml b/solvers/DiffusionSolver/Tests/TestMMFDiffPlane.xml
index 29ffa9c9b0795498bc7507db987da51ee9140d34..0287268447dc332d398a28631400aa782d81a21c 100644
--- a/solvers/DiffusionSolver/Tests/TestMMFDiffPlane.xml
+++ b/solvers/DiffusionSolver/Tests/TestMMFDiffPlane.xml
@@ -290,12 +290,18 @@
<I PROPERTY="EQTYPE" VALUE="MMFDiffusion" />
<I PROPERTY="Projection" VALUE="DisContinuous"/>
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_3_4_3" />
<I PROPERTY="TestType" VALUE="TestPlane" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<I PROPERTY="MMFDir" VALUE="LOCAL" /> <!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 3 </ORDER>
+ <FREEPARAMETERS> 3 4 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/DiffusionSolver/Tests/TestMMFDiffSphere.xml b/solvers/DiffusionSolver/Tests/TestMMFDiffSphere.xml
index 7b144c42057b62678ac2a808a93a384a762a57b1..368397fbf11090546eaa71e85cbef87c827c1ec0 100644
--- a/solvers/DiffusionSolver/Tests/TestMMFDiffSphere.xml
+++ b/solvers/DiffusionSolver/Tests/TestMMFDiffSphere.xml
@@ -1997,13 +1997,19 @@
<I PROPERTY="EQTYPE" VALUE="MMFDiffusion" />
<I PROPERTY="Projection" VALUE="DisContinuous"/>
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXdirk_3_4_3" />
<I PROPERTY="TestType" VALUE="TestLinearSphere" />
<I PROPERTY="SurfaceType" VALUE="Sphere" />
<!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <VARIANT> DIRK </VARIANT>
+ <ORDER> 3 </ORDER>
+ <FREEPARAMETERS> 3 4 </FREEPARAMETERS>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
<V ID="1"> v </V>
diff --git a/solvers/DummySolver/Tests/Dummy_3DCubeCwipi_0.xml b/solvers/DummySolver/Tests/Dummy_3DCubeCwipi_0.xml
index cf218bb728fe54659ec75983e8fc2eaad8c6272c..2fb0b04c76971cd331f058a8f461708a7c8f875b 100644
--- a/solvers/DummySolver/Tests/Dummy_3DCubeCwipi_0.xml
+++ b/solvers/DummySolver/Tests/Dummy_3DCubeCwipi_0.xml
@@ -18,8 +18,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="Dummy" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<GLOBALSYSSOLNINFO>
<V VAR="DefaultVar">
<I PROPERTY="GlobalSysSoln" VALUE="DirectFull" />
diff --git a/solvers/DummySolver/Tests/Dummy_3DCubeCwipi_1.xml b/solvers/DummySolver/Tests/Dummy_3DCubeCwipi_1.xml
index 46ff2855b24c8fca5ba31b678f74cbc17d2e2a73..5b6a2b63b92a71b0d364e77b6dead564d3bbe184 100644
--- a/solvers/DummySolver/Tests/Dummy_3DCubeCwipi_1.xml
+++ b/solvers/DummySolver/Tests/Dummy_3DCubeCwipi_1.xml
@@ -18,8 +18,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="Dummy" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<GLOBALSYSSOLNINFO>
<V VAR="DefaultVar">
<I PROPERTY="GlobalSysSoln" VALUE="DirectFull" />
diff --git a/solvers/DummySolver/Tests/Dummy_3DCubeFileSingle.xml b/solvers/DummySolver/Tests/Dummy_3DCubeFileSingle.xml
index d3cc5936a53058447f2fb0b7c1f35ff8f19fbe67..5d99b8bed980d8f35777ec8b946f07792b2e3804 100644
--- a/solvers/DummySolver/Tests/Dummy_3DCubeFileSingle.xml
+++ b/solvers/DummySolver/Tests/Dummy_3DCubeFileSingle.xml
@@ -15,8 +15,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="Dummy" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<GLOBALSYSSOLNINFO>
<V VAR="DefaultVar">
<I PROPERTY="GlobalSysSoln" VALUE="PETScStaticCond" />
diff --git a/solvers/DummySolver/Tests/Dummy_3DCubeFile_0.xml b/solvers/DummySolver/Tests/Dummy_3DCubeFile_0.xml
index 8bd54c50a946d7538e89800a7008374752ad8f17..0337b45a2417e1abfff97f0ec75a04e3dd4208ac 100644
--- a/solvers/DummySolver/Tests/Dummy_3DCubeFile_0.xml
+++ b/solvers/DummySolver/Tests/Dummy_3DCubeFile_0.xml
@@ -15,8 +15,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="Dummy" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<GLOBALSYSSOLNINFO>
<V VAR="DefaultVar">
<I PROPERTY="GlobalSysSoln" VALUE="PETScStaticCond" />
diff --git a/solvers/DummySolver/Tests/Dummy_3DCubeFile_1.xml b/solvers/DummySolver/Tests/Dummy_3DCubeFile_1.xml
index 32a156b9ff0fb911d8e4e43836b3f33597ae83fd..85775aebf3a6e72ca81ce4535d58991636bbcefc 100644
--- a/solvers/DummySolver/Tests/Dummy_3DCubeFile_1.xml
+++ b/solvers/DummySolver/Tests/Dummy_3DCubeFile_1.xml
@@ -15,8 +15,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="Dummy" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
<GLOBALSYSSOLNINFO>
<V VAR="DefaultVar">
<I PROPERTY="GlobalSysSoln" VALUE="PETScStaticCond" />
diff --git a/solvers/IncNavierStokesSolver/BoundaryConditions/IncBaseCondition.cpp b/solvers/IncNavierStokesSolver/BoundaryConditions/IncBaseCondition.cpp
index c52af747010c424dca30bf69c21f5ce68cee8f8d..1b7cfa1fc74e3c5218965014832b238b0a53a447 100644
--- a/solvers/IncNavierStokesSolver/BoundaryConditions/IncBaseCondition.cpp
+++ b/solvers/IncNavierStokesSolver/BoundaryConditions/IncBaseCondition.cpp
@@ -72,14 +72,25 @@ void IncBaseCondition::v_Initialise(
m_intSteps = std::round(pSession->GetParameter("ExtrapolateOrder"));
m_intSteps = std::min(3, std::max(0, m_intSteps));
}
- else if (pSession->DefinesSolverInfo("TimeIntegrationMethod"))
+ else if (pSession->DefinesSolverInfo("TimeIntegrationMethod") ||
+ pSession->DefinesTimeIntScheme())
{
- if (pSession->GetSolverInfo("TimeIntegrationMethod") == "IMEXOrder1")
+ std::string method;
+ if (pSession->DefinesTimeIntScheme())
+ {
+ auto timeInt = pSession->GetTimeIntScheme();
+ method = timeInt.method + "Order" + std::to_string(timeInt.order);
+ }
+ else
+ {
+ method = pSession->GetSolverInfo("TimeIntegrationMethod");
+ }
+
+ if (method == "IMEXOrder1")
{
m_intSteps = 1;
}
- else if (pSession->GetSolverInfo("TimeIntegrationMethod") ==
- "IMEXOrder2")
+ else if (method == "IMEXOrder2")
{
m_intSteps = 2;
}
diff --git a/solvers/IncNavierStokesSolver/Examples/BackwardFacingStep_TG/BackwardFacingStep_TG.xml b/solvers/IncNavierStokesSolver/Examples/BackwardFacingStep_TG/BackwardFacingStep_TG.xml
deleted file mode 120000
index d7468ec176e215e636a234a17d4d7ff81fdd2c02..0000000000000000000000000000000000000000
--- a/solvers/IncNavierStokesSolver/Examples/BackwardFacingStep_TG/BackwardFacingStep_TG.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/BackwardFacingStep_TG.xml
\ No newline at end of file
diff --git a/solvers/IncNavierStokesSolver/Examples/BackwardFacingStep_TG/BackwardFacingStep_TG.xml b/solvers/IncNavierStokesSolver/Examples/BackwardFacingStep_TG/BackwardFacingStep_TG.xml
new file mode 100644
index 0000000000000000000000000000000000000000..448ccd4ff32e71c7341da0c84b3df043c1f91d36
--- /dev/null
+++ b/solvers/IncNavierStokesSolver/Examples/BackwardFacingStep_TG/BackwardFacingStep_TG.xml
@@ -0,0 +1,1753 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<NEKTAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
+ <GEOMETRY DIM="2" SPACE="2">
+ <VERTEX>
+ <V ID="0">3.000e+00 -1.000e+00 0.000e+00</V>
+ <V ID="1">3.000e+00 -7.597e-01 0.000e+00</V>
+ <V ID="2">2.727e+00 -1.000e+00 0.000e+00</V>
+ <V ID="3">-5.000e-01 0.000e+00 0.000e+00</V>
+ <V ID="4">-1.516e-01 0.000e+00 0.000e+00</V>
+ <V ID="5">-5.000e-01 1.201e-01 0.000e+00</V>
+ <V ID="6">3.000e+00 7.597e-01 0.000e+00</V>
+ <V ID="7">3.000e+00 1.000e+00 0.000e+00</V>
+ <V ID="8">2.716e+00 1.000e+00 0.000e+00</V>
+ <V ID="9">-5.000e-01 8.799e-01 0.000e+00</V>
+ <V ID="10">-1.240e-01 1.000e+00 0.000e+00</V>
+ <V ID="11">-5.000e-01 1.000e+00 0.000e+00</V>
+ <V ID="12">4.957e-01 2.251e-01 0.000e+00</V>
+ <V ID="13">7.373e-01 3.887e-01 0.000e+00</V>
+ <V ID="14">4.604e-01 5.053e-01 0.000e+00</V>
+ <V ID="15">2.135e-01 -5.993e-01 0.000e+00</V>
+ <V ID="16">0.000e+00 -4.865e-01 0.000e+00</V>
+ <V ID="17">0.000e+00 -7.234e-01 0.000e+00</V>
+ <V ID="18">2.125e-01 3.374e-01 0.000e+00</V>
+ <V ID="19">2.046e+00 -6.461e-01 0.000e+00</V>
+ <V ID="20">1.909e+00 -1.000e+00 0.000e+00</V>
+ <V ID="21">2.182e+00 -1.000e+00 0.000e+00</V>
+ <V ID="22">2.727e-01 -1.000e+00 0.000e+00</V>
+ <V ID="23">5.455e-01 -1.000e+00 0.000e+00</V>
+ <V ID="24">3.698e-01 -7.727e-01 0.000e+00</V>
+ <V ID="25">4.225e-01 8.051e-01 0.000e+00</V>
+ <V ID="26">4.440e-01 1.000e+00 0.000e+00</V>
+ <V ID="27">1.600e-01 1.000e+00 0.000e+00</V>
+ <V ID="28">7.280e-01 1.000e+00 0.000e+00</V>
+ <V ID="29">8.182e-01 -1.000e+00 0.000e+00</V>
+ <V ID="30">6.135e-01 -7.432e-01 0.000e+00</V>
+ <V ID="31">5.498e-01 1.257e-02 0.000e+00</V>
+ <V ID="32">4.109e-01 4.675e-02 0.000e+00</V>
+ <V ID="33">9.609e-01 4.936e-01 0.000e+00</V>
+ <V ID="34">9.944e-01 2.309e-01 0.000e+00</V>
+ <V ID="35">7.522e-01 1.415e-01 0.000e+00</V>
+ <V ID="36">4.272e-01 -9.466e-02 0.000e+00</V>
+ <V ID="37">8.514e-01 -6.649e-01 0.000e+00</V>
+ <V ID="38">-9.300e-02 2.943e-01 0.000e+00</V>
+ <V ID="39">5.953e-02 5.396e-01 0.000e+00</V>
+ <V ID="40">2.973e-01 1.207e-01 0.000e+00</V>
+ <V ID="41">7.753e-01 6.892e-01 0.000e+00</V>
+ <V ID="42">-1.733e-01 6.673e-01 0.000e+00</V>
+ <V ID="43">6.155e-01 9.853e-02 0.000e+00</V>
+ <V ID="44">6.666e-01 2.598e-02 0.000e+00</V>
+ <V ID="45">5.070e-02 1.327e-01 0.000e+00</V>
+ <V ID="46">2.148e+00 1.000e+00 0.000e+00</V>
+ <V ID="47">1.864e+00 1.000e+00 0.000e+00</V>
+ <V ID="48">1.999e+00 7.502e-01 0.000e+00</V>
+ <V ID="49">9.802e-01 -3.934e-01 0.000e+00</V>
+ <V ID="50">1.214e+00 -3.125e-01 0.000e+00</V>
+ <V ID="51">1.103e+00 -2.142e-01 0.000e+00</V>
+ <V ID="52">7.690e-01 -1.970e-02 0.000e+00</V>
+ <V ID="53">1.186e+00 -6.688e-01 0.000e+00</V>
+ <V ID="54">0.000e+00 0.000e+00 0.000e+00</V>
+ <V ID="55">2.546e-01 5.955e-01 0.000e+00</V>
+ <V ID="56">8.865e-01 3.433e-02 0.000e+00</V>
+ <V ID="57">1.364e+00 -1.000e+00 0.000e+00</V>
+ <V ID="58">1.636e+00 -1.000e+00 0.000e+00</V>
+ <V ID="59">1.500e+00 -7.319e-01 0.000e+00</V>
+ <V ID="60">1.091e+00 -1.000e+00 0.000e+00</V>
+ <V ID="61">1.296e+00 1.000e+00 0.000e+00</V>
+ <V ID="62">1.012e+00 1.000e+00 0.000e+00</V>
+ <V ID="63">1.114e+00 7.545e-01 0.000e+00</V>
+ <V ID="64">0.000e+00 -1.437e-01 0.000e+00</V>
+ <V ID="65">9.969e-02 -1.178e-01 0.000e+00</V>
+ <V ID="66">1.672e-01 2.670e-02 0.000e+00</V>
+ <V ID="67">2.009e+00 4.167e-01 0.000e+00</V>
+ <V ID="68">1.609e+00 2.301e-01 0.000e+00</V>
+ <V ID="69">1.923e+00 1.011e-01 0.000e+00</V>
+ <V ID="70">4.773e-01 -5.250e-01 0.000e+00</V>
+ <V ID="71">7.022e-01 -3.851e-01 0.000e+00</V>
+ <V ID="72">4.793e-01 -3.146e-01 0.000e+00</V>
+ <V ID="73">6.014e-01 -2.135e-01 0.000e+00</V>
+ <V ID="74">7.335e-01 -1.983e-01 0.000e+00</V>
+ <V ID="75">-5.000e-01 5.000e-01 0.000e+00</V>
+ <V ID="76">8.489e-01 -1.271e-01 0.000e+00</V>
+ <V ID="77">8.435e-01 -2.736e-01 0.000e+00</V>
+ <V ID="78">1.834e-01 1.520e-01 0.000e+00</V>
+ <V ID="79">9.988e-02 7.679e-01 0.000e+00</V>
+ <V ID="80">3.153e-01 -2.663e-02 0.000e+00</V>
+ <V ID="81">1.375e+00 -2.213e-01 0.000e+00</V>
+ <V ID="82">1.425e+00 -4.244e-01 0.000e+00</V>
+ <V ID="83">1.580e+00 1.000e+00 0.000e+00</V>
+ <V ID="84">1.715e+00 8.059e-01 0.000e+00</V>
+ <V ID="85">1.674e+00 5.687e-01 0.000e+00</V>
+ <V ID="86">9.867e-01 -8.334e-01 0.000e+00</V>
+ <V ID="87">1.435e+00 7.290e-01 0.000e+00</V>
+ <V ID="88">1.206e+00 4.775e-01 0.000e+00</V>
+ <V ID="89">1.256e+00 -1.832e-01 0.000e+00</V>
+ <V ID="90">1.186e+00 -9.830e-02 0.000e+00</V>
+ <V ID="91">1.074e+00 -6.391e-02 0.000e+00</V>
+ <V ID="92">6.557e-01 -5.683e-01 0.000e+00</V>
+ <V ID="93">1.194e+00 1.327e-02 0.000e+00</V>
+ <V ID="94">1.111e+00 8.711e-02 0.000e+00</V>
+ <V ID="95">1.580e+00 -1.320e-01 0.000e+00</V>
+ <V ID="96">1.674e+00 -5.024e-01 0.000e+00</V>
+ <V ID="97">6.610e-01 -8.273e-02 0.000e+00</V>
+ <V ID="98">1.444e+00 4.373e-01 0.000e+00</V>
+ <V ID="99">1.332e+00 -4.845e-02 0.000e+00</V>
+ <V ID="100">1.755e+00 -7.854e-01 0.000e+00</V>
+ <V ID="101">9.645e-01 -1.951e-01 0.000e+00</V>
+ <V ID="102">7.531e-01 -1.070e-01 0.000e+00</V>
+ <V ID="103">5.412e-01 -1.170e-01 0.000e+00</V>
+ <V ID="104">9.577e-01 -5.984e-02 0.000e+00</V>
+ <V ID="105">2.005e+00 -2.065e-01 0.000e+00</V>
+ <V ID="106">2.300e-01 -9.134e-02 0.000e+00</V>
+ <V ID="107">3.074e-01 -1.638e-01 0.000e+00</V>
+ <V ID="108">1.680e-01 -8.225e-01 0.000e+00</V>
+ <V ID="109">0.000e+00 -1.000e+00 0.000e+00</V>
+ <V ID="110">1.832e-01 -1.919e-01 0.000e+00</V>
+ <V ID="111">2.577e-01 -3.470e-01 0.000e+00</V>
+ <V ID="112">0.000e+00 -2.875e-01 0.000e+00</V>
+ <V ID="113">3.877e-01 -2.253e-01 0.000e+00</V>
+ <V ID="114">1.451e+00 6.292e-02 0.000e+00</V>
+ <V ID="115">1.005e+00 4.572e-02 0.000e+00</V>
+ <V ID="116">2.455e+00 -1.000e+00 0.000e+00</V>
+ <V ID="117">2.542e+00 -6.756e-01 0.000e+00</V>
+ <V ID="118">4.874e-01 -1.930e-01 0.000e+00</V>
+ <V ID="119">1.293e+00 1.863e-01 0.000e+00</V>
+ <V ID="120">3.000e+00 -5.319e-12 0.000e+00</V>
+ <V ID="121">2.462e+00 6.409e-01 0.000e+00</V>
+ <V ID="122">2.432e+00 1.000e+00 0.000e+00</V>
+ <V ID="123">2.300e+00 1.144e-01 0.000e+00</V>
+ <V ID="124">2.398e+00 -2.656e-01 0.000e+00</V>
+ <V ID="125">3.598e+00 -1.000e+00 0.000e+00</V>
+ <V ID="126">3.598e+00 -7.597e-01 0.000e+00</V>
+ <V ID="127">3.598e+00 -5.319e-12 0.000e+00</V>
+ <V ID="128">3.598e+00 7.597e-01 0.000e+00</V>
+ <V ID="129">3.598e+00 1.000e+00 0.000e+00</V>
+ <V ID="130">4.212e+00 -1.000e+00 0.000e+00</V>
+ <V ID="131">4.212e+00 -7.597e-01 0.000e+00</V>
+ <V ID="132">4.212e+00 -5.319e-12 0.000e+00</V>
+ <V ID="133">4.212e+00 7.597e-01 0.000e+00</V>
+ <V ID="134">4.212e+00 1.000e+00 0.000e+00</V>
+ <V ID="135">4.840e+00 -1.000e+00 0.000e+00</V>
+ <V ID="136">4.840e+00 -7.597e-01 0.000e+00</V>
+ <V ID="137">4.840e+00 -5.319e-12 0.000e+00</V>
+ <V ID="138">4.840e+00 7.597e-01 0.000e+00</V>
+ <V ID="139">4.840e+00 1.000e+00 0.000e+00</V>
+ <V ID="140">5.485e+00 -1.000e+00 0.000e+00</V>
+ <V ID="141">5.485e+00 -7.597e-01 0.000e+00</V>
+ <V ID="142">5.485e+00 -5.319e-12 0.000e+00</V>
+ <V ID="143">5.485e+00 7.597e-01 0.000e+00</V>
+ <V ID="144">5.485e+00 1.000e+00 0.000e+00</V>
+ <V ID="145">6.145e+00 -1.000e+00 0.000e+00</V>
+ <V ID="146">6.145e+00 -7.597e-01 0.000e+00</V>
+ <V ID="147">6.145e+00 -5.319e-12 0.000e+00</V>
+ <V ID="148">6.145e+00 7.597e-01 0.000e+00</V>
+ <V ID="149">6.145e+00 1.000e+00 0.000e+00</V>
+ <V ID="150">6.822e+00 -1.000e+00 0.000e+00</V>
+ <V ID="151">6.822e+00 -7.597e-01 0.000e+00</V>
+ <V ID="152">6.822e+00 -5.319e-12 0.000e+00</V>
+ <V ID="153">6.822e+00 7.597e-01 0.000e+00</V>
+ <V ID="154">6.822e+00 1.000e+00 0.000e+00</V>
+ <V ID="155">7.516e+00 -1.000e+00 0.000e+00</V>
+ <V ID="156">7.516e+00 -7.597e-01 0.000e+00</V>
+ <V ID="157">7.516e+00 -5.319e-12 0.000e+00</V>
+ <V ID="158">7.516e+00 7.597e-01 0.000e+00</V>
+ <V ID="159">7.516e+00 1.000e+00 0.000e+00</V>
+ <V ID="160">8.227e+00 -1.000e+00 0.000e+00</V>
+ <V ID="161">8.227e+00 -7.597e-01 0.000e+00</V>
+ <V ID="162">8.227e+00 -5.319e-12 0.000e+00</V>
+ <V ID="163">8.227e+00 7.597e-01 0.000e+00</V>
+ <V ID="164">8.227e+00 1.000e+00 0.000e+00</V>
+ <V ID="165">8.956e+00 -1.000e+00 0.000e+00</V>
+ <V ID="166">8.956e+00 -7.597e-01 0.000e+00</V>
+ <V ID="167">8.956e+00 -5.319e-12 0.000e+00</V>
+ <V ID="168">8.956e+00 7.597e-01 0.000e+00</V>
+ <V ID="169">8.956e+00 1.000e+00 0.000e+00</V>
+ <V ID="170">9.703e+00 -1.000e+00 0.000e+00</V>
+ <V ID="171">9.703e+00 -7.597e-01 0.000e+00</V>
+ <V ID="172">9.703e+00 -5.319e-12 0.000e+00</V>
+ <V ID="173">9.703e+00 7.597e-01 0.000e+00</V>
+ <V ID="174">9.703e+00 1.000e+00 0.000e+00</V>
+ <V ID="175">1.047e+01 -1.000e+00 0.000e+00</V>
+ <V ID="176">1.047e+01 -7.597e-01 0.000e+00</V>
+ <V ID="177">1.047e+01 -5.319e-12 0.000e+00</V>
+ <V ID="178">1.047e+01 7.597e-01 0.000e+00</V>
+ <V ID="179">1.047e+01 1.000e+00 0.000e+00</V>
+ <V ID="180">1.125e+01 -1.000e+00 0.000e+00</V>
+ <V ID="181">1.125e+01 -7.597e-01 0.000e+00</V>
+ <V ID="182">1.125e+01 -5.319e-12 0.000e+00</V>
+ <V ID="183">1.125e+01 7.597e-01 0.000e+00</V>
+ <V ID="184">1.125e+01 1.000e+00 0.000e+00</V>
+ <V ID="185">1.206e+01 -1.000e+00 0.000e+00</V>
+ <V ID="186">1.206e+01 -7.597e-01 0.000e+00</V>
+ <V ID="187">1.206e+01 -5.319e-12 0.000e+00</V>
+ <V ID="188">1.206e+01 7.597e-01 0.000e+00</V>
+ <V ID="189">1.206e+01 1.000e+00 0.000e+00</V>
+ <V ID="190">1.288e+01 -1.000e+00 0.000e+00</V>
+ <V ID="191">1.288e+01 -7.597e-01 0.000e+00</V>
+ <V ID="192">1.288e+01 -5.319e-12 0.000e+00</V>
+ <V ID="193">1.288e+01 7.597e-01 0.000e+00</V>
+ <V ID="194">1.288e+01 1.000e+00 0.000e+00</V>
+ <V ID="195">1.373e+01 -1.000e+00 0.000e+00</V>
+ <V ID="196">1.373e+01 -7.597e-01 0.000e+00</V>
+ <V ID="197">1.373e+01 -5.319e-12 0.000e+00</V>
+ <V ID="198">1.373e+01 7.597e-01 0.000e+00</V>
+ <V ID="199">1.373e+01 1.000e+00 0.000e+00</V>
+ <V ID="200">1.460e+01 -1.000e+00 0.000e+00</V>
+ <V ID="201">1.460e+01 -7.597e-01 0.000e+00</V>
+ <V ID="202">1.460e+01 -5.319e-12 0.000e+00</V>
+ <V ID="203">1.460e+01 7.597e-01 0.000e+00</V>
+ <V ID="204">1.460e+01 1.000e+00 0.000e+00</V>
+ <V ID="205">1.548e+01 -1.000e+00 0.000e+00</V>
+ <V ID="206">1.548e+01 -7.597e-01 0.000e+00</V>
+ <V ID="207">1.548e+01 -5.319e-12 0.000e+00</V>
+ <V ID="208">1.548e+01 7.597e-01 0.000e+00</V>
+ <V ID="209">1.548e+01 1.000e+00 0.000e+00</V>
+ <V ID="210">1.639e+01 -1.000e+00 0.000e+00</V>
+ <V ID="211">1.639e+01 -7.597e-01 0.000e+00</V>
+ <V ID="212">1.639e+01 -5.319e-12 0.000e+00</V>
+ <V ID="213">1.639e+01 7.597e-01 0.000e+00</V>
+ <V ID="214">1.639e+01 1.000e+00 0.000e+00</V>
+ <V ID="215">1.733e+01 -1.000e+00 0.000e+00</V>
+ <V ID="216">1.733e+01 -7.597e-01 0.000e+00</V>
+ <V ID="217">1.733e+01 -5.319e-12 0.000e+00</V>
+ <V ID="218">1.733e+01 7.597e-01 0.000e+00</V>
+ <V ID="219">1.733e+01 1.000e+00 0.000e+00</V>
+ <V ID="220">1.828e+01 -1.000e+00 0.000e+00</V>
+ <V ID="221">1.828e+01 -7.597e-01 0.000e+00</V>
+ <V ID="222">1.828e+01 -5.319e-12 0.000e+00</V>
+ <V ID="223">1.828e+01 7.597e-01 0.000e+00</V>
+ <V ID="224">1.828e+01 1.000e+00 0.000e+00</V>
+ <V ID="225">1.926e+01 -1.000e+00 0.000e+00</V>
+ <V ID="226">1.926e+01 -7.597e-01 0.000e+00</V>
+ <V ID="227">1.926e+01 -5.319e-12 0.000e+00</V>
+ <V ID="228">1.926e+01 7.597e-01 0.000e+00</V>
+ <V ID="229">1.926e+01 1.000e+00 0.000e+00</V>
+ <V ID="230">2.027e+01 -1.000e+00 0.000e+00</V>
+ <V ID="231">2.027e+01 -7.597e-01 0.000e+00</V>
+ <V ID="232">2.027e+01 -5.319e-12 0.000e+00</V>
+ <V ID="233">2.027e+01 7.597e-01 0.000e+00</V>
+ <V ID="234">2.027e+01 1.000e+00 0.000e+00</V>
+ <V ID="235">2.130e+01 -1.000e+00 0.000e+00</V>
+ <V ID="236">2.130e+01 -7.597e-01 0.000e+00</V>
+ <V ID="237">2.130e+01 -5.319e-12 0.000e+00</V>
+ <V ID="238">2.130e+01 7.597e-01 0.000e+00</V>
+ <V ID="239">2.130e+01 1.000e+00 0.000e+00</V>
+ <V ID="240">2.236e+01 -1.000e+00 0.000e+00</V>
+ <V ID="241">2.236e+01 -7.597e-01 0.000e+00</V>
+ <V ID="242">2.236e+01 -5.319e-12 0.000e+00</V>
+ <V ID="243">2.236e+01 7.597e-01 0.000e+00</V>
+ <V ID="244">2.236e+01 1.000e+00 0.000e+00</V>
+ <V ID="245">2.344e+01 -1.000e+00 0.000e+00</V>
+ <V ID="246">2.344e+01 -7.597e-01 0.000e+00</V>
+ <V ID="247">2.344e+01 -5.319e-12 0.000e+00</V>
+ <V ID="248">2.344e+01 7.597e-01 0.000e+00</V>
+ <V ID="249">2.344e+01 1.000e+00 0.000e+00</V>
+ <V ID="250">2.455e+01 -1.000e+00 0.000e+00</V>
+ <V ID="251">2.455e+01 -7.597e-01 0.000e+00</V>
+ <V ID="252">2.455e+01 -5.319e-12 0.000e+00</V>
+ <V ID="253">2.455e+01 7.597e-01 0.000e+00</V>
+ <V ID="254">2.455e+01 1.000e+00 0.000e+00</V>
+ <V ID="255">2.568e+01 -1.000e+00 0.000e+00</V>
+ <V ID="256">2.568e+01 -7.597e-01 0.000e+00</V>
+ <V ID="257">2.568e+01 -5.319e-12 0.000e+00</V>
+ <V ID="258">2.568e+01 7.597e-01 0.000e+00</V>
+ <V ID="259">2.568e+01 1.000e+00 0.000e+00</V>
+ <V ID="260">2.685e+01 -1.000e+00 0.000e+00</V>
+ <V ID="261">2.685e+01 -7.597e-01 0.000e+00</V>
+ <V ID="262">2.685e+01 -5.319e-12 0.000e+00</V>
+ <V ID="263">2.685e+01 7.597e-01 0.000e+00</V>
+ <V ID="264">2.685e+01 1.000e+00 0.000e+00</V>
+ <V ID="265">2.804e+01 -1.000e+00 0.000e+00</V>
+ <V ID="266">2.804e+01 -7.597e-01 0.000e+00</V>
+ <V ID="267">2.804e+01 -5.319e-12 0.000e+00</V>
+ <V ID="268">2.804e+01 7.597e-01 0.000e+00</V>
+ <V ID="269">2.804e+01 1.000e+00 0.000e+00</V>
+ <V ID="270">2.927e+01 -1.000e+00 0.000e+00</V>
+ <V ID="271">2.927e+01 -7.597e-01 0.000e+00</V>
+ <V ID="272">2.927e+01 -5.319e-12 0.000e+00</V>
+ <V ID="273">2.927e+01 7.597e-01 0.000e+00</V>
+ <V ID="274">2.927e+01 1.000e+00 0.000e+00</V>
+ <V ID="275">3.052e+01 -1.000e+00 0.000e+00</V>
+ <V ID="276">3.052e+01 -7.597e-01 0.000e+00</V>
+ <V ID="277">3.052e+01 -5.319e-12 0.000e+00</V>
+ <V ID="278">3.052e+01 7.597e-01 0.000e+00</V>
+ <V ID="279">3.052e+01 1.000e+00 0.000e+00</V>
+ <V ID="280">3.181e+01 -1.000e+00 0.000e+00</V>
+ <V ID="281">3.181e+01 -7.597e-01 0.000e+00</V>
+ <V ID="282">3.181e+01 -5.319e-12 0.000e+00</V>
+ <V ID="283">3.181e+01 7.597e-01 0.000e+00</V>
+ <V ID="284">3.181e+01 1.000e+00 0.000e+00</V>
+ <V ID="285">3.313e+01 -1.000e+00 0.000e+00</V>
+ <V ID="286">3.313e+01 -7.597e-01 0.000e+00</V>
+ <V ID="287">3.313e+01 -5.319e-12 0.000e+00</V>
+ <V ID="288">3.313e+01 7.597e-01 0.000e+00</V>
+ <V ID="289">3.313e+01 1.000e+00 0.000e+00</V>
+ <V ID="290">3.448e+01 -1.000e+00 0.000e+00</V>
+ <V ID="291">3.448e+01 -7.597e-01 0.000e+00</V>
+ <V ID="292">3.448e+01 -5.319e-12 0.000e+00</V>
+ <V ID="293">3.448e+01 7.597e-01 0.000e+00</V>
+ <V ID="294">3.448e+01 1.000e+00 0.000e+00</V>
+ <V ID="295">3.587e+01 -1.000e+00 0.000e+00</V>
+ <V ID="296">3.587e+01 -7.597e-01 0.000e+00</V>
+ <V ID="297">3.587e+01 -5.319e-12 0.000e+00</V>
+ <V ID="298">3.587e+01 7.597e-01 0.000e+00</V>
+ <V ID="299">3.587e+01 1.000e+00 0.000e+00</V>
+ <V ID="300">3.728e+01 -1.000e+00 0.000e+00</V>
+ <V ID="301">3.728e+01 -7.597e-01 0.000e+00</V>
+ <V ID="302">3.728e+01 -5.319e-12 0.000e+00</V>
+ <V ID="303">3.728e+01 7.597e-01 0.000e+00</V>
+ <V ID="304">3.728e+01 1.000e+00 0.000e+00</V>
+ <V ID="305">3.874e+01 -1.000e+00 0.000e+00</V>
+ <V ID="306">3.874e+01 -7.597e-01 0.000e+00</V>
+ <V ID="307">3.874e+01 -5.319e-12 0.000e+00</V>
+ <V ID="308">3.874e+01 7.597e-01 0.000e+00</V>
+ <V ID="309">3.874e+01 1.000e+00 0.000e+00</V>
+ <V ID="310">4.023e+01 -1.000e+00 0.000e+00</V>
+ <V ID="311">4.023e+01 -7.597e-01 0.000e+00</V>
+ <V ID="312">4.023e+01 -5.319e-12 0.000e+00</V>
+ <V ID="313">4.023e+01 7.597e-01 0.000e+00</V>
+ <V ID="314">4.023e+01 1.000e+00 0.000e+00</V>
+ <V ID="315">4.176e+01 -1.000e+00 0.000e+00</V>
+ <V ID="316">4.176e+01 -7.597e-01 0.000e+00</V>
+ <V ID="317">4.176e+01 -5.319e-12 0.000e+00</V>
+ <V ID="318">4.176e+01 7.597e-01 0.000e+00</V>
+ <V ID="319">4.176e+01 1.000e+00 0.000e+00</V>
+ <V ID="320">4.333e+01 -1.000e+00 0.000e+00</V>
+ <V ID="321">4.333e+01 -7.597e-01 0.000e+00</V>
+ <V ID="322">4.333e+01 -5.319e-12 0.000e+00</V>
+ <V ID="323">4.333e+01 7.597e-01 0.000e+00</V>
+ <V ID="324">4.333e+01 1.000e+00 0.000e+00</V>
+ <V ID="325">4.494e+01 -1.000e+00 0.000e+00</V>
+ <V ID="326">4.494e+01 -7.597e-01 0.000e+00</V>
+ <V ID="327">4.494e+01 -5.319e-12 0.000e+00</V>
+ <V ID="328">4.494e+01 7.597e-01 0.000e+00</V>
+ <V ID="329">4.494e+01 1.000e+00 0.000e+00</V>
+ <V ID="330">4.658e+01 -1.000e+00 0.000e+00</V>
+ <V ID="331">4.658e+01 -7.597e-01 0.000e+00</V>
+ <V ID="332">4.658e+01 -5.319e-12 0.000e+00</V>
+ <V ID="333">4.658e+01 7.597e-01 0.000e+00</V>
+ <V ID="334">4.658e+01 1.000e+00 0.000e+00</V>
+ <V ID="335">4.827e+01 -1.000e+00 0.000e+00</V>
+ <V ID="336">4.827e+01 -7.597e-01 0.000e+00</V>
+ <V ID="337">4.827e+01 -5.319e-12 0.000e+00</V>
+ <V ID="338">4.827e+01 7.597e-01 0.000e+00</V>
+ <V ID="339">4.827e+01 1.000e+00 0.000e+00</V>
+ <V ID="340">5.000e+01 -1.000e+00 0.000e+00</V>
+ <V ID="341">5.000e+01 -7.597e-01 0.000e+00</V>
+ <V ID="342">5.000e+01 -5.319e-12 0.000e+00</V>
+ <V ID="343">5.000e+01 7.597e-01 0.000e+00</V>
+ <V ID="344">5.000e+01 1.000e+00 0.000e+00</V>
+ <V ID="345">-8.902e-01 1.000e+00 0.000e+00</V>
+ <V ID="346">-8.902e-01 8.799e-01 0.000e+00</V>
+ <V ID="347">-8.902e-01 5.000e-01 0.000e+00</V>
+ <V ID="348">-8.902e-01 1.201e-01 0.000e+00</V>
+ <V ID="349">-8.902e-01 0.000e+00 0.000e+00</V>
+ <V ID="350">-1.339e+00 1.000e+00 0.000e+00</V>
+ <V ID="351">-1.339e+00 8.799e-01 0.000e+00</V>
+ <V ID="352">-1.339e+00 5.000e-01 0.000e+00</V>
+ <V ID="353">-1.339e+00 1.201e-01 0.000e+00</V>
+ <V ID="354">-1.339e+00 0.000e+00 0.000e+00</V>
+ <V ID="355">-1.855e+00 1.000e+00 0.000e+00</V>
+ <V ID="356">-1.855e+00 8.799e-01 0.000e+00</V>
+ <V ID="357">-1.855e+00 5.000e-01 0.000e+00</V>
+ <V ID="358">-1.855e+00 1.201e-01 0.000e+00</V>
+ <V ID="359">-1.855e+00 0.000e+00 0.000e+00</V>
+ <V ID="360">-2.448e+00 1.000e+00 0.000e+00</V>
+ <V ID="361">-2.448e+00 8.799e-01 0.000e+00</V>
+ <V ID="362">-2.448e+00 5.000e-01 0.000e+00</V>
+ <V ID="363">-2.448e+00 1.201e-01 0.000e+00</V>
+ <V ID="364">-2.448e+00 0.000e+00 0.000e+00</V>
+ <V ID="365">-3.131e+00 1.000e+00 0.000e+00</V>
+ <V ID="366">-3.131e+00 8.799e-01 0.000e+00</V>
+ <V ID="367">-3.131e+00 5.000e-01 0.000e+00</V>
+ <V ID="368">-3.131e+00 1.201e-01 0.000e+00</V>
+ <V ID="369">-3.131e+00 0.000e+00 0.000e+00</V>
+ <V ID="370">-3.915e+00 1.000e+00 0.000e+00</V>
+ <V ID="371">-3.915e+00 8.799e-01 0.000e+00</V>
+ <V ID="372">-3.915e+00 5.000e-01 0.000e+00</V>
+ <V ID="373">-3.915e+00 1.201e-01 0.000e+00</V>
+ <V ID="374">-3.915e+00 0.000e+00 0.000e+00</V>
+ <V ID="375">-4.818e+00 1.000e+00 0.000e+00</V>
+ <V ID="376">-4.818e+00 8.799e-01 0.000e+00</V>
+ <V ID="377">-4.818e+00 5.000e-01 0.000e+00</V>
+ <V ID="378">-4.818e+00 1.201e-01 0.000e+00</V>
+ <V ID="379">-4.818e+00 0.000e+00 0.000e+00</V>
+ <V ID="380">-5.856e+00 1.000e+00 0.000e+00</V>
+ <V ID="381">-5.856e+00 8.799e-01 0.000e+00</V>
+ <V ID="382">-5.856e+00 5.000e-01 0.000e+00</V>
+ <V ID="383">-5.856e+00 1.201e-01 0.000e+00</V>
+ <V ID="384">-5.856e+00 0.000e+00 0.000e+00</V>
+ <V ID="385">-7.049e+00 1.000e+00 0.000e+00</V>
+ <V ID="386">-7.049e+00 8.799e-01 0.000e+00</V>
+ <V ID="387">-7.049e+00 5.000e-01 0.000e+00</V>
+ <V ID="388">-7.049e+00 1.201e-01 0.000e+00</V>
+ <V ID="389">-7.049e+00 0.000e+00 0.000e+00</V>
+ <V ID="390">-8.422e+00 1.000e+00 0.000e+00</V>
+ <V ID="391">-8.422e+00 8.799e-01 0.000e+00</V>
+ <V ID="392">-8.422e+00 5.000e-01 0.000e+00</V>
+ <V ID="393">-8.422e+00 1.201e-01 0.000e+00</V>
+ <V ID="394">-8.422e+00 0.000e+00 0.000e+00</V>
+ <V ID="395">-1.000e+01 1.000e+00 0.000e+00</V>
+ <V ID="396">-1.000e+01 8.799e-01 0.000e+00</V>
+ <V ID="397">-1.000e+01 5.000e-01 0.000e+00</V>
+ <V ID="398">-1.000e+01 1.201e-01 0.000e+00</V>
+ <V ID="399">-1.000e+01 0.000e+00 0.000e+00</V>
+ </VERTEX>
+ <EDGE>
+ <E ID="0"> 0 1 </E>
+ <E ID="1"> 1 2 </E>
+ <E ID="2"> 2 0 </E>
+ <E ID="3"> 3 4 </E>
+ <E ID="4"> 4 5 </E>
+ <E ID="5"> 5 3 </E>
+ <E ID="6"> 6 7 </E>
+ <E ID="7"> 7 8 </E>
+ <E ID="8"> 8 6 </E>
+ <E ID="9"> 9 10 </E>
+ <E ID="10"> 10 11 </E>
+ <E ID="11"> 11 9 </E>
+ <E ID="12"> 12 13 </E>
+ <E ID="13"> 13 14 </E>
+ <E ID="14"> 14 12 </E>
+ <E ID="15"> 15 16 </E>
+ <E ID="16"> 16 17 </E>
+ <E ID="17"> 17 15 </E>
+ <E ID="18"> 14 18 </E>
+ <E ID="19"> 18 12 </E>
+ <E ID="20"> 19 20 </E>
+ <E ID="21"> 20 21 </E>
+ <E ID="22"> 21 19 </E>
+ <E ID="23"> 22 23 </E>
+ <E ID="24"> 23 24 </E>
+ <E ID="25"> 24 22 </E>
+ <E ID="26"> 25 26 </E>
+ <E ID="27"> 26 27 </E>
+ <E ID="28"> 27 25 </E>
+ <E ID="29"> 28 26 </E>
+ <E ID="30"> 25 28 </E>
+ <E ID="31"> 29 30 </E>
+ <E ID="32"> 30 23 </E>
+ <E ID="33"> 23 29 </E>
+ <E ID="34"> 30 24 </E>
+ <E ID="35"> 31 12 </E>
+ <E ID="36"> 12 32 </E>
+ <E ID="37"> 32 31 </E>
+ <E ID="38"> 33 13 </E>
+ <E ID="39"> 13 34 </E>
+ <E ID="40"> 34 33 </E>
+ <E ID="41"> 12 35 </E>
+ <E ID="42"> 35 13 </E>
+ <E ID="43"> 36 31 </E>
+ <E ID="44"> 32 36 </E>
+ <E ID="45"> 37 30 </E>
+ <E ID="46"> 29 37 </E>
+ <E ID="47"> 38 18 </E>
+ <E ID="48"> 18 39 </E>
+ <E ID="49"> 39 38 </E>
+ <E ID="50"> 12 40 </E>
+ <E ID="51"> 40 32 </E>
+ <E ID="52"> 18 40 </E>
+ <E ID="53"> 41 14 </E>
+ <E ID="54"> 13 41 </E>
+ <E ID="55"> 25 14 </E>
+ <E ID="56"> 41 25 </E>
+ <E ID="57"> 42 38 </E>
+ <E ID="58"> 39 42 </E>
+ <E ID="59"> 43 31 </E>
+ <E ID="60"> 31 44 </E>
+ <E ID="61"> 44 43 </E>
+ <E ID="62"> 43 35 </E>
+ <E ID="63"> 12 43 </E>
+ <E ID="64"> 44 35 </E>
+ <E ID="65"> 45 38 </E>
+ <E ID="66"> 38 4 </E>
+ <E ID="67"> 4 45 </E>
+ <E ID="68"> 46 47 </E>
+ <E ID="69"> 47 48 </E>
+ <E ID="70"> 48 46 </E>
+ <E ID="71"> 49 50 </E>
+ <E ID="72"> 50 51 </E>
+ <E ID="73"> 51 49 </E>
+ <E ID="74"> 44 52 </E>
+ <E ID="75"> 52 35 </E>
+ <E ID="76"> 53 50 </E>
+ <E ID="77"> 49 53 </E>
+ <E ID="78"> 4 54 </E>
+ <E ID="79"> 54 45 </E>
+ <E ID="80"> 25 55 </E>
+ <E ID="81"> 55 14 </E>
+ <E ID="82"> 35 34 </E>
+ <E ID="83"> 56 34 </E>
+ <E ID="84"> 35 56 </E>
+ <E ID="85"> 52 56 </E>
+ <E ID="86"> 57 58 </E>
+ <E ID="87"> 58 59 </E>
+ <E ID="88"> 59 57 </E>
+ <E ID="89"> 53 60 </E>
+ <E ID="90"> 60 57 </E>
+ <E ID="91"> 57 53 </E>
+ <E ID="92"> 59 53 </E>
+ <E ID="93"> 61 62 </E>
+ <E ID="94"> 62 63 </E>
+ <E ID="95"> 63 61 </E>
+ <E ID="96"> 49 37 </E>
+ <E ID="97"> 37 53 </E>
+ <E ID="98"> 54 64 </E>
+ <E ID="99"> 64 65 </E>
+ <E ID="100"> 65 54 </E>
+ <E ID="101"> 65 66 </E>
+ <E ID="102"> 66 54 </E>
+ <E ID="103"> 67 68 </E>
+ <E ID="104"> 68 69 </E>
+ <E ID="105"> 69 67 </E>
+ <E ID="106"> 55 18 </E>
+ <E ID="107"> 55 39 </E>
+ <E ID="108"> 70 71 </E>
+ <E ID="109"> 71 72 </E>
+ <E ID="110"> 72 70 </E>
+ <E ID="111"> 73 72 </E>
+ <E ID="112"> 71 73 </E>
+ <E ID="113"> 71 74 </E>
+ <E ID="114"> 74 73 </E>
+ <E ID="115"> 9 42 </E>
+ <E ID="116"> 42 10 </E>
+ <E ID="117"> 75 42 </E>
+ <E ID="118"> 9 75 </E>
+ <E ID="119"> 66 45 </E>
+ <E ID="120"> 45 18 </E>
+ <E ID="121"> 38 5 </E>
+ <E ID="122"> 15 24 </E>
+ <E ID="123"> 24 70 </E>
+ <E ID="124"> 70 15 </E>
+ <E ID="125"> 30 70 </E>
+ <E ID="126"> 41 28 </E>
+ <E ID="127"> 62 28 </E>
+ <E ID="128"> 41 62 </E>
+ <E ID="129"> 33 41 </E>
+ <E ID="130"> 41 63 </E>
+ <E ID="131"> 33 63 </E>
+ <E ID="132"> 75 5 </E>
+ <E ID="133"> 38 75 </E>
+ <E ID="134"> 76 74 </E>
+ <E ID="135"> 74 77 </E>
+ <E ID="136"> 77 76 </E>
+ <E ID="137"> 18 78 </E>
+ <E ID="138"> 78 40 </E>
+ <E ID="139"> 66 78 </E>
+ <E ID="140"> 78 45 </E>
+ <E ID="141"> 66 40 </E>
+ <E ID="142"> 55 79 </E>
+ <E ID="143"> 79 39 </E>
+ <E ID="144"> 27 10 </E>
+ <E ID="145"> 10 79 </E>
+ <E ID="146"> 79 27 </E>
+ <E ID="147"> 80 36 </E>
+ <E ID="148"> 32 80 </E>
+ <E ID="149"> 81 50 </E>
+ <E ID="150"> 50 82 </E>
+ <E ID="151"> 82 81 </E>
+ <E ID="152"> 47 83 </E>
+ <E ID="153"> 83 84 </E>
+ <E ID="154"> 84 47 </E>
+ <E ID="155"> 84 48 </E>
+ <E ID="156"> 67 48 </E>
+ <E ID="157"> 48 85 </E>
+ <E ID="158"> 85 67 </E>
+ <E ID="159"> 86 29 </E>
+ <E ID="160"> 29 60 </E>
+ <E ID="161"> 60 86 </E>
+ <E ID="162"> 86 53 </E>
+ <E ID="163"> 37 86 </E>
+ <E ID="164"> 87 83 </E>
+ <E ID="165"> 83 61 </E>
+ <E ID="166"> 61 87 </E>
+ <E ID="167"> 33 88 </E>
+ <E ID="168"> 88 63 </E>
+ <E ID="169"> 89 50 </E>
+ <E ID="170"> 81 89 </E>
+ <E ID="171"> 51 90 </E>
+ <E ID="172"> 90 91 </E>
+ <E ID="173"> 91 51 </E>
+ <E ID="174"> 37 92 </E>
+ <E ID="175"> 92 30 </E>
+ <E ID="176"> 89 51 </E>
+ <E ID="177"> 89 90 </E>
+ <E ID="178"> 90 93 </E>
+ <E ID="179"> 93 91 </E>
+ <E ID="180"> 94 91 </E>
+ <E ID="181"> 93 94 </E>
+ <E ID="182"> 87 84 </E>
+ <E ID="183"> 92 70 </E>
+ <E ID="184"> 92 71 </E>
+ <E ID="185"> 79 25 </E>
+ <E ID="186"> 34 88 </E>
+ <E ID="187"> 84 85 </E>
+ <E ID="188"> 42 79 </E>
+ <E ID="189"> 95 81 </E>
+ <E ID="190"> 82 95 </E>
+ <E ID="191"> 95 69 </E>
+ <E ID="192"> 68 95 </E>
+ <E ID="193"> 53 82 </E>
+ <E ID="194"> 82 59 </E>
+ <E ID="195"> 59 96 </E>
+ <E ID="196"> 96 82 </E>
+ <E ID="197"> 96 95 </E>
+ <E ID="198"> 97 44 </E>
+ <E ID="199"> 31 97 </E>
+ <E ID="200"> 52 76 </E>
+ <E ID="201"> 76 56 </E>
+ <E ID="202"> 97 52 </E>
+ <E ID="203"> 97 73 </E>
+ <E ID="204"> 74 97 </E>
+ <E ID="205"> 71 77 </E>
+ <E ID="206"> 49 77 </E>
+ <E ID="207"> 71 49 </E>
+ <E ID="208"> 71 37 </E>
+ <E ID="209"> 63 87 </E>
+ <E ID="210"> 88 87 </E>
+ <E ID="211"> 88 98 </E>
+ <E ID="212"> 98 87 </E>
+ <E ID="213"> 40 80 </E>
+ <E ID="214"> 66 80 </E>
+ <E ID="215"> 85 68 </E>
+ <E ID="216"> 95 99 </E>
+ <E ID="217"> 99 81 </E>
+ <E ID="218"> 100 59 </E>
+ <E ID="219"> 58 100 </E>
+ <E ID="220"> 100 96 </E>
+ <E ID="221"> 49 101 </E>
+ <E ID="222"> 101 77 </E>
+ <E ID="223"> 51 101 </E>
+ <E ID="224"> 74 102 </E>
+ <E ID="225"> 102 97 </E>
+ <E ID="226"> 52 102 </E>
+ <E ID="227"> 102 76 </E>
+ <E ID="228"> 103 31 </E>
+ <E ID="229"> 36 103 </E>
+ <E ID="230"> 103 73 </E>
+ <E ID="231"> 97 103 </E>
+ <E ID="232"> 104 56 </E>
+ <E ID="233"> 76 104 </E>
+ <E ID="234"> 96 105 </E>
+ <E ID="235"> 105 95 </E>
+ <E ID="236"> 105 69 </E>
+ <E ID="237"> 65 106 </E>
+ <E ID="238"> 106 66 </E>
+ <E ID="239"> 106 80 </E>
+ <E ID="240"> 80 107 </E>
+ <E ID="241"> 107 36 </E>
+ <E ID="242"> 108 109 </E>
+ <E ID="243"> 109 22 </E>
+ <E ID="244"> 22 108 </E>
+ <E ID="245"> 24 108 </E>
+ <E ID="246"> 17 109 </E>
+ <E ID="247"> 108 17 </E>
+ <E ID="248"> 65 110 </E>
+ <E ID="249"> 110 106 </E>
+ <E ID="250"> 108 15 </E>
+ <E ID="251"> 58 20 </E>
+ <E ID="252"> 20 100 </E>
+ <E ID="253"> 19 100 </E>
+ <E ID="254"> 19 96 </E>
+ <E ID="255"> 85 87 </E>
+ <E ID="256"> 98 85 </E>
+ <E ID="257"> 98 68 </E>
+ <E ID="258"> 91 101 </E>
+ <E ID="259"> 101 76 </E>
+ <E ID="260"> 101 104 </E>
+ <E ID="261"> 91 104 </E>
+ <E ID="262"> 99 89 </E>
+ <E ID="263"> 99 90 </E>
+ <E ID="264"> 99 93 </E>
+ <E ID="265"> 106 107 </E>
+ <E ID="266"> 110 107 </E>
+ <E ID="267"> 72 111 </E>
+ <E ID="268"> 111 70 </E>
+ <E ID="269"> 110 111 </E>
+ <E ID="270"> 111 107 </E>
+ <E ID="271"> 111 15 </E>
+ <E ID="272"> 111 16 </E>
+ <E ID="273"> 64 112 </E>
+ <E ID="274"> 112 65 </E>
+ <E ID="275"> 112 110 </E>
+ <E ID="276"> 112 111 </E>
+ <E ID="277"> 112 16 </E>
+ <E ID="278"> 111 113 </E>
+ <E ID="279"> 113 107 </E>
+ <E ID="280"> 113 36 </E>
+ <E ID="281"> 72 113 </E>
+ <E ID="282"> 114 95 </E>
+ <E ID="283"> 68 114 </E>
+ <E ID="284"> 114 99 </E>
+ <E ID="285"> 115 34 </E>
+ <E ID="286"> 56 115 </E>
+ <E ID="287"> 115 91 </E>
+ <E ID="288"> 94 115 </E>
+ <E ID="289"> 94 34 </E>
+ <E ID="290"> 21 116 </E>
+ <E ID="291"> 116 117 </E>
+ <E ID="292"> 117 21 </E>
+ <E ID="293"> 117 19 </E>
+ <E ID="294"> 73 118 </E>
+ <E ID="295"> 118 72 </E>
+ <E ID="296"> 113 118 </E>
+ <E ID="297"> 118 36 </E>
+ <E ID="298"> 103 118 </E>
+ <E ID="299"> 104 115 </E>
+ <E ID="300"> 119 88 </E>
+ <E ID="301"> 34 119 </E>
+ <E ID="302"> 94 119 </E>
+ <E ID="303"> 68 119 </E>
+ <E ID="304"> 119 114 </E>
+ <E ID="305"> 119 98 </E>
+ <E ID="306"> 93 119 </E>
+ <E ID="307"> 119 99 </E>
+ <E ID="308"> 1 117 </E>
+ <E ID="309"> 117 2 </E>
+ <E ID="310"> 116 2 </E>
+ <E ID="311"> 1 120 </E>
+ <E ID="312"> 120 117 </E>
+ <E ID="313"> 19 105 </E>
+ <E ID="314"> 121 6 </E>
+ <E ID="315"> 8 121 </E>
+ <E ID="316"> 8 122 </E>
+ <E ID="317"> 122 121 </E>
+ <E ID="318"> 122 46 </E>
+ <E ID="319"> 46 121 </E>
+ <E ID="320"> 67 121 </E>
+ <E ID="321"> 121 48 </E>
+ <E ID="322"> 67 123 </E>
+ <E ID="323"> 123 121 </E>
+ <E ID="324"> 120 124 </E>
+ <E ID="325"> 124 117 </E>
+ <E ID="326"> 19 124 </E>
+ <E ID="327"> 124 105 </E>
+ <E ID="328"> 120 123 </E>
+ <E ID="329"> 123 124 </E>
+ <E ID="330"> 69 123 </E>
+ <E ID="331"> 105 123 </E>
+ <E ID="332"> 120 121 </E>
+ <E ID="333"> 120 6 </E>
+ <E ID="334"> 0 125 </E>
+ <E ID="335"> 125 126 </E>
+ <E ID="336"> 126 1 </E>
+ <E ID="337"> 126 127 </E>
+ <E ID="338"> 127 120 </E>
+ <E ID="339"> 127 128 </E>
+ <E ID="340"> 128 6 </E>
+ <E ID="341"> 128 129 </E>
+ <E ID="342"> 129 7 </E>
+ <E ID="343"> 125 130 </E>
+ <E ID="344"> 130 131 </E>
+ <E ID="345"> 131 126 </E>
+ <E ID="346"> 131 132 </E>
+ <E ID="347"> 132 127 </E>
+ <E ID="348"> 132 133 </E>
+ <E ID="349"> 133 128 </E>
+ <E ID="350"> 133 134 </E>
+ <E ID="351"> 134 129 </E>
+ <E ID="352"> 130 135 </E>
+ <E ID="353"> 135 136 </E>
+ <E ID="354"> 136 131 </E>
+ <E ID="355"> 136 137 </E>
+ <E ID="356"> 137 132 </E>
+ <E ID="357"> 137 138 </E>
+ <E ID="358"> 138 133 </E>
+ <E ID="359"> 138 139 </E>
+ <E ID="360"> 139 134 </E>
+ <E ID="361"> 135 140 </E>
+ <E ID="362"> 140 141 </E>
+ <E ID="363"> 141 136 </E>
+ <E ID="364"> 141 142 </E>
+ <E ID="365"> 142 137 </E>
+ <E ID="366"> 142 143 </E>
+ <E ID="367"> 143 138 </E>
+ <E ID="368"> 143 144 </E>
+ <E ID="369"> 144 139 </E>
+ <E ID="370"> 140 145 </E>
+ <E ID="371"> 145 146 </E>
+ <E ID="372"> 146 141 </E>
+ <E ID="373"> 146 147 </E>
+ <E ID="374"> 147 142 </E>
+ <E ID="375"> 147 148 </E>
+ <E ID="376"> 148 143 </E>
+ <E ID="377"> 148 149 </E>
+ <E ID="378"> 149 144 </E>
+ <E ID="379"> 145 150 </E>
+ <E ID="380"> 150 151 </E>
+ <E ID="381"> 151 146 </E>
+ <E ID="382"> 151 152 </E>
+ <E ID="383"> 152 147 </E>
+ <E ID="384"> 152 153 </E>
+ <E ID="385"> 153 148 </E>
+ <E ID="386"> 153 154 </E>
+ <E ID="387"> 154 149 </E>
+ <E ID="388"> 150 155 </E>
+ <E ID="389"> 155 156 </E>
+ <E ID="390"> 156 151 </E>
+ <E ID="391"> 156 157 </E>
+ <E ID="392"> 157 152 </E>
+ <E ID="393"> 157 158 </E>
+ <E ID="394"> 158 153 </E>
+ <E ID="395"> 158 159 </E>
+ <E ID="396"> 159 154 </E>
+ <E ID="397"> 155 160 </E>
+ <E ID="398"> 160 161 </E>
+ <E ID="399"> 161 156 </E>
+ <E ID="400"> 161 162 </E>
+ <E ID="401"> 162 157 </E>
+ <E ID="402"> 162 163 </E>
+ <E ID="403"> 163 158 </E>
+ <E ID="404"> 163 164 </E>
+ <E ID="405"> 164 159 </E>
+ <E ID="406"> 160 165 </E>
+ <E ID="407"> 165 166 </E>
+ <E ID="408"> 166 161 </E>
+ <E ID="409"> 166 167 </E>
+ <E ID="410"> 167 162 </E>
+ <E ID="411"> 167 168 </E>
+ <E ID="412"> 168 163 </E>
+ <E ID="413"> 168 169 </E>
+ <E ID="414"> 169 164 </E>
+ <E ID="415"> 165 170 </E>
+ <E ID="416"> 170 171 </E>
+ <E ID="417"> 171 166 </E>
+ <E ID="418"> 171 172 </E>
+ <E ID="419"> 172 167 </E>
+ <E ID="420"> 172 173 </E>
+ <E ID="421"> 173 168 </E>
+ <E ID="422"> 173 174 </E>
+ <E ID="423"> 174 169 </E>
+ <E ID="424"> 170 175 </E>
+ <E ID="425"> 175 176 </E>
+ <E ID="426"> 176 171 </E>
+ <E ID="427"> 176 177 </E>
+ <E ID="428"> 177 172 </E>
+ <E ID="429"> 177 178 </E>
+ <E ID="430"> 178 173 </E>
+ <E ID="431"> 178 179 </E>
+ <E ID="432"> 179 174 </E>
+ <E ID="433"> 175 180 </E>
+ <E ID="434"> 180 181 </E>
+ <E ID="435"> 181 176 </E>
+ <E ID="436"> 181 182 </E>
+ <E ID="437"> 182 177 </E>
+ <E ID="438"> 182 183 </E>
+ <E ID="439"> 183 178 </E>
+ <E ID="440"> 183 184 </E>
+ <E ID="441"> 184 179 </E>
+ <E ID="442"> 180 185 </E>
+ <E ID="443"> 185 186 </E>
+ <E ID="444"> 186 181 </E>
+ <E ID="445"> 186 187 </E>
+ <E ID="446"> 187 182 </E>
+ <E ID="447"> 187 188 </E>
+ <E ID="448"> 188 183 </E>
+ <E ID="449"> 188 189 </E>
+ <E ID="450"> 189 184 </E>
+ <E ID="451"> 185 190 </E>
+ <E ID="452"> 190 191 </E>
+ <E ID="453"> 191 186 </E>
+ <E ID="454"> 191 192 </E>
+ <E ID="455"> 192 187 </E>
+ <E ID="456"> 192 193 </E>
+ <E ID="457"> 193 188 </E>
+ <E ID="458"> 193 194 </E>
+ <E ID="459"> 194 189 </E>
+ <E ID="460"> 190 195 </E>
+ <E ID="461"> 195 196 </E>
+ <E ID="462"> 196 191 </E>
+ <E ID="463"> 196 197 </E>
+ <E ID="464"> 197 192 </E>
+ <E ID="465"> 197 198 </E>
+ <E ID="466"> 198 193 </E>
+ <E ID="467"> 198 199 </E>
+ <E ID="468"> 199 194 </E>
+ <E ID="469"> 195 200 </E>
+ <E ID="470"> 200 201 </E>
+ <E ID="471"> 201 196 </E>
+ <E ID="472"> 201 202 </E>
+ <E ID="473"> 202 197 </E>
+ <E ID="474"> 202 203 </E>
+ <E ID="475"> 203 198 </E>
+ <E ID="476"> 203 204 </E>
+ <E ID="477"> 204 199 </E>
+ <E ID="478"> 200 205 </E>
+ <E ID="479"> 205 206 </E>
+ <E ID="480"> 206 201 </E>
+ <E ID="481"> 206 207 </E>
+ <E ID="482"> 207 202 </E>
+ <E ID="483"> 207 208 </E>
+ <E ID="484"> 208 203 </E>
+ <E ID="485"> 208 209 </E>
+ <E ID="486"> 209 204 </E>
+ <E ID="487"> 205 210 </E>
+ <E ID="488"> 210 211 </E>
+ <E ID="489"> 211 206 </E>
+ <E ID="490"> 211 212 </E>
+ <E ID="491"> 212 207 </E>
+ <E ID="492"> 212 213 </E>
+ <E ID="493"> 213 208 </E>
+ <E ID="494"> 213 214 </E>
+ <E ID="495"> 214 209 </E>
+ <E ID="496"> 210 215 </E>
+ <E ID="497"> 215 216 </E>
+ <E ID="498"> 216 211 </E>
+ <E ID="499"> 216 217 </E>
+ <E ID="500"> 217 212 </E>
+ <E ID="501"> 217 218 </E>
+ <E ID="502"> 218 213 </E>
+ <E ID="503"> 218 219 </E>
+ <E ID="504"> 219 214 </E>
+ <E ID="505"> 215 220 </E>
+ <E ID="506"> 220 221 </E>
+ <E ID="507"> 221 216 </E>
+ <E ID="508"> 221 222 </E>
+ <E ID="509"> 222 217 </E>
+ <E ID="510"> 222 223 </E>
+ <E ID="511"> 223 218 </E>
+ <E ID="512"> 223 224 </E>
+ <E ID="513"> 224 219 </E>
+ <E ID="514"> 220 225 </E>
+ <E ID="515"> 225 226 </E>
+ <E ID="516"> 226 221 </E>
+ <E ID="517"> 226 227 </E>
+ <E ID="518"> 227 222 </E>
+ <E ID="519"> 227 228 </E>
+ <E ID="520"> 228 223 </E>
+ <E ID="521"> 228 229 </E>
+ <E ID="522"> 229 224 </E>
+ <E ID="523"> 225 230 </E>
+ <E ID="524"> 230 231 </E>
+ <E ID="525"> 231 226 </E>
+ <E ID="526"> 231 232 </E>
+ <E ID="527"> 232 227 </E>
+ <E ID="528"> 232 233 </E>
+ <E ID="529"> 233 228 </E>
+ <E ID="530"> 233 234 </E>
+ <E ID="531"> 234 229 </E>
+ <E ID="532"> 230 235 </E>
+ <E ID="533"> 235 236 </E>
+ <E ID="534"> 236 231 </E>
+ <E ID="535"> 236 237 </E>
+ <E ID="536"> 237 232 </E>
+ <E ID="537"> 237 238 </E>
+ <E ID="538"> 238 233 </E>
+ <E ID="539"> 238 239 </E>
+ <E ID="540"> 239 234 </E>
+ <E ID="541"> 235 240 </E>
+ <E ID="542"> 240 241 </E>
+ <E ID="543"> 241 236 </E>
+ <E ID="544"> 241 242 </E>
+ <E ID="545"> 242 237 </E>
+ <E ID="546"> 242 243 </E>
+ <E ID="547"> 243 238 </E>
+ <E ID="548"> 243 244 </E>
+ <E ID="549"> 244 239 </E>
+ <E ID="550"> 240 245 </E>
+ <E ID="551"> 245 246 </E>
+ <E ID="552"> 246 241 </E>
+ <E ID="553"> 246 247 </E>
+ <E ID="554"> 247 242 </E>
+ <E ID="555"> 247 248 </E>
+ <E ID="556"> 248 243 </E>
+ <E ID="557"> 248 249 </E>
+ <E ID="558"> 249 244 </E>
+ <E ID="559"> 245 250 </E>
+ <E ID="560"> 250 251 </E>
+ <E ID="561"> 251 246 </E>
+ <E ID="562"> 251 252 </E>
+ <E ID="563"> 252 247 </E>
+ <E ID="564"> 252 253 </E>
+ <E ID="565"> 253 248 </E>
+ <E ID="566"> 253 254 </E>
+ <E ID="567"> 254 249 </E>
+ <E ID="568"> 250 255 </E>
+ <E ID="569"> 255 256 </E>
+ <E ID="570"> 256 251 </E>
+ <E ID="571"> 256 257 </E>
+ <E ID="572"> 257 252 </E>
+ <E ID="573"> 257 258 </E>
+ <E ID="574"> 258 253 </E>
+ <E ID="575"> 258 259 </E>
+ <E ID="576"> 259 254 </E>
+ <E ID="577"> 255 260 </E>
+ <E ID="578"> 260 261 </E>
+ <E ID="579"> 261 256 </E>
+ <E ID="580"> 261 262 </E>
+ <E ID="581"> 262 257 </E>
+ <E ID="582"> 262 263 </E>
+ <E ID="583"> 263 258 </E>
+ <E ID="584"> 263 264 </E>
+ <E ID="585"> 264 259 </E>
+ <E ID="586"> 260 265 </E>
+ <E ID="587"> 265 266 </E>
+ <E ID="588"> 266 261 </E>
+ <E ID="589"> 266 267 </E>
+ <E ID="590"> 267 262 </E>
+ <E ID="591"> 267 268 </E>
+ <E ID="592"> 268 263 </E>
+ <E ID="593"> 268 269 </E>
+ <E ID="594"> 269 264 </E>
+ <E ID="595"> 265 270 </E>
+ <E ID="596"> 270 271 </E>
+ <E ID="597"> 271 266 </E>
+ <E ID="598"> 271 272 </E>
+ <E ID="599"> 272 267 </E>
+ <E ID="600"> 272 273 </E>
+ <E ID="601"> 273 268 </E>
+ <E ID="602"> 273 274 </E>
+ <E ID="603"> 274 269 </E>
+ <E ID="604"> 270 275 </E>
+ <E ID="605"> 275 276 </E>
+ <E ID="606"> 276 271 </E>
+ <E ID="607"> 276 277 </E>
+ <E ID="608"> 277 272 </E>
+ <E ID="609"> 277 278 </E>
+ <E ID="610"> 278 273 </E>
+ <E ID="611"> 278 279 </E>
+ <E ID="612"> 279 274 </E>
+ <E ID="613"> 275 280 </E>
+ <E ID="614"> 280 281 </E>
+ <E ID="615"> 281 276 </E>
+ <E ID="616"> 281 282 </E>
+ <E ID="617"> 282 277 </E>
+ <E ID="618"> 282 283 </E>
+ <E ID="619"> 283 278 </E>
+ <E ID="620"> 283 284 </E>
+ <E ID="621"> 284 279 </E>
+ <E ID="622"> 280 285 </E>
+ <E ID="623"> 285 286 </E>
+ <E ID="624"> 286 281 </E>
+ <E ID="625"> 286 287 </E>
+ <E ID="626"> 287 282 </E>
+ <E ID="627"> 287 288 </E>
+ <E ID="628"> 288 283 </E>
+ <E ID="629"> 288 289 </E>
+ <E ID="630"> 289 284 </E>
+ <E ID="631"> 285 290 </E>
+ <E ID="632"> 290 291 </E>
+ <E ID="633"> 291 286 </E>
+ <E ID="634"> 291 292 </E>
+ <E ID="635"> 292 287 </E>
+ <E ID="636"> 292 293 </E>
+ <E ID="637"> 293 288 </E>
+ <E ID="638"> 293 294 </E>
+ <E ID="639"> 294 289 </E>
+ <E ID="640"> 290 295 </E>
+ <E ID="641"> 295 296 </E>
+ <E ID="642"> 296 291 </E>
+ <E ID="643"> 296 297 </E>
+ <E ID="644"> 297 292 </E>
+ <E ID="645"> 297 298 </E>
+ <E ID="646"> 298 293 </E>
+ <E ID="647"> 298 299 </E>
+ <E ID="648"> 299 294 </E>
+ <E ID="649"> 295 300 </E>
+ <E ID="650"> 300 301 </E>
+ <E ID="651"> 301 296 </E>
+ <E ID="652"> 301 302 </E>
+ <E ID="653"> 302 297 </E>
+ <E ID="654"> 302 303 </E>
+ <E ID="655"> 303 298 </E>
+ <E ID="656"> 303 304 </E>
+ <E ID="657"> 304 299 </E>
+ <E ID="658"> 300 305 </E>
+ <E ID="659"> 305 306 </E>
+ <E ID="660"> 306 301 </E>
+ <E ID="661"> 306 307 </E>
+ <E ID="662"> 307 302 </E>
+ <E ID="663"> 307 308 </E>
+ <E ID="664"> 308 303 </E>
+ <E ID="665"> 308 309 </E>
+ <E ID="666"> 309 304 </E>
+ <E ID="667"> 305 310 </E>
+ <E ID="668"> 310 311 </E>
+ <E ID="669"> 311 306 </E>
+ <E ID="670"> 311 312 </E>
+ <E ID="671"> 312 307 </E>
+ <E ID="672"> 312 313 </E>
+ <E ID="673"> 313 308 </E>
+ <E ID="674"> 313 314 </E>
+ <E ID="675"> 314 309 </E>
+ <E ID="676"> 310 315 </E>
+ <E ID="677"> 315 316 </E>
+ <E ID="678"> 316 311 </E>
+ <E ID="679"> 316 317 </E>
+ <E ID="680"> 317 312 </E>
+ <E ID="681"> 317 318 </E>
+ <E ID="682"> 318 313 </E>
+ <E ID="683"> 318 319 </E>
+ <E ID="684"> 319 314 </E>
+ <E ID="685"> 315 320 </E>
+ <E ID="686"> 320 321 </E>
+ <E ID="687"> 321 316 </E>
+ <E ID="688"> 321 322 </E>
+ <E ID="689"> 322 317 </E>
+ <E ID="690"> 322 323 </E>
+ <E ID="691"> 323 318 </E>
+ <E ID="692"> 323 324 </E>
+ <E ID="693"> 324 319 </E>
+ <E ID="694"> 320 325 </E>
+ <E ID="695"> 325 326 </E>
+ <E ID="696"> 326 321 </E>
+ <E ID="697"> 326 327 </E>
+ <E ID="698"> 327 322 </E>
+ <E ID="699"> 327 328 </E>
+ <E ID="700"> 328 323 </E>
+ <E ID="701"> 328 329 </E>
+ <E ID="702"> 329 324 </E>
+ <E ID="703"> 325 330 </E>
+ <E ID="704"> 330 331 </E>
+ <E ID="705"> 331 326 </E>
+ <E ID="706"> 331 332 </E>
+ <E ID="707"> 332 327 </E>
+ <E ID="708"> 332 333 </E>
+ <E ID="709"> 333 328 </E>
+ <E ID="710"> 333 334 </E>
+ <E ID="711"> 334 329 </E>
+ <E ID="712"> 330 335 </E>
+ <E ID="713"> 335 336 </E>
+ <E ID="714"> 336 331 </E>
+ <E ID="715"> 336 337 </E>
+ <E ID="716"> 337 332 </E>
+ <E ID="717"> 337 338 </E>
+ <E ID="718"> 338 333 </E>
+ <E ID="719"> 338 339 </E>
+ <E ID="720"> 339 334 </E>
+ <E ID="721"> 335 340 </E>
+ <E ID="722"> 340 341 </E>
+ <E ID="723"> 341 336 </E>
+ <E ID="724"> 341 342 </E>
+ <E ID="725"> 342 337 </E>
+ <E ID="726"> 342 343 </E>
+ <E ID="727"> 343 338 </E>
+ <E ID="728"> 343 344 </E>
+ <E ID="729"> 344 339 </E>
+ <E ID="730"> 11 345 </E>
+ <E ID="731"> 345 346 </E>
+ <E ID="732"> 346 9 </E>
+ <E ID="733"> 346 347 </E>
+ <E ID="734"> 347 75 </E>
+ <E ID="735"> 347 348 </E>
+ <E ID="736"> 348 5 </E>
+ <E ID="737"> 348 349 </E>
+ <E ID="738"> 349 3 </E>
+ <E ID="739"> 345 350 </E>
+ <E ID="740"> 350 351 </E>
+ <E ID="741"> 351 346 </E>
+ <E ID="742"> 351 352 </E>
+ <E ID="743"> 352 347 </E>
+ <E ID="744"> 352 353 </E>
+ <E ID="745"> 353 348 </E>
+ <E ID="746"> 353 354 </E>
+ <E ID="747"> 354 349 </E>
+ <E ID="748"> 350 355 </E>
+ <E ID="749"> 355 356 </E>
+ <E ID="750"> 356 351 </E>
+ <E ID="751"> 356 357 </E>
+ <E ID="752"> 357 352 </E>
+ <E ID="753"> 357 358 </E>
+ <E ID="754"> 358 353 </E>
+ <E ID="755"> 358 359 </E>
+ <E ID="756"> 359 354 </E>
+ <E ID="757"> 355 360 </E>
+ <E ID="758"> 360 361 </E>
+ <E ID="759"> 361 356 </E>
+ <E ID="760"> 361 362 </E>
+ <E ID="761"> 362 357 </E>
+ <E ID="762"> 362 363 </E>
+ <E ID="763"> 363 358 </E>
+ <E ID="764"> 363 364 </E>
+ <E ID="765"> 364 359 </E>
+ <E ID="766"> 360 365 </E>
+ <E ID="767"> 365 366 </E>
+ <E ID="768"> 366 361 </E>
+ <E ID="769"> 366 367 </E>
+ <E ID="770"> 367 362 </E>
+ <E ID="771"> 367 368 </E>
+ <E ID="772"> 368 363 </E>
+ <E ID="773"> 368 369 </E>
+ <E ID="774"> 369 364 </E>
+ <E ID="775"> 365 370 </E>
+ <E ID="776"> 370 371 </E>
+ <E ID="777"> 371 366 </E>
+ <E ID="778"> 371 372 </E>
+ <E ID="779"> 372 367 </E>
+ <E ID="780"> 372 373 </E>
+ <E ID="781"> 373 368 </E>
+ <E ID="782"> 373 374 </E>
+ <E ID="783"> 374 369 </E>
+ <E ID="784"> 370 375 </E>
+ <E ID="785"> 375 376 </E>
+ <E ID="786"> 376 371 </E>
+ <E ID="787"> 376 377 </E>
+ <E ID="788"> 377 372 </E>
+ <E ID="789"> 377 378 </E>
+ <E ID="790"> 378 373 </E>
+ <E ID="791"> 378 379 </E>
+ <E ID="792"> 379 374 </E>
+ <E ID="793"> 375 380 </E>
+ <E ID="794"> 380 381 </E>
+ <E ID="795"> 381 376 </E>
+ <E ID="796"> 381 382 </E>
+ <E ID="797"> 382 377 </E>
+ <E ID="798"> 382 383 </E>
+ <E ID="799"> 383 378 </E>
+ <E ID="800"> 383 384 </E>
+ <E ID="801"> 384 379 </E>
+ <E ID="802"> 380 385 </E>
+ <E ID="803"> 385 386 </E>
+ <E ID="804"> 386 381 </E>
+ <E ID="805"> 386 387 </E>
+ <E ID="806"> 387 382 </E>
+ <E ID="807"> 387 388 </E>
+ <E ID="808"> 388 383 </E>
+ <E ID="809"> 388 389 </E>
+ <E ID="810"> 389 384 </E>
+ <E ID="811"> 385 390 </E>
+ <E ID="812"> 390 391 </E>
+ <E ID="813"> 391 386 </E>
+ <E ID="814"> 391 392 </E>
+ <E ID="815"> 392 387 </E>
+ <E ID="816"> 392 393 </E>
+ <E ID="817"> 393 388 </E>
+ <E ID="818"> 393 394 </E>
+ <E ID="819"> 394 389 </E>
+ <E ID="820"> 390 395 </E>
+ <E ID="821"> 395 396 </E>
+ <E ID="822"> 396 391 </E>
+ <E ID="823"> 396 397 </E>
+ <E ID="824"> 397 392 </E>
+ <E ID="825"> 397 398 </E>
+ <E ID="826"> 398 393 </E>
+ <E ID="827"> 398 399 </E>
+ <E ID="828"> 399 394 </E>
+ </EDGE>
+ <ELEMENT>
+ <T ID="0"> 0 1 2 </T>
+ <T ID="1"> 3 4 5 </T>
+ <T ID="2"> 6 7 8 </T>
+ <T ID="3"> 9 10 11 </T>
+ <T ID="4"> 12 13 14 </T>
+ <T ID="5"> 15 16 17 </T>
+ <T ID="6"> 14 18 19 </T>
+ <T ID="7"> 20 21 22 </T>
+ <T ID="8"> 23 24 25 </T>
+ <T ID="9"> 26 27 28 </T>
+ <T ID="10"> 29 26 30 </T>
+ <T ID="11"> 31 32 33 </T>
+ <T ID="12"> 32 34 24 </T>
+ <T ID="13"> 35 36 37 </T>
+ <T ID="14"> 38 39 40 </T>
+ <T ID="15"> 12 41 42 </T>
+ <T ID="16"> 43 37 44 </T>
+ <T ID="17"> 45 31 46 </T>
+ <T ID="18"> 47 48 49 </T>
+ <T ID="19"> 36 50 51 </T>
+ <T ID="20"> 50 19 52 </T>
+ <T ID="21"> 53 13 54 </T>
+ <T ID="22"> 55 53 56 </T>
+ <T ID="23"> 57 49 58 </T>
+ <T ID="24"> 59 60 61 </T>
+ <T ID="25"> 62 41 63 </T>
+ <T ID="26"> 35 59 63 </T>
+ <T ID="27"> 64 62 61 </T>
+ <T ID="28"> 65 66 67 </T>
+ <T ID="29"> 68 69 70 </T>
+ <T ID="30"> 71 72 73 </T>
+ <T ID="31"> 64 74 75 </T>
+ <T ID="32"> 76 71 77 </T>
+ <T ID="33"> 67 78 79 </T>
+ <T ID="34"> 55 80 81 </T>
+ <T ID="35"> 82 39 42 </T>
+ <T ID="36"> 83 82 84 </T>
+ <T ID="37"> 84 75 85 </T>
+ <T ID="38"> 86 87 88 </T>
+ <T ID="39"> 89 90 91 </T>
+ <T ID="40"> 92 91 88 </T>
+ <T ID="41"> 93 94 95 </T>
+ <T ID="42"> 77 96 97 </T>
+ <T ID="43"> 98 99 100 </T>
+ <T ID="44"> 101 102 100 </T>
+ <T ID="45"> 103 104 105 </T>
+ <T ID="46"> 106 18 81 </T>
+ <T ID="47"> 48 106 107 </T>
+ <T ID="48"> 108 109 110 </T>
+ <T ID="49"> 111 109 112 </T>
+ <T ID="50"> 112 113 114 </T>
+ <T ID="51"> 115 116 9 </T>
+ <T ID="52"> 117 115 118 </T>
+ <T ID="53"> 102 119 79 </T>
+ <T ID="54"> 120 47 65 </T>
+ <T ID="55"> 66 121 4 </T>
+ <T ID="56"> 122 123 124 </T>
+ <T ID="57"> 123 34 125 </T>
+ <T ID="58"> 30 56 126 </T>
+ <T ID="59"> 127 126 128 </T>
+ <T ID="60"> 38 129 54 </T>
+ <T ID="61"> 128 130 94 </T>
+ <T ID="62"> 130 129 131 </T>
+ <T ID="63"> 132 121 133 </T>
+ <T ID="64"> 133 57 117 </T>
+ <T ID="65"> 134 135 136 </T>
+ <T ID="66"> 52 137 138 </T>
+ <T ID="67"> 119 139 140 </T>
+ <T ID="68"> 137 120 140 </T>
+ <T ID="69"> 139 141 138 </T>
+ <T ID="70"> 107 142 143 </T>
+ <T ID="71"> 144 145 146 </T>
+ <T ID="72"> 147 44 148 </T>
+ <T ID="73"> 149 150 151 </T>
+ <T ID="74"> 152 153 154 </T>
+ <T ID="75"> 155 69 154 </T>
+ <T ID="76"> 156 157 158 </T>
+ <T ID="77"> 159 160 161 </T>
+ <T ID="78"> 162 97 163 </T>
+ <T ID="79"> 46 159 163 </T>
+ <T ID="80"> 89 162 161 </T>
+ <T ID="81"> 164 165 166 </T>
+ <T ID="82"> 131 167 168 </T>
+ <T ID="83"> 169 149 170 </T>
+ <T ID="84"> 171 172 173 </T>
+ <T ID="85"> 45 174 175 </T>
+ <T ID="86"> 72 169 176 </T>
+ <T ID="87"> 176 177 171 </T>
+ <T ID="88"> 172 178 179 </T>
+ <T ID="89"> 180 179 181 </T>
+ <T ID="90"> 153 164 182 </T>
+ <T ID="91"> 125 175 183 </T>
+ <T ID="92"> 183 184 108 </T>
+ <T ID="93"> 28 146 185 </T>
+ <T ID="94"> 185 142 80 </T>
+ <T ID="95"> 167 40 186 </T>
+ <T ID="96"> 187 157 155 </T>
+ <T ID="97"> 145 116 188 </T>
+ <T ID="98"> 143 188 58 </T>
+ <T ID="99"> 189 151 190 </T>
+ <T ID="100"> 191 104 192 </T>
+ <T ID="101"> 193 150 76 </T>
+ <T ID="102"> 194 195 196 </T>
+ <T ID="103"> 193 92 194 </T>
+ <T ID="104"> 190 196 197 </T>
+ <T ID="105"> 198 60 199 </T>
+ <T ID="106"> 85 200 201 </T>
+ <T ID="107"> 202 74 198 </T>
+ <T ID="108"> 203 114 204 </T>
+ <T ID="109"> 205 135 113 </T>
+ <T ID="110"> 206 205 207 </T>
+ <T ID="111"> 208 96 207 </T>
+ <T ID="112"> 174 208 184 </T>
+ <T ID="113"> 166 95 209 </T>
+ <T ID="114"> 210 209 168 </T>
+ <T ID="115"> 210 211 212 </T>
+ <T ID="116"> 51 213 148 </T>
+ <T ID="117"> 213 141 214 </T>
+ <T ID="118"> 215 103 158 </T>
+ <T ID="119"> 189 216 217 </T>
+ <T ID="120"> 218 87 219 </T>
+ <T ID="121"> 195 218 220 </T>
+ <T ID="122"> 206 221 222 </T>
+ <T ID="123"> 221 73 223 </T>
+ <T ID="124"> 204 224 225 </T>
+ <T ID="125"> 200 226 227 </T>
+ <T ID="126"> 224 134 227 </T>
+ <T ID="127"> 226 202 225 </T>
+ <T ID="128"> 228 43 229 </T>
+ <T ID="129"> 230 203 231 </T>
+ <T ID="130"> 199 228 231 </T>
+ <T ID="131"> 232 201 233 </T>
+ <T ID="132"> 197 234 235 </T>
+ <T ID="133"> 236 191 235 </T>
+ <T ID="134"> 101 237 238 </T>
+ <T ID="135"> 239 214 238 </T>
+ <T ID="136"> 147 240 241 </T>
+ <T ID="137"> 242 243 244 </T>
+ <T ID="138"> 25 245 244 </T>
+ <T ID="139"> 246 242 247 </T>
+ <T ID="140"> 248 249 237 </T>
+ <T ID="141"> 17 247 250 </T>
+ <T ID="142"> 250 245 122 </T>
+ <T ID="143"> 219 251 252 </T>
+ <T ID="144"> 20 253 252 </T>
+ <T ID="145"> 253 254 220 </T>
+ <T ID="146"> 255 212 256 </T>
+ <T ID="147"> 257 215 256 </T>
+ <T ID="148"> 182 255 187 </T>
+ <T ID="149"> 173 258 223 </T>
+ <T ID="150"> 136 222 259 </T>
+ <T ID="151"> 259 260 233 </T>
+ <T ID="152"> 260 258 261 </T>
+ <T ID="153"> 217 262 170 </T>
+ <T ID="154"> 262 263 177 </T>
+ <T ID="155"> 178 263 264 </T>
+ <T ID="156"> 240 239 265 </T>
+ <T ID="157"> 266 265 249 </T>
+ <T ID="158"> 267 268 110 </T>
+ <T ID="159"> 269 270 266 </T>
+ <T ID="160"> 271 124 268 </T>
+ <T ID="161"> 15 271 272 </T>
+ <T ID="162"> 273 274 99 </T>
+ <T ID="163"> 248 274 275 </T>
+ <T ID="164"> 275 276 269 </T>
+ <T ID="165"> 276 277 272 </T>
+ <T ID="166"> 270 278 279 </T>
+ <T ID="167"> 280 241 279 </T>
+ <T ID="168"> 278 267 281 </T>
+ <T ID="169"> 282 192 283 </T>
+ <T ID="170"> 216 282 284 </T>
+ <T ID="171"> 285 83 286 </T>
+ <T ID="172"> 287 180 288 </T>
+ <T ID="173"> 289 285 288 </T>
+ <T ID="174"> 290 291 292 </T>
+ <T ID="175"> 293 22 292 </T>
+ <T ID="176"> 111 294 295 </T>
+ <T ID="177"> 280 296 297 </T>
+ <T ID="178"> 296 281 295 </T>
+ <T ID="179"> 294 230 298 </T>
+ <T ID="180"> 297 298 229 </T>
+ <T ID="181"> 286 232 299 </T>
+ <T ID="182"> 287 299 261 </T>
+ <T ID="183"> 300 186 301 </T>
+ <T ID="184"> 302 301 289 </T>
+ <T ID="185"> 303 304 283 </T>
+ <T ID="186"> 300 305 211 </T>
+ <T ID="187"> 303 257 305 </T>
+ <T ID="188"> 181 306 302 </T>
+ <T ID="189"> 284 304 307 </T>
+ <T ID="190"> 306 264 307 </T>
+ <T ID="191"> 1 308 309 </T>
+ <T ID="192"> 291 310 309 </T>
+ <T ID="193"> 311 312 308 </T>
+ <T ID="194"> 313 234 254 </T>
+ <T ID="195"> 314 8 315 </T>
+ <T ID="196"> 316 317 315 </T>
+ <T ID="197"> 317 318 319 </T>
+ <T ID="198"> 320 321 156 </T>
+ <T ID="199"> 321 319 70 </T>
+ <T ID="200"> 320 322 323 </T>
+ <T ID="201"> 312 324 325 </T>
+ <T ID="202"> 313 326 327 </T>
+ <T ID="203"> 326 293 325 </T>
+ <T ID="204"> 324 328 329 </T>
+ <T ID="205"> 322 105 330 </T>
+ <T ID="206"> 331 330 236 </T>
+ <T ID="207"> 329 331 327 </T>
+ <T ID="208"> 323 328 332 </T>
+ <T ID="209"> 333 314 332 </T>
+ <Q ID="210"> 334 335 336 0 </Q>
+ <Q ID="211"> 336 337 338 311 </Q>
+ <Q ID="212"> 338 339 340 333 </Q>
+ <Q ID="213"> 340 341 342 6 </Q>
+ <Q ID="214"> 343 344 345 335 </Q>
+ <Q ID="215"> 345 346 347 337 </Q>
+ <Q ID="216"> 347 348 349 339 </Q>
+ <Q ID="217"> 349 350 351 341 </Q>
+ <Q ID="218"> 352 353 354 344 </Q>
+ <Q ID="219"> 354 355 356 346 </Q>
+ <Q ID="220"> 356 357 358 348 </Q>
+ <Q ID="221"> 358 359 360 350 </Q>
+ <Q ID="222"> 361 362 363 353 </Q>
+ <Q ID="223"> 363 364 365 355 </Q>
+ <Q ID="224"> 365 366 367 357 </Q>
+ <Q ID="225"> 367 368 369 359 </Q>
+ <Q ID="226"> 370 371 372 362 </Q>
+ <Q ID="227"> 372 373 374 364 </Q>
+ <Q ID="228"> 374 375 376 366 </Q>
+ <Q ID="229"> 376 377 378 368 </Q>
+ <Q ID="230"> 379 380 381 371 </Q>
+ <Q ID="231"> 381 382 383 373 </Q>
+ <Q ID="232"> 383 384 385 375 </Q>
+ <Q ID="233"> 385 386 387 377 </Q>
+ <Q ID="234"> 388 389 390 380 </Q>
+ <Q ID="235"> 390 391 392 382 </Q>
+ <Q ID="236"> 392 393 394 384 </Q>
+ <Q ID="237"> 394 395 396 386 </Q>
+ <Q ID="238"> 397 398 399 389 </Q>
+ <Q ID="239"> 399 400 401 391 </Q>
+ <Q ID="240"> 401 402 403 393 </Q>
+ <Q ID="241"> 403 404 405 395 </Q>
+ <Q ID="242"> 406 407 408 398 </Q>
+ <Q ID="243"> 408 409 410 400 </Q>
+ <Q ID="244"> 410 411 412 402 </Q>
+ <Q ID="245"> 412 413 414 404 </Q>
+ <Q ID="246"> 415 416 417 407 </Q>
+ <Q ID="247"> 417 418 419 409 </Q>
+ <Q ID="248"> 419 420 421 411 </Q>
+ <Q ID="249"> 421 422 423 413 </Q>
+ <Q ID="250"> 424 425 426 416 </Q>
+ <Q ID="251"> 426 427 428 418 </Q>
+ <Q ID="252"> 428 429 430 420 </Q>
+ <Q ID="253"> 430 431 432 422 </Q>
+ <Q ID="254"> 433 434 435 425 </Q>
+ <Q ID="255"> 435 436 437 427 </Q>
+ <Q ID="256"> 437 438 439 429 </Q>
+ <Q ID="257"> 439 440 441 431 </Q>
+ <Q ID="258"> 442 443 444 434 </Q>
+ <Q ID="259"> 444 445 446 436 </Q>
+ <Q ID="260"> 446 447 448 438 </Q>
+ <Q ID="261"> 448 449 450 440 </Q>
+ <Q ID="262"> 451 452 453 443 </Q>
+ <Q ID="263"> 453 454 455 445 </Q>
+ <Q ID="264"> 455 456 457 447 </Q>
+ <Q ID="265"> 457 458 459 449 </Q>
+ <Q ID="266"> 460 461 462 452 </Q>
+ <Q ID="267"> 462 463 464 454 </Q>
+ <Q ID="268"> 464 465 466 456 </Q>
+ <Q ID="269"> 466 467 468 458 </Q>
+ <Q ID="270"> 469 470 471 461 </Q>
+ <Q ID="271"> 471 472 473 463 </Q>
+ <Q ID="272"> 473 474 475 465 </Q>
+ <Q ID="273"> 475 476 477 467 </Q>
+ <Q ID="274"> 478 479 480 470 </Q>
+ <Q ID="275"> 480 481 482 472 </Q>
+ <Q ID="276"> 482 483 484 474 </Q>
+ <Q ID="277"> 484 485 486 476 </Q>
+ <Q ID="278"> 487 488 489 479 </Q>
+ <Q ID="279"> 489 490 491 481 </Q>
+ <Q ID="280"> 491 492 493 483 </Q>
+ <Q ID="281"> 493 494 495 485 </Q>
+ <Q ID="282"> 496 497 498 488 </Q>
+ <Q ID="283"> 498 499 500 490 </Q>
+ <Q ID="284"> 500 501 502 492 </Q>
+ <Q ID="285"> 502 503 504 494 </Q>
+ <Q ID="286"> 505 506 507 497 </Q>
+ <Q ID="287"> 507 508 509 499 </Q>
+ <Q ID="288"> 509 510 511 501 </Q>
+ <Q ID="289"> 511 512 513 503 </Q>
+ <Q ID="290"> 514 515 516 506 </Q>
+ <Q ID="291"> 516 517 518 508 </Q>
+ <Q ID="292"> 518 519 520 510 </Q>
+ <Q ID="293"> 520 521 522 512 </Q>
+ <Q ID="294"> 523 524 525 515 </Q>
+ <Q ID="295"> 525 526 527 517 </Q>
+ <Q ID="296"> 527 528 529 519 </Q>
+ <Q ID="297"> 529 530 531 521 </Q>
+ <Q ID="298"> 532 533 534 524 </Q>
+ <Q ID="299"> 534 535 536 526 </Q>
+ <Q ID="300"> 536 537 538 528 </Q>
+ <Q ID="301"> 538 539 540 530 </Q>
+ <Q ID="302"> 541 542 543 533 </Q>
+ <Q ID="303"> 543 544 545 535 </Q>
+ <Q ID="304"> 545 546 547 537 </Q>
+ <Q ID="305"> 547 548 549 539 </Q>
+ <Q ID="306"> 550 551 552 542 </Q>
+ <Q ID="307"> 552 553 554 544 </Q>
+ <Q ID="308"> 554 555 556 546 </Q>
+ <Q ID="309"> 556 557 558 548 </Q>
+ <Q ID="310"> 559 560 561 551 </Q>
+ <Q ID="311"> 561 562 563 553 </Q>
+ <Q ID="312"> 563 564 565 555 </Q>
+ <Q ID="313"> 565 566 567 557 </Q>
+ <Q ID="314"> 568 569 570 560 </Q>
+ <Q ID="315"> 570 571 572 562 </Q>
+ <Q ID="316"> 572 573 574 564 </Q>
+ <Q ID="317"> 574 575 576 566 </Q>
+ <Q ID="318"> 577 578 579 569 </Q>
+ <Q ID="319"> 579 580 581 571 </Q>
+ <Q ID="320"> 581 582 583 573 </Q>
+ <Q ID="321"> 583 584 585 575 </Q>
+ <Q ID="322"> 586 587 588 578 </Q>
+ <Q ID="323"> 588 589 590 580 </Q>
+ <Q ID="324"> 590 591 592 582 </Q>
+ <Q ID="325"> 592 593 594 584 </Q>
+ <Q ID="326"> 595 596 597 587 </Q>
+ <Q ID="327"> 597 598 599 589 </Q>
+ <Q ID="328"> 599 600 601 591 </Q>
+ <Q ID="329"> 601 602 603 593 </Q>
+ <Q ID="330"> 604 605 606 596 </Q>
+ <Q ID="331"> 606 607 608 598 </Q>
+ <Q ID="332"> 608 609 610 600 </Q>
+ <Q ID="333"> 610 611 612 602 </Q>
+ <Q ID="334"> 613 614 615 605 </Q>
+ <Q ID="335"> 615 616 617 607 </Q>
+ <Q ID="336"> 617 618 619 609 </Q>
+ <Q ID="337"> 619 620 621 611 </Q>
+ <Q ID="338"> 622 623 624 614 </Q>
+ <Q ID="339"> 624 625 626 616 </Q>
+ <Q ID="340"> 626 627 628 618 </Q>
+ <Q ID="341"> 628 629 630 620 </Q>
+ <Q ID="342"> 631 632 633 623 </Q>
+ <Q ID="343"> 633 634 635 625 </Q>
+ <Q ID="344"> 635 636 637 627 </Q>
+ <Q ID="345"> 637 638 639 629 </Q>
+ <Q ID="346"> 640 641 642 632 </Q>
+ <Q ID="347"> 642 643 644 634 </Q>
+ <Q ID="348"> 644 645 646 636 </Q>
+ <Q ID="349"> 646 647 648 638 </Q>
+ <Q ID="350"> 649 650 651 641 </Q>
+ <Q ID="351"> 651 652 653 643 </Q>
+ <Q ID="352"> 653 654 655 645 </Q>
+ <Q ID="353"> 655 656 657 647 </Q>
+ <Q ID="354"> 658 659 660 650 </Q>
+ <Q ID="355"> 660 661 662 652 </Q>
+ <Q ID="356"> 662 663 664 654 </Q>
+ <Q ID="357"> 664 665 666 656 </Q>
+ <Q ID="358"> 667 668 669 659 </Q>
+ <Q ID="359"> 669 670 671 661 </Q>
+ <Q ID="360"> 671 672 673 663 </Q>
+ <Q ID="361"> 673 674 675 665 </Q>
+ <Q ID="362"> 676 677 678 668 </Q>
+ <Q ID="363"> 678 679 680 670 </Q>
+ <Q ID="364"> 680 681 682 672 </Q>
+ <Q ID="365"> 682 683 684 674 </Q>
+ <Q ID="366"> 685 686 687 677 </Q>
+ <Q ID="367"> 687 688 689 679 </Q>
+ <Q ID="368"> 689 690 691 681 </Q>
+ <Q ID="369"> 691 692 693 683 </Q>
+ <Q ID="370"> 694 695 696 686 </Q>
+ <Q ID="371"> 696 697 698 688 </Q>
+ <Q ID="372"> 698 699 700 690 </Q>
+ <Q ID="373"> 700 701 702 692 </Q>
+ <Q ID="374"> 703 704 705 695 </Q>
+ <Q ID="375"> 705 706 707 697 </Q>
+ <Q ID="376"> 707 708 709 699 </Q>
+ <Q ID="377"> 709 710 711 701 </Q>
+ <Q ID="378"> 712 713 714 704 </Q>
+ <Q ID="379"> 714 715 716 706 </Q>
+ <Q ID="380"> 716 717 718 708 </Q>
+ <Q ID="381"> 718 719 720 710 </Q>
+ <Q ID="382"> 721 722 723 713 </Q>
+ <Q ID="383"> 723 724 725 715 </Q>
+ <Q ID="384"> 725 726 727 717 </Q>
+ <Q ID="385"> 727 728 729 719 </Q>
+ <Q ID="386"> 730 731 732 11 </Q>
+ <Q ID="387"> 732 733 734 118 </Q>
+ <Q ID="388"> 734 735 736 132 </Q>
+ <Q ID="389"> 736 737 738 5 </Q>
+ <Q ID="390"> 739 740 741 731 </Q>
+ <Q ID="391"> 741 742 743 733 </Q>
+ <Q ID="392"> 743 744 745 735 </Q>
+ <Q ID="393"> 745 746 747 737 </Q>
+ <Q ID="394"> 748 749 750 740 </Q>
+ <Q ID="395"> 750 751 752 742 </Q>
+ <Q ID="396"> 752 753 754 744 </Q>
+ <Q ID="397"> 754 755 756 746 </Q>
+ <Q ID="398"> 757 758 759 749 </Q>
+ <Q ID="399"> 759 760 761 751 </Q>
+ <Q ID="400"> 761 762 763 753 </Q>
+ <Q ID="401"> 763 764 765 755 </Q>
+ <Q ID="402"> 766 767 768 758 </Q>
+ <Q ID="403"> 768 769 770 760 </Q>
+ <Q ID="404"> 770 771 772 762 </Q>
+ <Q ID="405"> 772 773 774 764 </Q>
+ <Q ID="406"> 775 776 777 767 </Q>
+ <Q ID="407"> 777 778 779 769 </Q>
+ <Q ID="408"> 779 780 781 771 </Q>
+ <Q ID="409"> 781 782 783 773 </Q>
+ <Q ID="410"> 784 785 786 776 </Q>
+ <Q ID="411"> 786 787 788 778 </Q>
+ <Q ID="412"> 788 789 790 780 </Q>
+ <Q ID="413"> 790 791 792 782 </Q>
+ <Q ID="414"> 793 794 795 785 </Q>
+ <Q ID="415"> 795 796 797 787 </Q>
+ <Q ID="416"> 797 798 799 789 </Q>
+ <Q ID="417"> 799 800 801 791 </Q>
+ <Q ID="418"> 802 803 804 794 </Q>
+ <Q ID="419"> 804 805 806 796 </Q>
+ <Q ID="420"> 806 807 808 798 </Q>
+ <Q ID="421"> 808 809 810 800 </Q>
+ <Q ID="422"> 811 812 813 803 </Q>
+ <Q ID="423"> 813 814 815 805 </Q>
+ <Q ID="424"> 815 816 817 807 </Q>
+ <Q ID="425"> 817 818 819 809 </Q>
+ <Q ID="426"> 820 821 822 812 </Q>
+ <Q ID="427"> 822 823 824 814 </Q>
+ <Q ID="428"> 824 825 826 816 </Q>
+ <Q ID="429"> 826 827 828 818 </Q>
+ </ELEMENT>
+ <COMPOSITE>
+ <C ID="0"> T[0-209] </C>
+ <C ID="1"> Q[210-429] </C>
+ <C ID="2"> E[2-3,7,10,16,21,23,27,29,33,68,78,86,90,93,98,127,144,152,160,165,243,246,251,273,277,290,310,316,318,334,342-343,351-352,360-361,369-370,378-379,387-388,396-397,405-406,414-415,423-424,432-433,441-442,450-451,459-460,468-469,477-478,486-487,495-496,504-505,513-514,522-523,531-532,540-541,549-550,558-559,567-568,576-577,585-586,594-595,603-604,612-613,621-622,630-631,639-640,648-649,657-658,666-667,675-676,684-685,693-694,702-703,711-712,720-721,729-730,738-739,747-748,756-757,765-766,774-775,783-784,792-793,801-802,810-811,819-820,828] </C>
+ <C ID="3"> E[821,823,825,827] </C>
+ <C ID="4"> E[722,724,726,728] </C>
+ </COMPOSITE>
+ <DOMAIN> C[0,1] </DOMAIN>
+ </GEOMETRY>
+ <EXPANSIONS>
+ <E COMPOSITE="C[0]" NUMMODES="6" FIELDS="u,v,p" TYPE="MODIFIED" />
+ <E COMPOSITE="C[1]" NUMMODES="6" FIELDS="u,v,p" TYPE="MODIFIED" />
+ </EXPANSIONS>
+ <CONDITIONS>
+
+ <SOLVERINFO>
+ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
+ <I PROPERTY="EvolutionOperator" VALUE="TransientGrowth" />
+ <I PROPERTY="Projection" VALUE="Galerkin" />
+ <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
+ <I PROPERTY="Driver" VALUE="Arpack" />
+ <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
+ </SOLVERINFO>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
+ <PARAMETERS>
+ <P> FinalTime = 0.1 </P>
+ <P> TimeStep = 0.005 </P>
+ <P> NumSteps = FinalTime/TimeStep </P>
+ <P> IO_CheckSteps = 1/TimeStep </P>
+ <P> IO_InfoSteps = 1 </P>
+ <P> Re = 500 </P>
+ <P> Kinvis = 1.0/Re </P>
+ <P> kdim = 4 </P>
+ <P> nvec = 1 </P>
+ <P> evtol = 1e-5 </P>
+
+ </PARAMETERS>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ <V ID="1"> v </V>
+ <V ID="2"> p </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[2] </B> <!-- Wall -->
+ <B ID="1"> C[3] </B> <!-- Inlet -->
+ <B ID="2"> C[4] </B> <!-- Outlet -->
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="1">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="2">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+
+ <FUNCTION NAME="BaseFlow">
+ <F VAR="u,v,p" FILE="bfs_tg-AR.bse" />
+ </FUNCTION>
+
+ <FUNCTION NAME="InitialConditions">
+ <F VAR="u,v,p" FILE="bfs_tg-AR.rst" />
+ </FUNCTION>
+
+ </CONDITIONS>
+
+</NEKTAR>
diff --git a/solvers/IncNavierStokesSolver/Examples/ChannelFlow2D/ChannelFlow2D.xml b/solvers/IncNavierStokesSolver/Examples/ChannelFlow2D/ChannelFlow2D.xml
deleted file mode 120000
index 59d8650b8fff9658eb743afc2965d2cc516576ee..0000000000000000000000000000000000000000
--- a/solvers/IncNavierStokesSolver/Examples/ChannelFlow2D/ChannelFlow2D.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/ChannelFlow2D.xml
\ No newline at end of file
diff --git a/solvers/IncNavierStokesSolver/Examples/ChannelFlow2D/ChannelFlow2D.xml b/solvers/IncNavierStokesSolver/Examples/ChannelFlow2D/ChannelFlow2D.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7bdca6d54c215cfed57e418996bc832a78178120
--- /dev/null
+++ b/solvers/IncNavierStokesSolver/Examples/ChannelFlow2D/ChannelFlow2D.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<NEKTAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
+
+ <EXPANSIONS>
+ <E COMPOSITE="C[0]" NUMMODES="3" FIELDS="u,v,p" TYPE="MODIFIED" />
+ </EXPANSIONS>
+
+ <CONDITIONS>
+ <SOLVERINFO>
+ <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme" />
+ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
+ <I PROPERTY="AdvectionForm" VALUE="Convective" />
+ <I PROPERTY="Projection" VALUE="Galerkin" />
+ </SOLVERINFO>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
+ <PARAMETERS>
+ <P> TimeStep = 0.001 </P>
+ <P> NumSteps = 1000 </P>
+ <P> IO_CheckSteps = 1000 </P>
+ <P> IO_InfoSteps = 1000 </P>
+ <P> Kinvis = 1 </P>
+ </PARAMETERS>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ <V ID="1"> v </V>
+ <V ID="2"> p </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[1] </B>
+ <B ID="1"> C[2] </B>
+ <B ID="2"> C[3] </B>
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="1">
+ <D VAR="u" VALUE="y*(1-y)" />
+ <D VAR="v" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="2">
+ <N VAR="u" VALUE="0" />
+ <N VAR="v" VALUE="0" />
+ <D VAR="p" VALUE="0" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+
+ <FUNCTION NAME="InitialConditions">
+ <E VAR="u" VALUE="0" />
+ <E VAR="v" VALUE="0" />
+ <E VAR="p" VALUE="0" />
+ </FUNCTION>
+
+ <FUNCTION NAME="ExactSolution">
+ <E VAR="u" VALUE="y*(1-y)" />
+ <E VAR="v" VALUE="0" />
+ <E VAR="p" VALUE="-2*Kinvis*(x-1)" />
+ </FUNCTION>
+
+ </CONDITIONS>
+
+ <GEOMETRY DIM="2" SPACE="2">
+
+ <VERTEX>
+ <V ID="0"> 0.0 0.0 0.0 </V>
+ <V ID="1"> 0.5 0.0 0.0 </V>
+ <V ID="2"> 1.0 0.0 0.0 </V>
+ <V ID="3"> 0.0 0.5 0.0 </V>
+ <V ID="4"> 0.5 0.5 0.0 </V>
+ <V ID="5"> 1.0 0.5 0.0 </V>
+ <V ID="6"> 0.0 1.0 0.0 </V>
+ <V ID="7"> 0.5 1.0 0.0 </V>
+ <V ID="8"> 1.0 1.0 0.0 </V>
+ </VERTEX>
+
+ <EDGE>
+ <E ID="0"> 0 1 </E>
+ <E ID="1"> 1 2 </E>
+ <E ID="2"> 0 3 </E>
+ <E ID="3"> 1 4 </E>
+ <E ID="4"> 2 5 </E>
+ <E ID="5"> 3 4 </E>
+ <E ID="6"> 4 5 </E>
+ <E ID="7"> 3 6 </E>
+ <E ID="8"> 4 7 </E>
+ <E ID="9"> 5 8 </E>
+ <E ID="10"> 6 7 </E>
+ <E ID="11"> 7 8 </E>
+ </EDGE>
+
+ <ELEMENT>
+ <Q ID="0"> 0 3 5 2 </Q>
+ <Q ID="1"> 1 4 6 3 </Q>
+ <Q ID="2"> 5 8 10 7 </Q>
+ <Q ID="3"> 6 9 11 8 </Q>
+ </ELEMENT>
+
+ <COMPOSITE>
+ <C ID="0"> Q[0-3] </C>
+ <C ID="1"> E[0,1,10,11] </C> <!-- Walls -->
+ <C ID="2"> E[2,7] </C> <!-- Inflow -->
+ <C ID="3"> E[4,9] </C> <!-- Outflow -->
+ </COMPOSITE>
+
+ <DOMAIN> C[0] </DOMAIN>
+
+ </GEOMETRY>
+
+</NEKTAR>
+
diff --git a/solvers/IncNavierStokesSolver/Examples/ChannelFlow3D/ChannelFlow3D.xml b/solvers/IncNavierStokesSolver/Examples/ChannelFlow3D/ChannelFlow3D.xml
deleted file mode 120000
index a328614eef3502e1e145aa121981cadac1927d84..0000000000000000000000000000000000000000
--- a/solvers/IncNavierStokesSolver/Examples/ChannelFlow3D/ChannelFlow3D.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/ChannelFlow3D.xml
\ No newline at end of file
diff --git a/solvers/IncNavierStokesSolver/Examples/ChannelFlow3D/ChannelFlow3D.xml b/solvers/IncNavierStokesSolver/Examples/ChannelFlow3D/ChannelFlow3D.xml
new file mode 100644
index 0000000000000000000000000000000000000000..95e3db653b124cfe6e49cdc1a2f22b4812e66656
--- /dev/null
+++ b/solvers/IncNavierStokesSolver/Examples/ChannelFlow3D/ChannelFlow3D.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<NEKTAR>
+ <GEOMETRY DIM="3" SPACE="3" HDF5FILE="ChannelFlow3D.nekg" />
+ <EXPANSIONS>
+ <E COMPOSITE="C[0,7-9]" NUMMODES="4" TYPE="MODIFIED" FIELDS="u,v,w,p" />
+ </EXPANSIONS>
+ <CONDITIONS>
+ <SOLVERINFO>
+ <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme" />
+ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
+ <I PROPERTY="AdvectionForm" VALUE="Convective" />
+ <I PROPERTY="Projection" VALUE="Galerkin" />
+ </SOLVERINFO>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
+ <PARAMETERS>
+ <P> TimeStep = 0.001 </P>
+ <P> NumSteps = 10 </P>
+ <P> IO_CheckSteps = 10 </P>
+ <P> IO_InfoSteps = 10 </P>
+ <P> Kinvis = 1 </P>
+ </PARAMETERS>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ <V ID="1"> v </V>
+ <V ID="2"> w </V>
+ <V ID="3"> p </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[1] </B> <!-- Inlet -->
+ <B ID="1"> C[6] </B> <!-- Outlet -->
+ <B ID="2"> C[2] </B> <!-- Wall -->
+ <B ID="3"> C[3] </B> <!-- Wall left -->
+ <B ID="4"> C[4] </B> <!-- Wall -->
+ <B ID="5"> C[5] </B> <!-- Wall right -->
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <D VAR="w" VALUE="y*(1-y)" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="1">
+ <N VAR="u" VALUE="0" />
+ <N VAR="v" VALUE="0" />
+ <N VAR="w" VALUE="0" />
+ <D VAR="p" VALUE="0" />
+ </REGION>
+ <REGION REF="2">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <D VAR="w" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="3">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <D VAR="w" VALUE="y*(1-y)" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="4">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <D VAR="w" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="5">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <D VAR="w" VALUE="y*(1-y)" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+
+ <FUNCTION NAME="ExactSolution">
+ <E VAR="u" VALUE="0" />
+ <E VAR="v" VALUE="0" />
+ <E VAR="w" VALUE="y*(1-y)" />
+ <E VAR="p" VALUE="-2*Kinvis*(z-1)" />
+ </FUNCTION>
+ <FUNCTION NAME="InitialConditions">
+ <E VAR="u" VALUE="0" />
+ <E VAR="v" VALUE="0" />
+ <E VAR="w" VALUE="y*(1-y)" />
+ <E VAR="p" VALUE="-2*Kinvis*(z-1)" />
+ </FUNCTION>
+ </CONDITIONS>
+</NEKTAR>
diff --git a/solvers/IncNavierStokesSolver/Examples/ChannelFlowQuasi3D/ChannelFlowQuasi3D.xml b/solvers/IncNavierStokesSolver/Examples/ChannelFlowQuasi3D/ChannelFlowQuasi3D.xml
deleted file mode 120000
index 576307aa9c657209134a2b5a49c63e6fecd773be..0000000000000000000000000000000000000000
--- a/solvers/IncNavierStokesSolver/Examples/ChannelFlowQuasi3D/ChannelFlowQuasi3D.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/ChannelFlowQuasi3D.xml
\ No newline at end of file
diff --git a/solvers/IncNavierStokesSolver/Examples/ChannelFlowQuasi3D/ChannelFlowQuasi3D.xml b/solvers/IncNavierStokesSolver/Examples/ChannelFlowQuasi3D/ChannelFlowQuasi3D.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c31edcc72b634133f5adc0bf99eedaf147ebc13c
--- /dev/null
+++ b/solvers/IncNavierStokesSolver/Examples/ChannelFlowQuasi3D/ChannelFlowQuasi3D.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<NEKTAR>
+
+ <EXPANSIONS>
+ <E COMPOSITE="C[0]" NUMMODES="3" FIELDS="u,v,w,p" TYPE="MODIFIED" />
+ </EXPANSIONS>
+
+ <CONDITIONS>
+ <SOLVERINFO>
+ <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/>
+ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
+ <I PROPERTY="AdvectionForm" VALUE="Convective"/>
+ <I PROPERTY="Projection" VALUE="Galerkin"/>
+ <I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
+ </SOLVERINFO>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
+ <PARAMETERS>
+ <P> TimeStep = 0.001 </P>
+ <P> NumSteps = 1000 </P>
+ <P> IO_CheckSteps = 1000 </P>
+ <P> IO_InfoSteps = 1000 </P>
+ <P> Kinvis = 1 </P>
+ <P> HomModesZ = 20 </P>
+ <P> LZ = 1.0 </P>
+ </PARAMETERS>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ <V ID="1"> v </V>
+ <V ID="2"> w </V>
+ <V ID="3"> p </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[1] </B>
+ <B ID="1"> C[2] </B>
+ <B ID="2"> C[3] </B>
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <D VAR="w" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" /> // High Order Pressure BC
+ </REGION>
+ <REGION REF="1">
+ <D VAR="u" VALUE="y*(1-y)" />
+ <D VAR="v" VALUE="0" />
+ <D VAR="w" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" /> // High Order Pressure BC
+ </REGION>
+ <REGION REF="2">
+ <N VAR="u" VALUE="0" />
+ <N VAR="v" VALUE="0" />
+ <N VAR="w" VALUE="0" />
+ <D VAR="p" VALUE="0" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+
+ <FUNCTION NAME="InitialConditions">
+ <E VAR="u" VALUE="0" />
+ <E VAR="v" VALUE="0" />
+ <E VAR="w" VALUE="0" />
+ <E VAR="p" VALUE="0" />
+ </FUNCTION>
+
+ <FUNCTION NAME="ExactSolution">
+ <E VAR="u" VALUE="y*(1-y)" />
+ <E VAR="v" VALUE="0" />
+ <E VAR="w" VALUE="0" />
+ <E VAR="p" VALUE="-2*Kinvis*(x-1)" />
+ </FUNCTION>
+
+ </CONDITIONS>
+
+ <GEOMETRY DIM="2" SPACE="2">
+
+ <VERTEX>
+ <!-- Always must have four values per entry. -->
+ <V ID="0"> 0.0 0.0 0.0 </V>
+ <V ID="1"> 0.5 0.0 0.0 </V>
+ <V ID="2"> 1.0 0.0 0.0 </V>
+ <V ID="3"> 0.0 0.5 0.0 </V>
+ <V ID="4"> 0.5 0.5 0.0 </V>
+ <V ID="5"> 1.0 0.5 0.0 </V>
+ <V ID="6"> 0.0 1.0 0.0 </V>
+ <V ID="7"> 0.5 1.0 0.0 </V>
+ <V ID="8"> 1.0 1.0 0.0 </V>
+ </VERTEX>
+
+ <EDGE>
+ <E ID="0"> 0 1 </E>
+ <E ID="1"> 1 2 </E>
+ <E ID="2"> 0 3 </E>
+ <E ID="3"> 1 4 </E>
+ <E ID="4"> 2 5 </E>
+ <E ID="5"> 3 4 </E>
+ <E ID="6"> 4 5 </E>
+ <E ID="7"> 3 6 </E>
+ <E ID="8"> 4 7 </E>
+ <E ID="9"> 5 8 </E>
+ <E ID="10"> 6 7 </E>
+ <E ID="11"> 7 8 </E>
+ </EDGE>
+
+ <!-- Q - quads, T - triangles, S - segments, E - tet, P - pyramid, R - prism, H - hex -->
+ <!-- Only certain element types are appropriate for the given dimension (dim on mesh) -->
+ <!-- Can also use faces to define 3-D elements. Specify with F[1] for face 1, for example. -->
+ <ELEMENT>
+ <Q ID="0"> 0 3 5 2 </Q>
+ <Q ID="1"> 1 4 6 3 </Q>
+ <Q ID="2"> 5 8 10 7 </Q>
+ <Q ID="3"> 6 9 11 8 </Q>
+ </ELEMENT>
+
+ <COMPOSITE>
+ <C ID="0"> Q[0-3] </C>
+ <C ID="1"> E[0,1,10,11] </C> // Walls
+ <C ID="2"> E[2,7] </C> // Inflow
+ <C ID="3"> E[4,9] </C> // Outflow
+ </COMPOSITE>
+
+ <DOMAIN> C[0] </DOMAIN>
+
+ </GEOMETRY>
+
+</NEKTAR>
+
diff --git a/solvers/IncNavierStokesSolver/Examples/ChannelStability/ChannelStability.xml b/solvers/IncNavierStokesSolver/Examples/ChannelStability/ChannelStability.xml
deleted file mode 120000
index 638d00e12f22c96af309f91b6066d698d27ecbd9..0000000000000000000000000000000000000000
--- a/solvers/IncNavierStokesSolver/Examples/ChannelStability/ChannelStability.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/ChannelStability.xml
\ No newline at end of file
diff --git a/solvers/IncNavierStokesSolver/Examples/ChannelStability/ChannelStability.xml b/solvers/IncNavierStokesSolver/Examples/ChannelStability/ChannelStability.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8325cf75fff6ea088f5ca76644ef837312a1d568
--- /dev/null
+++ b/solvers/IncNavierStokesSolver/Examples/ChannelStability/ChannelStability.xml
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<NEKTAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
+
+ <GEOMETRY DIM="2" SPACE="2">
+
+ <VERTEX>
+ <V ID="0">3.142e+00 1.000e+00 0.000e+00</V>
+ <V ID="1">2.356e+00 1.000e+00 0.000e+00</V>
+ <V ID="2">2.356e+00 8.000e-01 0.000e+00</V>
+ <V ID="3">3.142e+00 8.000e-01 0.000e+00</V>
+ <V ID="4">2.356e+00 5.000e-01 0.000e+00</V>
+ <V ID="5">3.142e+00 5.000e-01 0.000e+00</V>
+ <V ID="6">2.356e+00 -1.561e-12 0.000e+00</V>
+ <V ID="7">3.142e+00 -2.082e-12 0.000e+00</V>
+ <V ID="8">2.356e+00 -5.000e-01 0.000e+00</V>
+ <V ID="9">3.142e+00 -5.000e-01 0.000e+00</V>
+ <V ID="10">2.356e+00 -8.000e-01 0.000e+00</V>
+ <V ID="11">3.142e+00 -8.000e-01 0.000e+00</V>
+ <V ID="12">2.356e+00 -1.000e+00 0.000e+00</V>
+ <V ID="13">3.142e+00 -1.000e+00 0.000e+00</V>
+ <V ID="14">1.571e+00 1.000e+00 0.000e+00</V>
+ <V ID="15">1.571e+00 8.000e-01 0.000e+00</V>
+ <V ID="16">1.571e+00 5.000e-01 0.000e+00</V>
+ <V ID="17">1.571e+00 -1.041e-12 0.000e+00</V>
+ <V ID="18">1.571e+00 -5.000e-01 0.000e+00</V>
+ <V ID="19">1.571e+00 -8.000e-01 0.000e+00</V>
+ <V ID="20">1.571e+00 -1.000e+00 0.000e+00</V>
+ <V ID="21">7.854e-01 1.000e+00 0.000e+00</V>
+ <V ID="22">7.854e-01 8.000e-01 0.000e+00</V>
+ <V ID="23">7.854e-01 5.000e-01 0.000e+00</V>
+ <V ID="24">7.854e-01 -5.205e-13 0.000e+00</V>
+ <V ID="25">7.854e-01 -5.000e-01 0.000e+00</V>
+ <V ID="26">7.854e-01 -8.000e-01 0.000e+00</V>
+ <V ID="27">7.854e-01 -1.000e+00 0.000e+00</V>
+ <V ID="28">5.551e-12 1.000e+00 0.000e+00</V>
+ <V ID="29">3.701e-12 8.000e-01 0.000e+00</V>
+ <V ID="30">1.850e-12 5.000e-01 0.000e+00</V>
+ <V ID="31">-1.110e-16 5.551e-17 0.000e+00</V>
+ <V ID="32">-1.850e-12 -5.000e-01 0.000e+00</V>
+ <V ID="33">-3.701e-12 -8.000e-01 0.000e+00</V>
+ <V ID="34">-5.551e-12 -1.000e+00 0.000e+00</V>
+ <V ID="35">-7.854e-01 1.000e+00 0.000e+00</V>
+ <V ID="36">-7.854e-01 8.000e-01 0.000e+00</V>
+ <V ID="37">-7.854e-01 5.000e-01 0.000e+00</V>
+ <V ID="38">-7.854e-01 5.203e-13 0.000e+00</V>
+ <V ID="39">-7.854e-01 -5.000e-01 0.000e+00</V>
+ <V ID="40">-7.854e-01 -8.000e-01 0.000e+00</V>
+ <V ID="41">-7.854e-01 -1.000e+00 0.000e+00</V>
+ <V ID="42">-1.571e+00 1.000e+00 0.000e+00</V>
+ <V ID="43">-1.571e+00 8.000e-01 0.000e+00</V>
+ <V ID="44">-1.571e+00 5.000e-01 0.000e+00</V>
+ <V ID="45">-1.571e+00 1.041e-12 0.000e+00</V>
+ <V ID="46">-1.571e+00 -5.000e-01 0.000e+00</V>
+ <V ID="47">-1.571e+00 -8.000e-01 0.000e+00</V>
+ <V ID="48">-1.571e+00 -1.000e+00 0.000e+00</V>
+ <V ID="49">-2.356e+00 1.000e+00 0.000e+00</V>
+ <V ID="50">-2.356e+00 8.000e-01 0.000e+00</V>
+ <V ID="51">-2.356e+00 5.000e-01 0.000e+00</V>
+ <V ID="52">-2.356e+00 1.561e-12 0.000e+00</V>
+ <V ID="53">-2.356e+00 -5.000e-01 0.000e+00</V>
+ <V ID="54">-2.356e+00 -8.000e-01 0.000e+00</V>
+ <V ID="55">-2.356e+00 -1.000e+00 0.000e+00</V>
+ <V ID="56">-3.142e+00 1.000e+00 0.000e+00</V>
+ <V ID="57">-3.142e+00 8.000e-01 0.000e+00</V>
+ <V ID="58">-3.142e+00 5.000e-01 0.000e+00</V>
+ <V ID="59">-3.142e+00 2.082e-12 0.000e+00</V>
+ <V ID="60">-3.142e+00 -5.000e-01 0.000e+00</V>
+ <V ID="61">-3.142e+00 -8.000e-01 0.000e+00</V>
+ <V ID="62">-3.142e+00 -1.000e+00 0.000e+00</V>
+ </VERTEX>
+
+ <EDGE>
+ <E ID="0"> 0 1 </E>
+ <E ID="1"> 1 2 </E>
+ <E ID="2"> 2 3 </E>
+ <E ID="3"> 3 0 </E>
+ <E ID="4"> 2 4 </E>
+ <E ID="5"> 4 5 </E>
+ <E ID="6"> 5 3 </E>
+ <E ID="7"> 4 6 </E>
+ <E ID="8"> 6 7 </E>
+ <E ID="9"> 7 5 </E>
+ <E ID="10"> 6 8 </E>
+ <E ID="11"> 8 9 </E>
+ <E ID="12"> 9 7 </E>
+ <E ID="13"> 8 10 </E>
+ <E ID="14"> 10 11 </E>
+ <E ID="15"> 11 9 </E>
+ <E ID="16"> 10 12 </E>
+ <E ID="17"> 12 13 </E>
+ <E ID="18"> 13 11 </E>
+ <E ID="19"> 1 14 </E>
+ <E ID="20"> 14 15 </E>
+ <E ID="21"> 15 2 </E>
+ <E ID="22"> 15 16 </E>
+ <E ID="23"> 16 4 </E>
+ <E ID="24"> 16 17 </E>
+ <E ID="25"> 17 6 </E>
+ <E ID="26"> 17 18 </E>
+ <E ID="27"> 18 8 </E>
+ <E ID="28"> 18 19 </E>
+ <E ID="29"> 19 10 </E>
+ <E ID="30"> 19 20 </E>
+ <E ID="31"> 20 12 </E>
+ <E ID="32"> 14 21 </E>
+ <E ID="33"> 21 22 </E>
+ <E ID="34"> 22 15 </E>
+ <E ID="35"> 22 23 </E>
+ <E ID="36"> 23 16 </E>
+ <E ID="37"> 23 24 </E>
+ <E ID="38"> 24 17 </E>
+ <E ID="39"> 24 25 </E>
+ <E ID="40"> 25 18 </E>
+ <E ID="41"> 25 26 </E>
+ <E ID="42"> 26 19 </E>
+ <E ID="43"> 26 27 </E>
+ <E ID="44"> 27 20 </E>
+ <E ID="45"> 21 28 </E>
+ <E ID="46"> 28 29 </E>
+ <E ID="47"> 29 22 </E>
+ <E ID="48"> 29 30 </E>
+ <E ID="49"> 30 23 </E>
+ <E ID="50"> 30 31 </E>
+ <E ID="51"> 31 24 </E>
+ <E ID="52"> 31 32 </E>
+ <E ID="53"> 32 25 </E>
+ <E ID="54"> 32 33 </E>
+ <E ID="55"> 33 26 </E>
+ <E ID="56"> 33 34 </E>
+ <E ID="57"> 34 27 </E>
+ <E ID="58"> 28 35 </E>
+ <E ID="59"> 35 36 </E>
+ <E ID="60"> 36 29 </E>
+ <E ID="61"> 36 37 </E>
+ <E ID="62"> 37 30 </E>
+ <E ID="63"> 37 38 </E>
+ <E ID="64"> 38 31 </E>
+ <E ID="65"> 38 39 </E>
+ <E ID="66"> 39 32 </E>
+ <E ID="67"> 39 40 </E>
+ <E ID="68"> 40 33 </E>
+ <E ID="69"> 40 41 </E>
+ <E ID="70"> 41 34 </E>
+ <E ID="71"> 35 42 </E>
+ <E ID="72"> 42 43 </E>
+ <E ID="73"> 43 36 </E>
+ <E ID="74"> 43 44 </E>
+ <E ID="75"> 44 37 </E>
+ <E ID="76"> 44 45 </E>
+ <E ID="77"> 45 38 </E>
+ <E ID="78"> 45 46 </E>
+ <E ID="79"> 46 39 </E>
+ <E ID="80"> 46 47 </E>
+ <E ID="81"> 47 40 </E>
+ <E ID="82"> 47 48 </E>
+ <E ID="83"> 48 41 </E>
+ <E ID="84"> 42 49 </E>
+ <E ID="85"> 49 50 </E>
+ <E ID="86"> 50 43 </E>
+ <E ID="87"> 50 51 </E>
+ <E ID="88"> 51 44 </E>
+ <E ID="89"> 51 52 </E>
+ <E ID="90"> 52 45 </E>
+ <E ID="91"> 52 53 </E>
+ <E ID="92"> 53 46 </E>
+ <E ID="93"> 53 54 </E>
+ <E ID="94"> 54 47 </E>
+ <E ID="95"> 54 55 </E>
+ <E ID="96"> 55 48 </E>
+ <E ID="97"> 49 56 </E>
+ <E ID="98"> 57 56 </E>
+ <E ID="99"> 57 50 </E>
+ <E ID="100"> 58 57 </E>
+ <E ID="101"> 58 51 </E>
+ <E ID="102"> 59 58 </E>
+ <E ID="103"> 59 52 </E>
+ <E ID="104"> 60 59 </E>
+ <E ID="105"> 60 53 </E>
+ <E ID="106"> 61 60 </E>
+ <E ID="107"> 61 54 </E>
+ <E ID="108"> 62 61 </E>
+ <E ID="109"> 62 55 </E>
+ </EDGE>
+
+ <ELEMENT>
+ <Q ID="0"> 0 1 2 3 </Q>
+ <Q ID="1"> 2 4 5 6 </Q>
+ <Q ID="2"> 5 7 8 9 </Q>
+ <Q ID="3"> 8 10 11 12 </Q>
+ <Q ID="4"> 11 13 14 15 </Q>
+ <Q ID="5"> 14 16 17 18 </Q>
+ <Q ID="6"> 19 20 21 1 </Q>
+ <Q ID="7"> 21 22 23 4 </Q>
+ <Q ID="8"> 23 24 25 7 </Q>
+ <Q ID="9"> 25 26 27 10 </Q>
+ <Q ID="10"> 27 28 29 13 </Q>
+ <Q ID="11"> 29 30 31 16 </Q>
+ <Q ID="12"> 32 33 34 20 </Q>
+ <Q ID="13"> 34 35 36 22 </Q>
+ <Q ID="14"> 36 37 38 24 </Q>
+ <Q ID="15"> 38 39 40 26 </Q>
+ <Q ID="16"> 40 41 42 28 </Q>
+ <Q ID="17"> 42 43 44 30 </Q>
+ <Q ID="18"> 45 46 47 33 </Q>
+ <Q ID="19"> 47 48 49 35 </Q>
+ <Q ID="20"> 49 50 51 37 </Q>
+ <Q ID="21"> 51 52 53 39 </Q>
+ <Q ID="22"> 53 54 55 41 </Q>
+ <Q ID="23"> 55 56 57 43 </Q>
+ <Q ID="24"> 58 59 60 46 </Q>
+ <Q ID="25"> 60 61 62 48 </Q>
+ <Q ID="26"> 62 63 64 50 </Q>
+ <Q ID="27"> 64 65 66 52 </Q>
+ <Q ID="28"> 66 67 68 54 </Q>
+ <Q ID="29"> 68 69 70 56 </Q>
+ <Q ID="30"> 71 72 73 59 </Q>
+ <Q ID="31"> 73 74 75 61 </Q>
+ <Q ID="32"> 75 76 77 63 </Q>
+ <Q ID="33"> 77 78 79 65 </Q>
+ <Q ID="34"> 79 80 81 67 </Q>
+ <Q ID="35"> 81 82 83 69 </Q>
+ <Q ID="36"> 84 85 86 72 </Q>
+ <Q ID="37"> 86 87 88 74 </Q>
+ <Q ID="38"> 88 89 90 76 </Q>
+ <Q ID="39"> 90 91 92 78 </Q>
+ <Q ID="40"> 92 93 94 80 </Q>
+ <Q ID="41"> 94 95 96 82 </Q>
+ <Q ID="42"> 97 98 99 85 </Q>
+ <Q ID="43"> 99 100 101 87 </Q>
+ <Q ID="44"> 101 102 103 89 </Q>
+ <Q ID="45"> 103 104 105 91 </Q>
+ <Q ID="46"> 105 106 107 93 </Q>
+ <Q ID="47"> 107 108 109 95 </Q>
+ </ELEMENT>
+
+ <COMPOSITE>
+ <C ID="0"> Q[0-47] </C>
+ <C ID="1"> E[17,31,44,57,70,83,96,109,0,19,32,45,58,71,84,97] </C> <!-- Walls -->
+ <C ID="2"> E[3,6,9,12,15,18] </C> <!-- Inflow -->
+ <C ID="3"> E[98,100,102,104,106,108] </C> <!-- Outflow -->
+ </COMPOSITE>
+
+ <DOMAIN> C[0] </DOMAIN>
+
+ </GEOMETRY>
+
+ <EXPANSIONS>
+ <E COMPOSITE="C[0]" NUMMODES="10" FIELDS="u,v,p" TYPE="GLL_LAGRANGE" />
+ </EXPANSIONS>
+
+ <CONDITIONS>
+ <SOLVERINFO>
+ <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme" />
+ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
+ <I PROPERTY="EvolutionOperator" VALUE="Direct" />
+ <I PROPERTY="Projection" VALUE="Galerkin" />
+ <I PROPERTY="InitialVector" VALUE="Random" />
+ <I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
+ </SOLVERINFO>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
+ <PARAMETERS>
+ <P> TimeStep = 0.007 </P>
+ <P> NumSteps = 20 </P>
+ <P> IO_CheckSteps = 1000 </P>
+ <P> IO_InfoSteps = 20 </P>
+ <P> Re = 7500 </P>
+ <P> Kinvis = 1.0/Re </P>
+ <P> kdim = 16 </P>
+ <P> nvec =2 </P>
+ <P> evtol =1e-6 </P>
+ </PARAMETERS>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ <V ID="1"> v </V>
+ <V ID="2"> p </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[1] </B>
+ <B ID="1"> C[2] </B>
+ <B ID="2"> C[3] </B>
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="1">
+ <P VAR="u" VALUE="[2]" />
+ <P VAR="v" VALUE="[2]" />
+ <P VAR="p" VALUE="[2]" />
+ </REGION>
+ <REGION REF="2">
+ <P VAR="u" VALUE="[1]" />
+ <P VAR="v" VALUE="[1]" />
+ <P VAR="p" VALUE="[1]" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+
+ <FUNCTION NAME="InitialConditions">
+ <F VAR="u,v,p" FILE="ChannelStability.rst" />
+ </FUNCTION>
+
+ <FUNCTION NAME="BaseFlow">
+ <F VAR="u,v,p" FILE="ChannelStability.bse" />
+ </FUNCTION>
+
+ <FUNCTION NAME="Forcing">
+ <E VAR="u" VALUE="0" />
+ <E VAR="v" VALUE="0" />
+ <E VAR="p" VALUE="0" />
+ </FUNCTION>
+
+ </CONDITIONS>
+
+</NEKTAR>
diff --git a/solvers/IncNavierStokesSolver/Examples/ChannelStabilityAdjoint/ChannelStabilityAdjoint.xml b/solvers/IncNavierStokesSolver/Examples/ChannelStabilityAdjoint/ChannelStabilityAdjoint.xml
deleted file mode 120000
index b9f5501b2bd0e0d3001982e0ceb0e92811abcd8a..0000000000000000000000000000000000000000
--- a/solvers/IncNavierStokesSolver/Examples/ChannelStabilityAdjoint/ChannelStabilityAdjoint.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/ChannelStabilityAdjoint.xml
\ No newline at end of file
diff --git a/solvers/IncNavierStokesSolver/Examples/ChannelStabilityAdjoint/ChannelStabilityAdjoint.xml b/solvers/IncNavierStokesSolver/Examples/ChannelStabilityAdjoint/ChannelStabilityAdjoint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..653a52e02621a473340fcbbeaa8de6b53c67d88d
--- /dev/null
+++ b/solvers/IncNavierStokesSolver/Examples/ChannelStabilityAdjoint/ChannelStabilityAdjoint.xml
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<NEKTAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
+ <GEOMETRY DIM="2" SPACE="2">
+ <VERTEX>
+ <V ID="0">3.142e+00 1.000e+00 0.000e+00</V>
+ <V ID="1">2.356e+00 1.000e+00 0.000e+00</V>
+ <V ID="2">2.356e+00 8.000e-01 0.000e+00</V>
+ <V ID="3">3.142e+00 8.000e-01 0.000e+00</V>
+ <V ID="4">2.356e+00 5.000e-01 0.000e+00</V>
+ <V ID="5">3.142e+00 5.000e-01 0.000e+00</V>
+ <V ID="6">2.356e+00 -1.561e-12 0.000e+00</V>
+ <V ID="7">3.142e+00 -2.082e-12 0.000e+00</V>
+ <V ID="8">2.356e+00 -5.000e-01 0.000e+00</V>
+ <V ID="9">3.142e+00 -5.000e-01 0.000e+00</V>
+ <V ID="10">2.356e+00 -8.000e-01 0.000e+00</V>
+ <V ID="11">3.142e+00 -8.000e-01 0.000e+00</V>
+ <V ID="12">2.356e+00 -1.000e+00 0.000e+00</V>
+ <V ID="13">3.142e+00 -1.000e+00 0.000e+00</V>
+ <V ID="14">1.571e+00 1.000e+00 0.000e+00</V>
+ <V ID="15">1.571e+00 8.000e-01 0.000e+00</V>
+ <V ID="16">1.571e+00 5.000e-01 0.000e+00</V>
+ <V ID="17">1.571e+00 -1.041e-12 0.000e+00</V>
+ <V ID="18">1.571e+00 -5.000e-01 0.000e+00</V>
+ <V ID="19">1.571e+00 -8.000e-01 0.000e+00</V>
+ <V ID="20">1.571e+00 -1.000e+00 0.000e+00</V>
+ <V ID="21">7.854e-01 1.000e+00 0.000e+00</V>
+ <V ID="22">7.854e-01 8.000e-01 0.000e+00</V>
+ <V ID="23">7.854e-01 5.000e-01 0.000e+00</V>
+ <V ID="24">7.854e-01 -5.205e-13 0.000e+00</V>
+ <V ID="25">7.854e-01 -5.000e-01 0.000e+00</V>
+ <V ID="26">7.854e-01 -8.000e-01 0.000e+00</V>
+ <V ID="27">7.854e-01 -1.000e+00 0.000e+00</V>
+ <V ID="28">5.551e-12 1.000e+00 0.000e+00</V>
+ <V ID="29">3.701e-12 8.000e-01 0.000e+00</V>
+ <V ID="30">1.850e-12 5.000e-01 0.000e+00</V>
+ <V ID="31">-1.110e-16 5.551e-17 0.000e+00</V>
+ <V ID="32">-1.850e-12 -5.000e-01 0.000e+00</V>
+ <V ID="33">-3.701e-12 -8.000e-01 0.000e+00</V>
+ <V ID="34">-5.551e-12 -1.000e+00 0.000e+00</V>
+ <V ID="35">-7.854e-01 1.000e+00 0.000e+00</V>
+ <V ID="36">-7.854e-01 8.000e-01 0.000e+00</V>
+ <V ID="37">-7.854e-01 5.000e-01 0.000e+00</V>
+ <V ID="38">-7.854e-01 5.203e-13 0.000e+00</V>
+ <V ID="39">-7.854e-01 -5.000e-01 0.000e+00</V>
+ <V ID="40">-7.854e-01 -8.000e-01 0.000e+00</V>
+ <V ID="41">-7.854e-01 -1.000e+00 0.000e+00</V>
+ <V ID="42">-1.571e+00 1.000e+00 0.000e+00</V>
+ <V ID="43">-1.571e+00 8.000e-01 0.000e+00</V>
+ <V ID="44">-1.571e+00 5.000e-01 0.000e+00</V>
+ <V ID="45">-1.571e+00 1.041e-12 0.000e+00</V>
+ <V ID="46">-1.571e+00 -5.000e-01 0.000e+00</V>
+ <V ID="47">-1.571e+00 -8.000e-01 0.000e+00</V>
+ <V ID="48">-1.571e+00 -1.000e+00 0.000e+00</V>
+ <V ID="49">-2.356e+00 1.000e+00 0.000e+00</V>
+ <V ID="50">-2.356e+00 8.000e-01 0.000e+00</V>
+ <V ID="51">-2.356e+00 5.000e-01 0.000e+00</V>
+ <V ID="52">-2.356e+00 1.561e-12 0.000e+00</V>
+ <V ID="53">-2.356e+00 -5.000e-01 0.000e+00</V>
+ <V ID="54">-2.356e+00 -8.000e-01 0.000e+00</V>
+ <V ID="55">-2.356e+00 -1.000e+00 0.000e+00</V>
+ <V ID="56">-3.142e+00 1.000e+00 0.000e+00</V>
+ <V ID="57">-3.142e+00 8.000e-01 0.000e+00</V>
+ <V ID="58">-3.142e+00 5.000e-01 0.000e+00</V>
+ <V ID="59">-3.142e+00 2.082e-12 0.000e+00</V>
+ <V ID="60">-3.142e+00 -5.000e-01 0.000e+00</V>
+ <V ID="61">-3.142e+00 -8.000e-01 0.000e+00</V>
+ <V ID="62">-3.142e+00 -1.000e+00 0.000e+00</V>
+ </VERTEX>
+ <EDGE>
+ <E ID="0"> 0 1 </E>
+ <E ID="1"> 1 2 </E>
+ <E ID="2"> 2 3 </E>
+ <E ID="3"> 3 0 </E>
+ <E ID="4"> 2 4 </E>
+ <E ID="5"> 4 5 </E>
+ <E ID="6"> 5 3 </E>
+ <E ID="7"> 4 6 </E>
+ <E ID="8"> 6 7 </E>
+ <E ID="9"> 7 5 </E>
+ <E ID="10"> 6 8 </E>
+ <E ID="11"> 8 9 </E>
+ <E ID="12"> 9 7 </E>
+ <E ID="13"> 8 10 </E>
+ <E ID="14"> 10 11 </E>
+ <E ID="15"> 11 9 </E>
+ <E ID="16"> 10 12 </E>
+ <E ID="17"> 12 13 </E>
+ <E ID="18"> 13 11 </E>
+ <E ID="19"> 1 14 </E>
+ <E ID="20"> 14 15 </E>
+ <E ID="21"> 15 2 </E>
+ <E ID="22"> 15 16 </E>
+ <E ID="23"> 16 4 </E>
+ <E ID="24"> 16 17 </E>
+ <E ID="25"> 17 6 </E>
+ <E ID="26"> 17 18 </E>
+ <E ID="27"> 18 8 </E>
+ <E ID="28"> 18 19 </E>
+ <E ID="29"> 19 10 </E>
+ <E ID="30"> 19 20 </E>
+ <E ID="31"> 20 12 </E>
+ <E ID="32"> 14 21 </E>
+ <E ID="33"> 21 22 </E>
+ <E ID="34"> 22 15 </E>
+ <E ID="35"> 22 23 </E>
+ <E ID="36"> 23 16 </E>
+ <E ID="37"> 23 24 </E>
+ <E ID="38"> 24 17 </E>
+ <E ID="39"> 24 25 </E>
+ <E ID="40"> 25 18 </E>
+ <E ID="41"> 25 26 </E>
+ <E ID="42"> 26 19 </E>
+ <E ID="43"> 26 27 </E>
+ <E ID="44"> 27 20 </E>
+ <E ID="45"> 21 28 </E>
+ <E ID="46"> 28 29 </E>
+ <E ID="47"> 29 22 </E>
+ <E ID="48"> 29 30 </E>
+ <E ID="49"> 30 23 </E>
+ <E ID="50"> 30 31 </E>
+ <E ID="51"> 31 24 </E>
+ <E ID="52"> 31 32 </E>
+ <E ID="53"> 32 25 </E>
+ <E ID="54"> 32 33 </E>
+ <E ID="55"> 33 26 </E>
+ <E ID="56"> 33 34 </E>
+ <E ID="57"> 34 27 </E>
+ <E ID="58"> 28 35 </E>
+ <E ID="59"> 35 36 </E>
+ <E ID="60"> 36 29 </E>
+ <E ID="61"> 36 37 </E>
+ <E ID="62"> 37 30 </E>
+ <E ID="63"> 37 38 </E>
+ <E ID="64"> 38 31 </E>
+ <E ID="65"> 38 39 </E>
+ <E ID="66"> 39 32 </E>
+ <E ID="67"> 39 40 </E>
+ <E ID="68"> 40 33 </E>
+ <E ID="69"> 40 41 </E>
+ <E ID="70"> 41 34 </E>
+ <E ID="71"> 35 42 </E>
+ <E ID="72"> 42 43 </E>
+ <E ID="73"> 43 36 </E>
+ <E ID="74"> 43 44 </E>
+ <E ID="75"> 44 37 </E>
+ <E ID="76"> 44 45 </E>
+ <E ID="77"> 45 38 </E>
+ <E ID="78"> 45 46 </E>
+ <E ID="79"> 46 39 </E>
+ <E ID="80"> 46 47 </E>
+ <E ID="81"> 47 40 </E>
+ <E ID="82"> 47 48 </E>
+ <E ID="83"> 48 41 </E>
+ <E ID="84"> 42 49 </E>
+ <E ID="85"> 49 50 </E>
+ <E ID="86"> 50 43 </E>
+ <E ID="87"> 50 51 </E>
+ <E ID="88"> 51 44 </E>
+ <E ID="89"> 51 52 </E>
+ <E ID="90"> 52 45 </E>
+ <E ID="91"> 52 53 </E>
+ <E ID="92"> 53 46 </E>
+ <E ID="93"> 53 54 </E>
+ <E ID="94"> 54 47 </E>
+ <E ID="95"> 54 55 </E>
+ <E ID="96"> 55 48 </E>
+ <E ID="97"> 49 56 </E>
+ <E ID="98"> 57 56 </E>
+ <E ID="99"> 57 50 </E>
+ <E ID="100"> 58 57 </E>
+ <E ID="101"> 58 51 </E>
+ <E ID="102"> 59 58 </E>
+ <E ID="103"> 59 52 </E>
+ <E ID="104"> 60 59 </E>
+ <E ID="105"> 60 53 </E>
+ <E ID="106"> 61 60 </E>
+ <E ID="107"> 61 54 </E>
+ <E ID="108"> 62 61 </E>
+ <E ID="109"> 62 55 </E>
+ </EDGE>
+ <ELEMENT>
+ <Q ID="0"> 0 1 2 3 </Q>
+ <Q ID="1"> 2 4 5 6 </Q>
+ <Q ID="2"> 5 7 8 9 </Q>
+ <Q ID="3"> 8 10 11 12 </Q>
+ <Q ID="4"> 11 13 14 15 </Q>
+ <Q ID="5"> 14 16 17 18 </Q>
+ <Q ID="6"> 19 20 21 1 </Q>
+ <Q ID="7"> 21 22 23 4 </Q>
+ <Q ID="8"> 23 24 25 7 </Q>
+ <Q ID="9"> 25 26 27 10 </Q>
+ <Q ID="10"> 27 28 29 13 </Q>
+ <Q ID="11"> 29 30 31 16 </Q>
+ <Q ID="12"> 32 33 34 20 </Q>
+ <Q ID="13"> 34 35 36 22 </Q>
+ <Q ID="14"> 36 37 38 24 </Q>
+ <Q ID="15"> 38 39 40 26 </Q>
+ <Q ID="16"> 40 41 42 28 </Q>
+ <Q ID="17"> 42 43 44 30 </Q>
+ <Q ID="18"> 45 46 47 33 </Q>
+ <Q ID="19"> 47 48 49 35 </Q>
+ <Q ID="20"> 49 50 51 37 </Q>
+ <Q ID="21"> 51 52 53 39 </Q>
+ <Q ID="22"> 53 54 55 41 </Q>
+ <Q ID="23"> 55 56 57 43 </Q>
+ <Q ID="24"> 58 59 60 46 </Q>
+ <Q ID="25"> 60 61 62 48 </Q>
+ <Q ID="26"> 62 63 64 50 </Q>
+ <Q ID="27"> 64 65 66 52 </Q>
+ <Q ID="28"> 66 67 68 54 </Q>
+ <Q ID="29"> 68 69 70 56 </Q>
+ <Q ID="30"> 71 72 73 59 </Q>
+ <Q ID="31"> 73 74 75 61 </Q>
+ <Q ID="32"> 75 76 77 63 </Q>
+ <Q ID="33"> 77 78 79 65 </Q>
+ <Q ID="34"> 79 80 81 67 </Q>
+ <Q ID="35"> 81 82 83 69 </Q>
+ <Q ID="36"> 84 85 86 72 </Q>
+ <Q ID="37"> 86 87 88 74 </Q>
+ <Q ID="38"> 88 89 90 76 </Q>
+ <Q ID="39"> 90 91 92 78 </Q>
+ <Q ID="40"> 92 93 94 80 </Q>
+ <Q ID="41"> 94 95 96 82 </Q>
+ <Q ID="42"> 97 98 99 85 </Q>
+ <Q ID="43"> 99 100 101 87 </Q>
+ <Q ID="44"> 101 102 103 89 </Q>
+ <Q ID="45"> 103 104 105 91 </Q>
+ <Q ID="46"> 105 106 107 93 </Q>
+ <Q ID="47"> 107 108 109 95 </Q>
+ </ELEMENT>
+ <COMPOSITE>
+ <C ID="0"> Q[0-47] </C>
+ <C ID="1"> E[17,31,44,57,70,83,96,109,0,19,32,45,58,71,84,97] </C> <!-- Wall -->
+ <C ID="2"> E[3,6,9,12,15,18] </C> <!-- Inflow -->
+ <C ID="3"> E[98,100,102,104,106,108] </C> <!-- Outflow -->
+ </COMPOSITE>
+ <DOMAIN> C[0] </DOMAIN>
+ </GEOMETRY>
+ <EXPANSIONS>
+ <E COMPOSITE="C[0]" NUMMODES="11" FIELDS="u,v,p" TYPE="GLL_LAGRANGE" />
+ </EXPANSIONS>
+
+ <CONDITIONS>
+ <SOLVERINFO>
+ <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme" />
+ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
+ <I PROPERTY="EvolutionOperator" VALUE="Adjoint" />
+ <I PROPERTY="Projection" VALUE="Galerkin" />
+ <I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
+ </SOLVERINFO>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
+ <PARAMETERS>
+ <P> TimeStep = 0.002 </P>
+ <P> NumSteps = 70 </P>
+ <P> IO_CheckSteps = 1000 </P>
+ <P> IO_InfoSteps = 20 </P>
+ <P> Re = 7500 </P>
+ <P> Kinvis = 1.0/Re </P>
+ <P> kdim = 16 </P>
+ <P> nvec =2 </P>
+ <P> evtol =1e-6 </P>
+ <P> nits =1000 </P>
+
+ </PARAMETERS>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ <V ID="1"> v </V>
+ <V ID="2"> p </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[1] </B>
+ <B ID="1"> C[2] </B>
+ <B ID="2"> C[3] </B>
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <D VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="1">
+ <P VAR="u" VALUE="[2]" />
+ <P VAR="v" VALUE="[2]" />
+ <P VAR="p" VALUE="[2]" />
+ </REGION>
+ <REGION REF="2">
+ <P VAR="u" VALUE="[1]" />
+ <P VAR="v" VALUE="[1]" />
+ <P VAR="p" VALUE="[1]" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+ <FUNCTION NAME="Forcing">
+ <E VAR="u" VALUE="0" />
+ <E VAR="v" VALUE="0" />
+ <E VAR="p" VALUE="0" />
+ </FUNCTION>
+
+ <FUNCTION NAME="InitialConditions">
+ <F VAR="u,v,p" FILE="ChannelStabilityAdjoint.rst" />
+ </FUNCTION>
+
+ <FUNCTION NAME="BaseFlow">
+ <F VAR="u,v,p" FILE="ChannelStabilityAdjoint.bse" />
+ </FUNCTION>
+ <FUNCTION NAME="ExactSolution">
+ <E VAR="u" VALUE="-y*y+1" />
+ <E VAR="v" VALUE="0" />
+ <E VAR="p" VALUE="-2*Kinvis*(x-1)" />
+ </FUNCTION>
+
+ </CONDITIONS>
+
+</NEKTAR>
diff --git a/solvers/IncNavierStokesSolver/Examples/KovasznayFlow2D/KovasznayFlow2D.xml b/solvers/IncNavierStokesSolver/Examples/KovasznayFlow2D/KovasznayFlow2D.xml
deleted file mode 120000
index eb404ef541b2110637081e73a42ff117075a25f1..0000000000000000000000000000000000000000
--- a/solvers/IncNavierStokesSolver/Examples/KovasznayFlow2D/KovasznayFlow2D.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../Tests/KovasznayFlow2D.xml
\ No newline at end of file
diff --git a/solvers/IncNavierStokesSolver/Examples/KovasznayFlow2D/KovasznayFlow2D.xml b/solvers/IncNavierStokesSolver/Examples/KovasznayFlow2D/KovasznayFlow2D.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ac68270494f332dd559666af1571efeb07544f45
--- /dev/null
+++ b/solvers/IncNavierStokesSolver/Examples/KovasznayFlow2D/KovasznayFlow2D.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<NEKTAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
+
+ <EXPANSIONS>
+ <E COMPOSITE="C[0]" NUMMODES="3" FIELDS="u,v,p" TYPE="MODIFIED" />
+ </EXPANSIONS>
+
+ <CONDITIONS>
+ <SOLVERINFO>
+ <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme" />
+ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
+ <I PROPERTY="AdvectionForm" VALUE="Convective" />
+ <I PROPERTY="Projection" VALUE="Galerkin" />
+ </SOLVERINFO>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
+ <PARAMETERS>
+ <P> TimeStep = 0.001 </P>
+ <P> NumSteps = 100 </P>
+ <P> IO_CheckSteps = 100 </P>
+ <P> IO_InfoSteps = 100 </P>
+ <P> Kinvis = 0.025 </P>
+ </PARAMETERS>
+
+ <VARIABLES>
+ <V ID="0"> u </V>
+ <V ID="1"> v </V>
+ <V ID="2"> p </V>
+ </VARIABLES>
+
+ <BOUNDARYREGIONS>
+ <B ID="0"> C[1] </B>
+ <B ID="1"> C[2] </B>
+ <B ID="2"> C[3] </B>
+ </BOUNDARYREGIONS>
+
+ <BOUNDARYCONDITIONS>
+ <REGION REF="0">
+ <D VAR="u" VALUE="1-1.619099729265964*cos(2*3.141592653589793*y)" />
+ <D VAR="v" VALUE="-0.248344108585656*sin(2*3.141592653589793*y)" />
+ <N VAR="p" USERDEFINEDTYPE="H" VALUE="0" />
+ </REGION>
+ <REGION REF="1">
+ <D VAR="u" VALUE="1-0.381463333531742*cos(2*3.141592653589793*y)" />
+ <D VAR="v" VALUE="-0.058510399212408*sin(2*3.141592653589793*y)" />
+ <D VAR="p" VALUE="0.427242862585425" />
+ </REGION>
+ <REGION REF="2">
+ <N VAR="u" VALUE="0" />
+ <D VAR="v" VALUE="0" />
+ <N VAR="p" VALUE="0" />
+ </REGION>
+ </BOUNDARYCONDITIONS>
+
+ <FUNCTION NAME="InitialConditions">
+ <F VAR="u,v,p" FILE="KovasznayFlow2D.rst" />
+ </FUNCTION>
+
+ <FUNCTION NAME="ExactSolution">
+ <E VAR="u" VALUE="(1-exp(-0.963740544195769*x)*cos(2*3.141592653589793*y))" />
+ <E VAR="v"
+ VALUE="(-0.963740544195769/(2*3.141592653589793))*exp(-0.963740544195769*x)*sin(2*3.141592653589793*y)" />
+ <E VAR="p" VALUE="0.5*(1-exp(-2*0.963740544195769*x))" />
+ </FUNCTION>
+
+ </CONDITIONS>
+
+ <GEOMETRY DIM="2" SPACE="2">
+
+ <VERTEX>
+ <V ID="0">-5.000e-01 -5.000e-01 0.000e+00</V>
+ <V ID="1">-5.000e-01 1.500e+00 0.000e+00</V>
+ <V ID="2">1.000e+00 1.500e+00 0.000e+00</V>
+ <V ID="3">1.000e+00 -5.000e-01 0.000e+00</V>
+ <V ID="4">-5.000e-01 1.000e+00 0.000e+00</V>
+ <V ID="5">-5.000e-01 5.000e-01 0.000e+00</V>
+ <V ID="6">-5.000e-01 1.388e-12 0.000e+00</V>
+ <V ID="7">-1.619e-12 -5.000e-01 0.000e+00</V>
+ <V ID="8">5.000e-01 -5.000e-01 0.000e+00</V>
+ <V ID="9">1.000e+00 -1.388e-12 0.000e+00</V>
+ <V ID="10">1.000e+00 5.000e-01 0.000e+00</V>
+ <V ID="11">1.000e+00 1.000e+00 0.000e+00</V>
+ <V ID="12">5.000e-01 1.500e+00 0.000e+00</V>
+ <V ID="13">1.619e-12 1.500e+00 0.000e+00</V>
+ <V ID="14">5.000e-01 1.000e+00 0.000e+00</V>
+ <V ID="15">5.000e-01 5.000e-01 0.000e+00</V>
+ <V ID="16">5.000e-01 -4.626e-13 0.000e+00</V>
+ <V ID="17">8.097e-13 1.000e+00 0.000e+00</V>
+ <V ID="18">5.551e-17 5.000e-01 0.000e+00</V>
+ <V ID="19">-8.095e-13 4.626e-13 0.000e+00</V>
+ </VERTEX>
+
+ <EDGE>
+ <E ID="0"> 2 12 </E>
+ <E ID="1"> 12 14 </E>
+ <E ID="2"> 14 11 </E>
+ <E ID="3"> 11 2 </E>
+ <E ID="4"> 14 15 </E>
+ <E ID="5"> 15 10 </E>
+ <E ID="6"> 10 11 </E>
+ <E ID="7"> 15 16 </E>
+ <E ID="8"> 16 9 </E>
+ <E ID="9"> 9 10 </E>
+ <E ID="10"> 16 8 </E>
+ <E ID="11"> 8 3 </E>
+ <E ID="12"> 3 9 </E>
+ <E ID="13"> 12 13 </E>
+ <E ID="14"> 13 17 </E>
+ <E ID="15"> 17 14 </E>
+ <E ID="16"> 17 18 </E>
+ <E ID="17"> 18 15 </E>
+ <E ID="18"> 18 19 </E>
+ <E ID="19"> 19 16 </E>
+ <E ID="20"> 19 7 </E>
+ <E ID="21"> 7 8 </E>
+ <E ID="22"> 13 1 </E>
+ <E ID="23"> 1 4 </E>
+ <E ID="24"> 4 17 </E>
+ <E ID="25"> 4 5 </E>
+ <E ID="26"> 5 18 </E>
+ <E ID="27"> 5 6 </E>
+ <E ID="28"> 6 19 </E>
+ <E ID="29"> 6 0 </E>
+ <E ID="30"> 0 7 </E>
+ </EDGE>
+
+ <ELEMENT>
+ <Q ID="0"> 0 1 2 3 </Q>
+ <Q ID="1"> 2 4 5 6 </Q>
+ <Q ID="2"> 5 7 8 9 </Q>
+ <Q ID="3"> 8 10 11 12 </Q>
+ <Q ID="4"> 13 14 15 1 </Q>
+ <Q ID="5"> 15 16 17 4 </Q>
+ <Q ID="6"> 17 18 19 7 </Q>
+ <Q ID="7"> 19 20 21 10 </Q>
+ <Q ID="8"> 22 23 24 14 </Q>
+ <Q ID="9"> 24 25 26 16 </Q>
+ <Q ID="10"> 26 27 28 18 </Q>
+ <Q ID="11"> 28 29 30 20 </Q>
+ </ELEMENT>
+
+ <COMPOSITE>
+ <C ID="0"> Q[0-11] </C> <!-- Domain -->
+ <C ID="1"> E[23,25,27,29] </C> <!-- Inflow -->
+ <C ID="2"> E[3,6,9,12] </C> <!-- Outflow -->
+ <C ID="3"> E[0,11,13,21,22,30] </C> <!-- Walls -->
+ </COMPOSITE>
+
+ <DOMAIN> C[0] </DOMAIN>
+
+ </GEOMETRY>
+
+</NEKTAR>
diff --git a/solvers/IncNavierStokesSolver/Tests/2DFlow_lineforcing_bcfromfile.xml b/solvers/IncNavierStokesSolver/Tests/2DFlow_lineforcing_bcfromfile.xml
index 0c4e5ecc783eb033ceb71f24cbc445c0584c240b..c99c174c2c6547ac42e57ca1b43debb1c25a4a79 100644
--- a/solvers/IncNavierStokesSolver/Tests/2DFlow_lineforcing_bcfromfile.xml
+++ b/solvers/IncNavierStokesSolver/Tests/2DFlow_lineforcing_bcfromfile.xml
@@ -11,12 +11,16 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="solvertype" VALUE="CoupledLinearisedNS" />
<I PROPERTY="GlobalSysSoln" VALUE="DirectStaticCond" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/3DH1D_L2ErrorFilter.xml b/solvers/IncNavierStokesSolver/Tests/3DH1D_L2ErrorFilter.xml
index 2471eba60061f01a86e22af15014577d916d5bd7..4e42f333c90b0426f773aad90bad661f4969bab1 100644
--- a/solvers/IncNavierStokesSolver/Tests/3DH1D_L2ErrorFilter.xml
+++ b/solvers/IncNavierStokesSolver/Tests/3DH1D_L2ErrorFilter.xml
@@ -12,12 +12,16 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="SpectralHPDealiasing" VALUE="True" />
<I PROPERTY="Homogeneous" VALUE="1D" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<!-- Need to pick Delta t strategically, dont want CFL number to be too large! -->
<P> TimeStep = 0.01 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/BackwardFacingStep_TG.xml b/solvers/IncNavierStokesSolver/Tests/BackwardFacingStep_TG.xml
index 203ee7495cc9ec19b6e41e95c72de290be676d01..448ccd4ff32e71c7341da0c84b3df043c1f91d36 100644
--- a/solvers/IncNavierStokesSolver/Tests/BackwardFacingStep_TG.xml
+++ b/solvers/IncNavierStokesSolver/Tests/BackwardFacingStep_TG.xml
@@ -1686,12 +1686,16 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="TransientGrowth" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
<I PROPERTY="Driver" VALUE="Arpack" />
<I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> FinalTime = 0.1 </P>
<P> TimeStep = 0.005 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/BercovierEngelman.xml b/solvers/IncNavierStokesSolver/Tests/BercovierEngelman.xml
index 749825b0b62a9531438b44efb6b224a6785b10e3..60769ea664292a0ac0f7466e33cacae1010277c3 100644
--- a/solvers/IncNavierStokesSolver/Tests/BercovierEngelman.xml
+++ b/solvers/IncNavierStokesSolver/Tests/BercovierEngelman.xml
@@ -24,9 +24,13 @@
<I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme" />
<I PROPERTY="EQTYPE" VALUE="UnsteadyStokes" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow2D_bcsfromfiles.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow2D_bcsfromfiles.xml
index bdea94e6a3363e8d150782a3b579c53a820ce092..6d8a8acc47a86cfcb0bbd02e74cb2259e2b9fa9e 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow2D_bcsfromfiles.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow2D_bcsfromfiles.xml
@@ -11,11 +11,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="solvertype" VALUE="VelocityCorrectionScheme"/>
<I PROPERTY="Projection" VALUE="Galerkin" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow3D_infTurb.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow3D_infTurb.xml
index 6238b849f842c0fb5b482205ce760d00c5e8a41b..97063a5a3bb4a4e4e7899001c1055a69c454c2d8 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow3D_infTurb.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow3D_infTurb.xml
@@ -36,9 +36,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 80 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FFT.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FFT.xml
index 20d1d52242b23fcc2264b58b68582bb0de10dcb6..2ddb6a6df18e032637a58601369300591323aebe 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FFT.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FFT.xml
@@ -12,11 +12,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
<I PROPERTY="USEFFT" VALUE="FFTW"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FFT_ConOBC.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FFT_ConOBC.xml
index d9f207b8aa74a7667780fa28a68d1f3243850909..027e4a2682eae3d2f5c25b9ed1d636ea7376f65f 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FFT_ConOBC.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FFT_ConOBC.xml
@@ -13,11 +13,15 @@
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
<I PROPERTY="GlobalSysSoln" VALUE="DirectStaticCond"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
<I PROPERTY="USEFFT" VALUE="FFTW"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FlowrateExplicit_MVM.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FlowrateExplicit_MVM.xml
index ac61d554b5c355388c138b86eac091db5f0ae403..bc4296b04641a79ede87091a10cd2babec962b86 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FlowrateExplicit_MVM.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_FlowrateExplicit_MVM.xml
@@ -11,10 +11,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Flowrate_MVM.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Flowrate_MVM.xml
index fcfc9113f71789cd60ca046f1399e660d19ecc8c..be93cd8c056319276cbb9f7e7bf6fc7b4d33d221 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Flowrate_MVM.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Flowrate_MVM.xml
@@ -9,10 +9,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Parallel_mode1.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Parallel_mode1.xml
index 9c803a067d92af2e31b8dac037b40dde7e64128a..e376b4a587cb451da1f534a785a9c600bf0d12d9 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Parallel_mode1.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Parallel_mode1.xml
@@ -12,10 +12,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Parallel_mode2.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Parallel_mode2.xml
index b1ae6180c1a76c1d791cfa4815c4625b282882db..f44fd98d1c80a8f471408df4fdb9c2d8503f85a4 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Parallel_mode2.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_Parallel_mode2.xml
@@ -12,10 +12,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_bcsfromfiles.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_bcsfromfiles.xml
index bd4c5457baeb75c07bc99d24c88bcbd274ab04fd..577c053921cf915c0b37b8053bc44ff347cf5477 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_bcsfromfiles.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_bcsfromfiles.xml
@@ -12,10 +12,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_pRef.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_pRef.xml
index 65472ff580cfe4e5c3bc87a31106f1c3f24d464c..bc177f46ce329941eb9d3bdfca6f4d9393e5c2db 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_pRef.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH1D_pRef.xml
@@ -62,10 +62,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH2D_FFT.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH2D_FFT.xml
index 4fa914281372f0aef4d0e71c0e1116fd5abe539c..283b15a90b54136d838d9224895325332a4b1936 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH2D_FFT.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH2D_FFT.xml
@@ -38,11 +38,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/>
<I PROPERTY="HOMOGENEOUS" VALUE="2D"/>
<I PROPERTY="USEFFT" VALUE="FFTW"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH2D_MVM.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH2D_MVM.xml
index 25edfd5d5d6eafc424cc99e3898ae9acc4ef00a7..d991d457e1545d225f6546b5b1ac696b4d08bace 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH2D_MVM.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_3DH2D_MVM.xml
@@ -38,10 +38,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/>
<I PROPERTY="HOMOGENEOUS" VALUE="2D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_Accelerate.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_Accelerate.xml
index 351fb447b7881dd60930f1a1edb56a009b0e7f7b..52b248d84e4b7b6200c2720938055ae491037c82 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_Accelerate.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_Accelerate.xml
@@ -14,9 +14,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.1 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_LinNS_m8.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_LinNS_m8.xml
index 88474c4e4921e9b65f6032041c514a321501bc08..1ad4ce49abcb670d22db2e0acbd994ac84b480f4 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_LinNS_m8.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_LinNS_m8.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_Standard_BodyForce.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_Standard_BodyForce.xml
index c5196de8e0fa776c7118094fac6a0d8800ae9782..fd284ada10e9e53967e355693a36ae67537ff9f2 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_Standard_BodyForce.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_Standard_BodyForce.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_Tri_Lagrange.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_Tri_Lagrange.xml
index 0366b065e5205582b3c72b1ad254600406b10602..7f055aefd4cd39dc81de8f22bbce5d826c2595e6 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_Tri_Lagrange.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_Tri_Lagrange.xml
@@ -26,9 +26,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_V8P7_Avg.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_V8P7_Avg.xml
index 88eef16d5defbdd151edb86187c784d07cadd4f7..619edcf5f763a4afde10273e3c18d33e771d20af 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_V8P7_Avg.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_V8P7_Avg.xml
@@ -14,9 +14,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_ConOBC.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_ConOBC.xml
index 2a93e4c4d60c9a1687e4defd32ee5925e64f443c..d7e9fb5ecbe268d0550d648b8c707264a2395340 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_ConOBC.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_ConOBC.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.004 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_SKS.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_SKS.xml
index c205b3685f01d3f580101db4d5b5d37a4ef62379..bdea641611a7812ddb6be11991e6f21fd5039f3b 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_SKS.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_SKS.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="SkewSymmetric" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_VCSWeakPress.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_VCSWeakPress.xml
index ac21cd669b8e344fbe14c2d79e68faa7f5efab97..79667a3c8ea919fad70040f55f0a88612ca8f798 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_VCSWeakPress.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_VCSWeakPress.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.004 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_VCSWeakPress_ConOBC.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_VCSWeakPress_ConOBC.xml
index 4e0f1be6315c15d6929f8d38f643dce8f5b03283..d2e75d2b826357d73fd11ec540422c08c09f0a58 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_VCSWeakPress_ConOBC.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_VCSWeakPress_ConOBC.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.004 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_abstol.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_abstol.xml
index c84e570b54e500a4ef388e53a3950109097a28d2..892d179214b1c371683f31ebc35f195989584dfb 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_abstol.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_abstol.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v">
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_par.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_par.xml
index 850854d5bf7b5ac2d0b7904ab6dd074ed08321b4..7bdca6d54c215cfed57e418996bc832a78178120 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_par.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m3_par.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8.xml
index e0762f2dc18257ebced17d4a1d6965af8688bd62..aacee90c50caa103e7c251cd34b2fee2861f8f9a 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8.xml
@@ -14,9 +14,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_BodyForce.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_BodyForce.xml
index e368f63bf4e51cf360d16c79b34bc9efe40f60bf..3fc7f712fb56927f30f11a2a577ab027a88c1618 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_BodyForce.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_BodyForce.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_Flowrate.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_Flowrate.xml
index e8baa5ed3050c9b3077dab455a57b105caa985d2..24e5fa3732e0d2db4a6a582f5180185129a2bb51 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_Flowrate.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_Flowrate.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_singular.xml b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_singular.xml
index ec7af86164f91c28670c919e799c93c55b375f76..847004f5914e79c8e3c49ea6f31e7903195f0e89 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_singular.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanFlow_m8_singular.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanStabilityMaskFunc.xml b/solvers/IncNavierStokesSolver/Tests/ChanStabilityMaskFunc.xml
index c9d11431c96c0b50b4bd48f1144ee4aef668aff1..0b9bbd3497396e2cbe3673fa7995fa404717a052 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanStabilityMaskFunc.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanStabilityMaskFunc.xml
@@ -256,12 +256,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Direct" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="InitialVector" VALUE="Random" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
-
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.007 </P>
<P> NumSteps = 20 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanStability_Coupled.xml b/solvers/IncNavierStokesSolver/Tests/ChanStability_Coupled.xml
index f31fbf7abed9b77c8d9a7fed768e3872701ddbac..a9723b9c9fb40a40e2b9960b3db5ffc019e8c8b3 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanStability_Coupled.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanStability_Coupled.xml
@@ -250,12 +250,16 @@
<I PROPERTY="EQTYPE" VALUE="SteadyLinearisedNS" />
<I PROPERTY="EvolutionOperator" VALUE="Direct" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="Driver" VALUE="Arpack" />
<I PROPERTY="ArpackProblemType" VALUE="LargestImag" />
<I PROPERTY="InitialVector" VALUE="Random" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 500 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChanStability_adj_Ar.xml b/solvers/IncNavierStokesSolver/Tests/ChanStability_adj_Ar.xml
index 0d1e4f50325e633b20e45928a84ca0dc31344d71..7a84ab26b9c0ba720b40445d431a3d6ad55d2880 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChanStability_adj_Ar.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChanStability_adj_Ar.xml
@@ -247,11 +247,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Adjoint" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Driver" VALUE="Arpack" />
<I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.007 </P>
<P> NumSteps = 20 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChannelFlow2D.xml b/solvers/IncNavierStokesSolver/Tests/ChannelFlow2D.xml
index 850854d5bf7b5ac2d0b7904ab6dd074ed08321b4..7bdca6d54c215cfed57e418996bc832a78178120 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChannelFlow2D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChannelFlow2D.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChannelFlow3D.xml b/solvers/IncNavierStokesSolver/Tests/ChannelFlow3D.xml
index ab2b3e9c7803497e4178b8ba3cb61519a102636b..95e3db653b124cfe6e49cdc1a2f22b4812e66656 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChannelFlow3D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChannelFlow3D.xml
@@ -10,9 +10,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChannelFlowQuasi3D.xml b/solvers/IncNavierStokesSolver/Tests/ChannelFlowQuasi3D.xml
index 434e025d8467ba24fe2fa225cd81c5099a80ddc1..c31edcc72b634133f5adc0bf99eedaf147ebc13c 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChannelFlowQuasi3D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChannelFlowQuasi3D.xml
@@ -12,10 +12,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChannelFlow_Heating_FlowRate.xml b/solvers/IncNavierStokesSolver/Tests/ChannelFlow_Heating_FlowRate.xml
index 3c4e03d1d75ade7104df0b050185ee1cb4fadfac..f76df9d7a1bd13d9deab8f91d0a35daf23a4333d 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChannelFlow_Heating_FlowRate.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChannelFlow_Heating_FlowRate.xml
@@ -11,13 +11,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <!-- <I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond" />-->
- <!-- <I PROPERTY="GlobalSysSoln" VALUE="DirectMultiLevelStaticCond" /> -->
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="SPECTRALHPDEALIASING" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<!-- Need to pick Delta t strategically, dont want CFL number to be too large! -->
<P> TimeStep = 1e-2 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChannelSpongeLNSE.xml b/solvers/IncNavierStokesSolver/Tests/ChannelSpongeLNSE.xml
index 1953615e5224108af2a75d4c358f2a28ee22a9df..b643c77b475a542344130e8bec572889b7aa11a2 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChannelSpongeLNSE.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChannelSpongeLNSE.xml
@@ -247,9 +247,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Direct" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChannelSpongeNSE.xml b/solvers/IncNavierStokesSolver/Tests/ChannelSpongeNSE.xml
index 9b918a752ae5e9e7c7a21c311408612788393539..b86cb5232951425d693860fe0b159d5d975190f6 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChannelSpongeNSE.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChannelSpongeNSE.xml
@@ -247,9 +247,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChannelStability.xml b/solvers/IncNavierStokesSolver/Tests/ChannelStability.xml
index 5c5cef012e6f8b9a99e40cf6ed6539fcd7a7e67a..8325cf75fff6ea088f5ca76644ef837312a1d568 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChannelStability.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChannelStability.xml
@@ -256,12 +256,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Direct" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="InitialVector" VALUE="Random" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
-
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.007 </P>
<P> NumSteps = 20 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ChannelStabilityAdjoint.xml b/solvers/IncNavierStokesSolver/Tests/ChannelStabilityAdjoint.xml
index 27822b45815f88979cb1621c4918e06930b0e619..653a52e02621a473340fcbbeaa8de6b53c67d88d 100644
--- a/solvers/IncNavierStokesSolver/Tests/ChannelStabilityAdjoint.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ChannelStabilityAdjoint.xml
@@ -247,10 +247,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Adjoint" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 70 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Channel_Flow_3modes_rad.xml b/solvers/IncNavierStokesSolver/Tests/Channel_Flow_3modes_rad.xml
index c2fd0804faeae6aae4b907244231a5337ce7ccdb..4a5f8e5423c0135f4c285910f73f31bc3d4a3c59 100644
--- a/solvers/IncNavierStokesSolver/Tests/Channel_Flow_3modes_rad.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Channel_Flow_3modes_rad.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Couette_3DH2D.xml b/solvers/IncNavierStokesSolver/Tests/Couette_3DH2D.xml
index d1b40b15359cc9301e904d9784adc952073cea77..b90221f7951dd1a8b7b7922c1eea76c2ec0d6fb2 100644
--- a/solvers/IncNavierStokesSolver/Tests/Couette_3DH2D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Couette_3DH2D.xml
@@ -38,10 +38,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/>
<I PROPERTY="HOMOGENEOUS" VALUE="2D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.1 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/CylFlow2DMov_SPM.xml b/solvers/IncNavierStokesSolver/Tests/CylFlow2DMov_SPM.xml
index a8f60db0d14be09feeadadffefd3b2feb12bde56..e215eba5464642c7ff2c53937cfe8cef33639493 100644
--- a/solvers/IncNavierStokesSolver/Tests/CylFlow2DMov_SPM.xml
+++ b/solvers/IncNavierStokesSolver/Tests/CylFlow2DMov_SPM.xml
@@ -26,13 +26,16 @@
<CONDITIONS>
<SOLVERINFO>
<I PROPERTY="SolverType" VALUE="SmoothedProfileMethod" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Eqtype" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="ForceBoundary" VALUE="False" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 20 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/CylFlow2D_CheckpointFilter_Hdf5.xml b/solvers/IncNavierStokesSolver/Tests/CylFlow2D_CheckpointFilter_Hdf5.xml
index 7c44c85dbec02967af7547490f398302a61ec5d8..d280dcf9b344f8a19a2b083ef28ed531e5c5e8f2 100644
--- a/solvers/IncNavierStokesSolver/Tests/CylFlow2D_CheckpointFilter_Hdf5.xml
+++ b/solvers/IncNavierStokesSolver/Tests/CylFlow2D_CheckpointFilter_Hdf5.xml
@@ -31,9 +31,12 @@
<I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 20 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/CylFlow2D_FieldConvertFilter_Hdf5.xml b/solvers/IncNavierStokesSolver/Tests/CylFlow2D_FieldConvertFilter_Hdf5.xml
index e39530b9ee8c3631b89fb703ec8747caed9608bd..3018eb168acdb0342f585570356f173334753471 100644
--- a/solvers/IncNavierStokesSolver/Tests/CylFlow2D_FieldConvertFilter_Hdf5.xml
+++ b/solvers/IncNavierStokesSolver/Tests/CylFlow2D_FieldConvertFilter_Hdf5.xml
@@ -31,9 +31,12 @@
<I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 20 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/CylFlow2D_SPM.xml b/solvers/IncNavierStokesSolver/Tests/CylFlow2D_SPM.xml
index 05dda4f0072ee6ac440864884288ed6b5df3844a..b009ea9a01b68c5b7e0374a4bcbee87698a590ad 100644
--- a/solvers/IncNavierStokesSolver/Tests/CylFlow2D_SPM.xml
+++ b/solvers/IncNavierStokesSolver/Tests/CylFlow2D_SPM.xml
@@ -26,13 +26,16 @@
<CONDITIONS>
<SOLVERINFO>
<I PROPERTY="SolverType" VALUE="SmoothedProfileMethod" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Eqtype" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="ForceBoundary" VALUE="False" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 20 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/CylFlow3DH1D_SPM.xml b/solvers/IncNavierStokesSolver/Tests/CylFlow3DH1D_SPM.xml
index 82902a05094a4fe0dacc0a959a3f3d9980154f07..968ec0ec5ea0187e14ed8c1c8e8ca3eec0adbdc0 100644
--- a/solvers/IncNavierStokesSolver/Tests/CylFlow3DH1D_SPM.xml
+++ b/solvers/IncNavierStokesSolver/Tests/CylFlow3DH1D_SPM.xml
@@ -26,7 +26,6 @@
<CONDITIONS>
<SOLVERINFO>
<I PROPERTY="SolverType" VALUE="SmoothedProfileMethod" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Eqtype" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Continuous" />
@@ -34,6 +33,10 @@
<I PROPERTY="Homogeneous" VALUE="1D" />
<I PROPERTY="ForceBoundary" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 20 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/CylFlow_HomoStrip.xml b/solvers/IncNavierStokesSolver/Tests/CylFlow_HomoStrip.xml
index e5a9602ce76ad067f0486cad690c899550a0e07b..ad9a0226872702aaa0c2e26bb99157b6d8757100 100644
--- a/solvers/IncNavierStokesSolver/Tests/CylFlow_HomoStrip.xml
+++ b/solvers/IncNavierStokesSolver/Tests/CylFlow_HomoStrip.xml
@@ -1827,7 +1827,6 @@
<I PROPERTY="SolverType" VALUE="VCSMapping" />
<I PROPERTY="EvolutionOperator" VALUE="SkewSymmetric" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
<I PROPERTY="USEFFT" VALUE="FFTW"/>
<I PROPERTY="HomoStrip" VALUE="True"/>
@@ -1835,6 +1834,10 @@
<I PROPERTY="SupportType" VALUE="Free-Free"/>
<I PROPERTY="FictitiousMassMethod" VALUE="True"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 5 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/CylFlow_MovBody.xml b/solvers/IncNavierStokesSolver/Tests/CylFlow_MovBody.xml
index 6724990a820a991972f010afe5da6df0bb281231..d79c02b8946416442eba2ea5fe739d2fe1d527ee 100644
--- a/solvers/IncNavierStokesSolver/Tests/CylFlow_MovBody.xml
+++ b/solvers/IncNavierStokesSolver/Tests/CylFlow_MovBody.xml
@@ -1827,13 +1827,16 @@
<I PROPERTY="SolverType" VALUE="VCSMapping" />
<I PROPERTY="EvolutionOperator" VALUE="SkewSymmetric" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
<I PROPERTY="USEFFT" VALUE="FFTW"/>
<I PROPERTY="VibrationType" VALUE="Constrained"/>
<I PROPERTY="SupportType" VALUE="Free-Free"/>
<I PROPERTY="FictitiousMassMethod" VALUE="True"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 5 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/CylFlow_Mov_mapping.xml b/solvers/IncNavierStokesSolver/Tests/CylFlow_Mov_mapping.xml
index 26e13d379dc6eaf7abccf06f50590cdae0deea96..f4317b5d80f92dda31238dc581a70e9dbdc64b39 100644
--- a/solvers/IncNavierStokesSolver/Tests/CylFlow_Mov_mapping.xml
+++ b/solvers/IncNavierStokesSolver/Tests/CylFlow_Mov_mapping.xml
@@ -1827,8 +1827,11 @@
<I PROPERTY="SolverType" VALUE="VCSMapping" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/CylFlow_adaptiveP.xml b/solvers/IncNavierStokesSolver/Tests/CylFlow_adaptiveP.xml
index a00ba8f8f6f2292806c5116c91fb483dd7719a48..2cf80b20967568129e57d3b7cd7d11877f215eeb 100644
--- a/solvers/IncNavierStokesSolver/Tests/CylFlow_adaptiveP.xml
+++ b/solvers/IncNavierStokesSolver/Tests/CylFlow_adaptiveP.xml
@@ -31,9 +31,12 @@
<I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Adaptive" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 5 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Cyl_AdaptiveSFD.xml b/solvers/IncNavierStokesSolver/Tests/Cyl_AdaptiveSFD.xml
index bda3ca7092c1e90ca35e55cc3dc134879eb429b0..3c39d3feacb2563c724b3f53daf76a32ff322aec 100644
--- a/solvers/IncNavierStokesSolver/Tests/Cyl_AdaptiveSFD.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Cyl_AdaptiveSFD.xml
@@ -8,10 +8,13 @@
<I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/>
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="Driver" VALUE="SteadyState"/>
<I PROPERTY="EvolutionOperator" VALUE="AdaptiveSFD"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 0.5/TimeStep </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Cyl_AdaptiveSFD_LinNS.xml b/solvers/IncNavierStokesSolver/Tests/Cyl_AdaptiveSFD_LinNS.xml
index a95e4de37ca05f4e38615fd1e069dadb1343dd0a..6fd84a1ae5437c8e78d70c4780075375c2937d55 100644
--- a/solvers/IncNavierStokesSolver/Tests/Cyl_AdaptiveSFD_LinNS.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Cyl_AdaptiveSFD_LinNS.xml
@@ -8,10 +8,13 @@
<I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/>
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="Driver" VALUE="SteadyState"/>
<I PROPERTY="EvolutionOperator" VALUE="AdaptiveSFD"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 1.0/TimeStep </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/FlapAirfoil_3DH1D_par.xml b/solvers/IncNavierStokesSolver/Tests/FlapAirfoil_3DH1D_par.xml
index 39cf39d648f4ae1e507d26211213dba4ebc3ec17..064ea89c28907a47d9adb5ea822f188e61cced0e 100644
--- a/solvers/IncNavierStokesSolver/Tests/FlapAirfoil_3DH1D_par.xml
+++ b/solvers/IncNavierStokesSolver/Tests/FlapAirfoil_3DH1D_par.xml
@@ -13,12 +13,16 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="SpectralVanishingViscositySpectralHP" VALUE="DGKernel" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> Re = 400. </P>
<P> freq = 1/PI </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/FreeFallCylc.xml b/solvers/IncNavierStokesSolver/Tests/FreeFallCylc.xml
index d32f995d921de8e7f376e834a990ebc8e5055981..8ff32e20c9329b3d682832861196d0df866e1106 100644
--- a/solvers/IncNavierStokesSolver/Tests/FreeFallCylc.xml
+++ b/solvers/IncNavierStokesSolver/Tests/FreeFallCylc.xml
@@ -12,11 +12,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="SpectralVanishingViscositySpectralHP" VALUE="DGKernel" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> rhos = 1.01 </P>
<P> Ga = 138. </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/HM.xml b/solvers/IncNavierStokesSolver/Tests/HM.xml
index f6e33a9dc92541ab0f123f03c44b01932200aef3..1c12aa99aad93d9e8334d2cbc00d1b90acfe0b18 100644
--- a/solvers/IncNavierStokesSolver/Tests/HM.xml
+++ b/solvers/IncNavierStokesSolver/Tests/HM.xml
@@ -15,9 +15,13 @@
<I PROPERTY="Driver" VALUE= "Standard" />
<I PROPERTY="ModeType" VALUE= "HalfMode" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 300</P>
diff --git a/solvers/IncNavierStokesSolver/Tests/HM_Adj.xml b/solvers/IncNavierStokesSolver/Tests/HM_Adj.xml
index d2bdd2a92e118c6ddd1851ae35abec52a9d80ef1..2d6f68f4b4de6b3d2eb613222d2342cdcd440b36 100644
--- a/solvers/IncNavierStokesSolver/Tests/HM_Adj.xml
+++ b/solvers/IncNavierStokesSolver/Tests/HM_Adj.xml
@@ -15,9 +15,13 @@
<I PROPERTY="Driver" VALUE= "Standard" />
<I PROPERTY="ModeType" VALUE= "HalfMode" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 300</P>
diff --git a/solvers/IncNavierStokesSolver/Tests/HM_Adj_SingleMode_files.xml b/solvers/IncNavierStokesSolver/Tests/HM_Adj_SingleMode_files.xml
index c6ebc1c7ebade8d47c0c27b243efa839c0dfcefc..fbb9c7cd1ae1df5ad7d40075ac0be25aedb8ffcb 100644
--- a/solvers/IncNavierStokesSolver/Tests/HM_Adj_SingleMode_files.xml
+++ b/solvers/IncNavierStokesSolver/Tests/HM_Adj_SingleMode_files.xml
@@ -15,9 +15,13 @@
<I PROPERTY="Driver" VALUE= "Standard" />
<I PROPERTY="ModeType" VALUE= "SingleMode" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 3</P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Hex_Kovasnay_SubStep.xml b/solvers/IncNavierStokesSolver/Tests/Hex_Kovasnay_SubStep.xml
index 72bccea67ee589d55e56a3941f08cbb0b2898df9..0688e45b691e5098abe031001c9f506ef393c9af 100644
--- a/solvers/IncNavierStokesSolver/Tests/Hex_Kovasnay_SubStep.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Hex_Kovasnay_SubStep.xml
@@ -155,10 +155,15 @@
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Mixed_CG_Discontinuous" />
<I PROPERTY="SubSteppingScheme" VALUE="True" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BackwardEuler" />
<I PROPERTY="Extrapolation" VALUE="SubStepping" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Backward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.005 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3.xml b/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3.xml
index dc13b6fd9b3468f73fb90a4de697e9f37e8e857a..6080b339c31aca05a8317956553851eeb3fb6f18 100644
--- a/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3.xml
@@ -156,9 +156,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_Flowrate.xml b/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_Flowrate.xml
index a4d9ae16e9faf4ffbba79618670826b3b59a9950..2429717a0ea41722cea15577ace1011e6f7e9f30 100644
--- a/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_Flowrate.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_Flowrate.xml
@@ -154,9 +154,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 500 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_par.xml b/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_par.xml
index f6735d78892b63b1e6e4eb60e7e247f590ab0128..1310204aa00ecf1aa1b5c5943df1b1a448d514f9 100644
--- a/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_par.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_par.xml
@@ -156,9 +156,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_srhs.xml b/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_srhs.xml
index 581e0cd696b103f46fd5bc7406c0430c18cf2851..abeb0017d03b19e08c387a88992139e95546659b 100644
--- a/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_srhs.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Hex_channel_m3_srhs.xml
@@ -154,10 +154,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Hex_channel_m6_nodalRestart.xml b/solvers/IncNavierStokesSolver/Tests/Hex_channel_m6_nodalRestart.xml
index 865d705cc98e1d2c90169a2126b7544cdcff03bb..bb4bda7169db40a092ea51c2062df6130b462d32 100644
--- a/solvers/IncNavierStokesSolver/Tests/Hex_channel_m6_nodalRestart.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Hex_channel_m6_nodalRestart.xml
@@ -154,9 +154,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Hex_channel_varP.xml b/solvers/IncNavierStokesSolver/Tests/Hex_channel_varP.xml
index 04361fab01ab61581dc85dae14328f8c5f3e1864..a4ccdca6fb54b15cdeb9f688714678205e105468 100644
--- a/solvers/IncNavierStokesSolver/Tests/Hex_channel_varP.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Hex_channel_varP.xml
@@ -160,9 +160,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_MVM_FFTW_Consistency.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_MVM_FFTW_Consistency.xml
index 409f1cce0f93770dc56ca7ccb3dd40c43120f560..1f00613b19561fdb2a39b9f163c85b4a3970eb03 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_MVM_FFTW_Consistency.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_MVM_FFTW_Consistency.xml
@@ -12,11 +12,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM.xml
index ade3d785d5507c1043d1f9f8a4330ebda688de76..67fee3138a970216704a9deedf647c27400ac958 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM.xml
@@ -12,10 +12,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_Deal.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_Deal.xml
index 1b4d32ab1b2d7f27a9158b6dc87ae93078137103..2ac94060cfb031d74ce7f2571328957bccc19c92 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_Deal.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_Deal.xml
@@ -12,11 +12,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="SpectralHPDealiasing" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_SVVHomo1D.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_SVVHomo1D.xml
index ca8fad1c17d0e5b35e49897834843216160ea7e1..b266b3e1ed328dd2ec5cd897d4a6b61681aeaf03 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_SVVHomo1D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_SVVHomo1D.xml
@@ -12,11 +12,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="SpectralVanishingViscosityHomo1D" VALUE="True" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_hdf5.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_hdf5.xml
index 9187ec6a65b49f0817338bdc87c08ccaebc4e293..c9a68ab37d9123f2c4f82b891f609aaa38d86154 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_hdf5.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_MVM_hdf5.xml
@@ -15,10 +15,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_SKS_MVM.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_SKS_MVM.xml
index 5219c0371fa535846e919c2c1226f75c020414f0..b18f641372a117c45d3bca29bc97dbf1dc647f55 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_SKS_MVM.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_20modes_SKS_MVM.xml
@@ -12,10 +12,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="SkewSymmetric" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_6modes_FFTW_MixedDeal.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_6modes_FFTW_MixedDeal.xml
index 7d9e7a85dc35d47049422935ba65e6117cfbe9ed..a27d808a23ac76bb7f4ae3cd556c49a11406f7fe 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_6modes_FFTW_MixedDeal.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P5_6modes_FFTW_MixedDeal.xml
@@ -12,13 +12,17 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
<I PROPERTY="DEALIASING" VALUE="True"/>
<I PROPERTY="SpectralHPDealiasing" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_16modes_Mapping-explicit.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_16modes_Mapping-explicit.xml
index e93f1b97e9a0b73a9a2046032adf2415879caedf..79f57f9550eed6dbad7694bc6ba6873ddd587a04 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_16modes_Mapping-explicit.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_16modes_Mapping-explicit.xml
@@ -12,11 +12,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="USEFFT" VALUE="FFTW"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10</P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_16modes_Mapping-implicit.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_16modes_Mapping-implicit.xml
index d1327559701589ec80fbabb0df8d73e20c765ba5..cb5ea0f53c171fb5e298d820ef6487baba9795ef 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_16modes_Mapping-implicit.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_16modes_Mapping-implicit.xml
@@ -12,13 +12,17 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="USEFFT" VALUE="FFTW"/>
<I PROPERTY="MappingImplicitPressure" VALUE="TRUE"/> <!-- Default = FALSE -->
<I PROPERTY="MappingImplicitViscous" VALUE="TRUE"/> <!-- Default = FALSE -->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10</P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_8modes_FFTW_VCSWeakPressure.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_8modes_FFTW_VCSWeakPressure.xml
index 30209eb295c4f6bd7bcfffefa134222f1e67c8d1..053b125781898ec0e692c1c4a5a77f4ac73184ec 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_8modes_FFTW_VCSWeakPressure.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_P8_8modes_FFTW_VCSWeakPressure.xml
@@ -56,11 +56,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Preconditioner" VALUE="Null"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v,w,p">
<I PROPERTY="IterativeSolverTolerance" VALUE="1e-14"/>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_adaptive_16modes_FFTW_Mapping.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_adaptive_16modes_FFTW_Mapping.xml
index 824ed64d2eeff282e9afce5468037dcc1d96ae20..c2dd95a9ddb90beabaeb892d3949f35c28ab340e 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_adaptive_16modes_FFTW_Mapping.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH1D_adaptive_16modes_FFTW_Mapping.xml
@@ -12,13 +12,17 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
<I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond"/>
<I PROPERTY="USEFFT" VALUE="FFTW"/>
<I PROPERTY="Driver" VALUE="Adaptive"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.005 </P>
<P> NumSteps = 10</P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xy_FFT.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xy_FFT.xml
index 328c7d642b7d04b1b7beea4b01c5152a151cc872..3c346f4c5818f7bd8fc58e3020e8c0b101181a35 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xy_FFT.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xy_FFT.xml
@@ -12,11 +12,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="2D" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xy_FFT_MovRefFrame.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xy_FFT_MovRefFrame.xml
index 5657c456cf02bf99a2ab4b689cf2ec99b7e4799a..7e52b27b1973e6e59bee5b32641ac89cac713744 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xy_FFT_MovRefFrame.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xy_FFT_MovRefFrame.xml
@@ -12,11 +12,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="HOMOGENEOUS" VALUE="2D" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xz_FFT.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xz_FFT.xml
index 1f792ee3a55a10937a6f34495b9f012638512147..0e42c555a2e81a582cbe37fde50bfe4097a29e6c 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xz_FFT.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_3DH2D_xz_FFT.xml
@@ -12,11 +12,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="2D" />
<I PROPERTY="USEFFT" VALUE="FFTW" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_GMRES_StaticCond_Restart.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_GMRES_StaticCond_Restart.xml
index 51e9a9e3521e5bfdc9b8aa86c0ef3e8d2d467d22..1d2528c13658dfd65a2eb75ff64fe49e9ebd594b 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_GMRES_StaticCond_Restart.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_GMRES_StaticCond_Restart.xml
@@ -67,9 +67,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v,p">
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_SubStep_2order.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_SubStep_2order.xml
index a42ba31255375adf9a689c231f488c911175d933..8109446c9fce4800b4fa4f1d4aac2e593a18fe91 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_SubStep_2order.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_SubStep_2order.xml
@@ -13,10 +13,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Mixed_CG_Discontinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BDFImplicitOrder2" />
<I PROPERTY="Extrapolation" VALUE="SubStepping" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> BDFImplicit </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.05 </P>
<P> NumSteps = 250 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_SubStep_2order_VCSWeakPress.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_SubStep_2order_VCSWeakPress.xml
index 1b0e3282b3d0133f5550ebc99eaf7ee14ecb1b09..9f0e9e2c573b7cfb6584f93bff29071756dd6f07 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_SubStep_2order_VCSWeakPress.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_SubStep_2order_VCSWeakPress.xml
@@ -13,10 +13,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Mixed_CG_Discontinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BDFImplicitOrder2" />
<I PROPERTY="Extrapolation" VALUE="SubStepping" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> BDFImplicit </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.05 </P>
<P> NumSteps = 250 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_Tet_Curved.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_Tet_Curved.xml
index 17cd1ce7e2869ac68e997c134e47079ca2faa5d3..e903459b4508b9bbae7268585673cd60ac8dd625 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_Tet_Curved.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_Tet_Curved.xml
@@ -258,16 +258,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
- <!-- This option would turn on Semi-Implicit GJP Stabilisation where we treat part of the operator implicitly
- <I PROPERTY="GJPStabilisation" VALUE="SemiImplicit" />
- -->
- <!-- This option turns on explicit GJP Stabilisation
- <I PROPERTY="GJPStabilisation" VALUE="Explicit" />
- <I PROPERTY="GJPNormalVelocity" VALUE="True" />
- -->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v,w,p">
<I PROPERTY="IterativeSolverTolerance" VALUE="1e-14"/>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_VCSWeakPressure_TaylorHood.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_VCSWeakPressure_TaylorHood.xml
index 17ad1b88fc616157e553a1ca5b7832940f6f24bd..01ad98189f3ca10b197f28cb13510f110a809e9a 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_VCSWeakPressure_TaylorHood.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_VCSWeakPressure_TaylorHood.xml
@@ -14,10 +14,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="GlobalSysSoln" VALUE="DirectFull"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_expFromFile.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_expFromFile.xml
index 53c65fd957ee261df211001fd25f3f8a3c288ffb..591dfc0f6df10114dc86a5e8e183f361ba59db46 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_expFromFile.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_expFromFile.xml
@@ -13,11 +13,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond" />
<I PROPERTY="WEIGHTPARTITIONS" VALUE="DOF" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_3DH1D_absorption.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_3DH1D_absorption.xml
index c1bca557b4483090b1e79bcdfcaf404b8ad55f2a..e537fda0b1d96564d048cdeb3fd8543c5ecf161d 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_3DH1D_absorption.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_3DH1D_absorption.xml
@@ -58,10 +58,14 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.005 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_QuadTri_VCSImplicit.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_QuadTri_VCSImplicit.xml
index 913b37e9918440dead0a9e09360770050199716d..c037f6c1e3722dc17ae37f7ae3d7b533aa033866 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_QuadTri_VCSImplicit.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_QuadTri_VCSImplicit.xml
@@ -11,12 +11,16 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond"/>
<I PROPERTY="Preconditioner" VALUE="Null"/>
<I PROPERTY="LinSysIterSolver" VALUE="GMRES"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v,p">
<I PROPERTY="IterativeSolverTolerance" VALUE="1e-14"/>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_VCSImplicit.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_VCSImplicit.xml
index 6b6181efc9f9fa726d9b48b9107bb9a9625799f6..f664fa49f1c0ba2514fcc7f13b1df8184fd7bdae 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_VCSImplicit.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_VCSImplicit.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.4 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_VCSImplicit_MatFree.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_VCSImplicit_MatFree.xml
index e49889e2f5abd13c026030df560efd67a731ae58..4077da13234c5715728c614e20f2703135d7d08f 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_VCSImplicit_MatFree.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_VCSImplicit_MatFree.xml
@@ -70,9 +70,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.4 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_taylorHood_VCSImplicit.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_taylorHood_VCSImplicit.xml
index 396db566fafc32e00f2d1739eebed5f8856d0f9a..815411c6f5bb95992b05e1c101e1452dc78b7f47 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_taylorHood_VCSImplicit.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_taylorHood_VCSImplicit.xml
@@ -14,9 +14,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v">
<I PROPERTY="GlobalSysSoln" VALUE="DirectFull" />
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_taylorHood_VCSImplicitLoc.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_taylorHood_VCSImplicitLoc.xml
index b1034d540ede48eff2cced558fee896d69af2df3..59236e1842232e30d3ea36917f7154e8d1c2741b 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_taylorHood_VCSImplicitLoc.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m10_taylorHood_VCSImplicitLoc.xml
@@ -14,9 +14,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v">
<I PROPERTY="GlobalSysSoln" VALUE="DirectFull" />
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3.xml
index 8cf308d867ffdde220e655844297273e10d06022..6c88bf2d3dbcdae052a16e06b56d5972c7f56f88 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3_GJP.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3_GJP.xml
index 14dfe2d41d872d2039f2039cfa8bf2460a48f61b..a6032aa3c56cfab0e74db363ce2e9b2742837033 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3_GJP.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3_GJP.xml
@@ -10,16 +10,18 @@
<CONDITIONS>
<SOLVERINFO>
<I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme" />
- <!--I PROPERTY="SolverType" VALUE="VCSWeakPressure" / The Standard scheme with weak pressure form-->
- <!--I PROPERTY="SolverType" VALUE="VCSImplicit" / The implicit scheme-->
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="GJPStabilisation" VALUE="Explicit" />
<I PROPERTY="GJPNormalVelocity" VALUE="True" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3_gmresZeroInputCheck.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3_gmresZeroInputCheck.xml
index 320fee685ffa1ffd49aa72cb97567a1728eb0b5f..f74c39382edfd6401d95c8547fde471189eb5394 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3_gmresZeroInputCheck.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m3_gmresZeroInputCheck.xml
@@ -56,11 +56,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v,w,p">
<I PROPERTY="IterativeSolverTolerance" VALUE="1e-8"/>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8.xml
index 2bb544f26a480a9ea164f87efa93c97501982499..c3fc0e573926533898c4233385ec0e9ccb76b6b6 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8.xml
@@ -14,9 +14,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_ConOBC.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_ConOBC.xml
index ae570b4fe8a75355bec714462cfb31115a5ae651..ff7d3e8c5f90df7f6eb2ce60bcd16633493ea476 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_ConOBC.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_ConOBC.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_ConOBC_VCSWeakPress.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_ConOBC_VCSWeakPress.xml
index bf38c65b17c95b3f96ccab509d8c49f4c3df20c5..fc290a11bdb7cb9cd1ca0379065dc77a01fc30a1 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_ConOBC_VCSWeakPress.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_ConOBC_VCSWeakPress.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC.xml
index b12b8203be503ad3cce45b40a344ab1db5bc2573..75ae3d45453f981d177282e462e6823e7db5b82a 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC_3D1H.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC_3D1H.xml
index 03c4749ee6cbcbb154c4d652e978595ed2e8d3a3..26917120be79e12f91038eeb1050b2cabe9282bb 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC_3D1H.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC_3D1H.xml
@@ -13,12 +13,16 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
<I PROPERTY="USEFFT" VALUE="FFTW"/>
<I PROPERTY="DEALIASING" VALUE="True"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC_VCSWeakPress.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC_VCSWeakPress.xml
index 85c7eb916554f37f8d8358e4c0742c39ce38329d..90e13e554c3d9ba9c530dd3f22ac47baf344a48a 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC_VCSWeakPress.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_m8_short_HOBC_VCSWeakPress.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_varP.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_varP.xml
index 1dc45005c4e8c767ce3a530febe06a87fa693fe1..2c71ea32c46622669ed6650904686aa23c043daa 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_varP.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_varP.xml
@@ -15,9 +15,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovaFlow_varP_per.xml b/solvers/IncNavierStokesSolver/Tests/KovaFlow_varP_per.xml
index 66ff4a76b4e0c8793194a97425f6e621c7c15997..5c17e1e37ce0eb386f7f6fb0bb3e8778d9c93a6a 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovaFlow_varP_per.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovaFlow_varP_per.xml
@@ -17,9 +17,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/KovasznayFlow2D.xml b/solvers/IncNavierStokesSolver/Tests/KovasznayFlow2D.xml
index 6f431fa762b3bf28914036aaa99cdb0a34fdcebd..ac68270494f332dd559666af1571efeb07544f45 100644
--- a/solvers/IncNavierStokesSolver/Tests/KovasznayFlow2D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/KovasznayFlow2D.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Kovasznay_Flow_3modes.xml b/solvers/IncNavierStokesSolver/Tests/Kovasznay_Flow_3modes.xml
index 96764063cceba737f4e38b30a9096ea25d8f4b0e..20ced873f82741c103dab87b0344ca58b2621bda 100644
--- a/solvers/IncNavierStokesSolver/Tests/Kovasznay_Flow_3modes.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Kovasznay_Flow_3modes.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_Rot_SimpleDomain.xml b/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_Rot_SimpleDomain.xml
index 2e45663bf214f6d614cba33de66aabb71443b463..ae3dec497177a75095f469c37260b83569460543 100644
--- a/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_Rot_SimpleDomain.xml
+++ b/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_Rot_SimpleDomain.xml
@@ -10,12 +10,15 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="DEALIASING" VALUE="True" />
<I PROPERTY="SPECTRALDEALIASING" VALUE="True" />
<I PROPERTY="SPECTRALHPDEALIASING" VALUE="True" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="DGKernel" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 1.0e-3 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_Rot_naca0012.xml b/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_Rot_naca0012.xml
index 35ad39baf0fa5ef95b6b775725c98377195beab3..1841933dac5ee7e766254c180289a98e345c56f1 100644
--- a/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_Rot_naca0012.xml
+++ b/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_Rot_naca0012.xml
@@ -11,9 +11,12 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="DGKernel" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 1.0e-3 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_translation.xml b/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_translation.xml
index 7601b8ab76def334c599b74170bc3785cf182dcc..d03640bda4326f38415c0451955994a795267cbd 100644
--- a/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_translation.xml
+++ b/solvers/IncNavierStokesSolver/Tests/MovingRefFrame_translation.xml
@@ -10,9 +10,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/><!--BDFImplicitOrder2 <-only with substepping -->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/PPF_R15000_3D_VCS.xml b/solvers/IncNavierStokesSolver/Tests/PPF_R15000_3D_VCS.xml
index bad607811286f83c1c0d8d12926fc3bb0cfadaac..d4cc6064daa81ae53b19bc0d91eefae54d9a5829 100644
--- a/solvers/IncNavierStokesSolver/Tests/PPF_R15000_3D_VCS.xml
+++ b/solvers/IncNavierStokesSolver/Tests/PPF_R15000_3D_VCS.xml
@@ -187,11 +187,15 @@
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
<I PROPERTY="ModeType" VALUE="HalfMode"/>
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
<I PROPERTY="InitialVector" VALUE="File" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Perf_ChanFlow_3DH1D_pRef.xml b/solvers/IncNavierStokesSolver/Tests/Perf_ChanFlow_3DH1D_pRef.xml
index e44e3a3d58d90af50f9fef4caca6f2dc39d9ed81..209e470dd56d0076c0085c334590d742ef99e70e 100644
--- a/solvers/IncNavierStokesSolver/Tests/Perf_ChanFlow_3DH1D_pRef.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Perf_ChanFlow_3DH1D_pRef.xml
@@ -62,10 +62,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0005 </P>
<P> NumSteps = 3000 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Perf_ChanStability.xml b/solvers/IncNavierStokesSolver/Tests/Perf_ChanStability.xml
old mode 100755
new mode 100644
index 25ff63b129c52d33a21f74966c7df5fde3431ba3..d5ec9070bbb48855320b879ec7b5df8554ce9381
--- a/solvers/IncNavierStokesSolver/Tests/Perf_ChanStability.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Perf_ChanStability.xml
@@ -256,12 +256,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Direct" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="InitialVector" VALUE="Random" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
-
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 60 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/PhaseSampling.xml b/solvers/IncNavierStokesSolver/Tests/PhaseSampling.xml
index fd189d04ede772cb7c57e9a3e3c9c49d2bfbac73..f4b72a2399bd64cd17623351cac3bb4840cc8980 100644
--- a/solvers/IncNavierStokesSolver/Tests/PhaseSampling.xml
+++ b/solvers/IncNavierStokesSolver/Tests/PhaseSampling.xml
@@ -11,10 +11,14 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
<I PROPERTY="GlobalSysSoln" VALUE="DirectStaticCond" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 1e-2 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/PlungingAirfoil_2D.xml b/solvers/IncNavierStokesSolver/Tests/PlungingAirfoil_2D.xml
index 8c9114167b1a389881c0d85750fb479693098d6e..4c9964322b22a832194b9c61fe3d9affe359a9ff 100644
--- a/solvers/IncNavierStokesSolver/Tests/PlungingAirfoil_2D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/PlungingAirfoil_2D.xml
@@ -12,11 +12,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="SpectralVanishingViscositySpectralHP" VALUE="DGKernel" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> Re = 400. </P>
<P> ampratio = 1. </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/PlungingAirfoil_3DH1D_parBCs.xml b/solvers/IncNavierStokesSolver/Tests/PlungingAirfoil_3DH1D_parBCs.xml
index d6cf23e3513bcefd82ba932b825764a2c75bae00..2864c298520990f1ba5317bbcfd314d03b9d3ba8 100644
--- a/solvers/IncNavierStokesSolver/Tests/PlungingAirfoil_3DH1D_parBCs.xml
+++ b/solvers/IncNavierStokesSolver/Tests/PlungingAirfoil_3DH1D_parBCs.xml
@@ -13,12 +13,16 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="SpectralVanishingViscositySpectralHP" VALUE="DGKernel" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> Re = 400. </P>
<P> ampratio = 1. </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/PointsTracking2D.xml b/solvers/IncNavierStokesSolver/Tests/PointsTracking2D.xml
index 77b10b2c9a7eb943ca259f05a4008e7e5557dc35..33f1cbfc054d4d251409e67ef317ef15a96bf29c 100644
--- a/solvers/IncNavierStokesSolver/Tests/PointsTracking2D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/PointsTracking2D.xml
@@ -13,9 +13,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.1 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/PointsTracking3D.xml b/solvers/IncNavierStokesSolver/Tests/PointsTracking3D.xml
index 43357e6300635269b51ae558e3e7ab22ae6a416a..fa1089181b5465c6a254256ddc214cd409ae4ab5 100644
--- a/solvers/IncNavierStokesSolver/Tests/PointsTracking3D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/PointsTracking3D.xml
@@ -156,9 +156,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.1 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/PointsTracking3DH1D.xml b/solvers/IncNavierStokesSolver/Tests/PointsTracking3DH1D.xml
index 7ecabe3359f1be353a020895aae2ca819f091b9b..6eed0f04da6e26ea07cfbb2d9518fd7f8e77883f 100644
--- a/solvers/IncNavierStokesSolver/Tests/PointsTracking3DH1D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/PointsTracking3DH1D.xml
@@ -12,10 +12,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.1 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/PrismHex_channel_m4.xml b/solvers/IncNavierStokesSolver/Tests/PrismHex_channel_m4.xml
index 682c701d1c885ee0eb1370ef3045f87022bbb19a..56c768124ada0ece665d8350e00a40ac7c0dfd0e 100644
--- a/solvers/IncNavierStokesSolver/Tests/PrismHex_channel_m4.xml
+++ b/solvers/IncNavierStokesSolver/Tests/PrismHex_channel_m4.xml
@@ -43,9 +43,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v,w">
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
diff --git a/solvers/IncNavierStokesSolver/Tests/Prism_channel_m6.xml b/solvers/IncNavierStokesSolver/Tests/Prism_channel_m6.xml
index da3e22e83d5bd140afc2eccabff9b8667f79459e..c3c3e5b592dbe3667deaa9e663643474ce56381f 100644
--- a/solvers/IncNavierStokesSolver/Tests/Prism_channel_m6.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Prism_channel_m6.xml
@@ -194,9 +194,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Prism_channel_m6_dealiasing.xml b/solvers/IncNavierStokesSolver/Tests/Prism_channel_m6_dealiasing.xml
index 904d255bcdffa81d79156fb02bd17ecb7a92c7fd..05fbfcf7e5660aa75d32d08dddb938678d942d59 100644
--- a/solvers/IncNavierStokesSolver/Tests/Prism_channel_m6_dealiasing.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Prism_channel_m6_dealiasing.xml
@@ -194,10 +194,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="SpectralHPDealiasing" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Prism_channel_varP.xml b/solvers/IncNavierStokesSolver/Tests/Prism_channel_varP.xml
index 05a2df29be074dec13c6674aa85719790d8ef19e..8b592baf6009f4bc34b1b6cbb67ac63e3a552dcf 100644
--- a/solvers/IncNavierStokesSolver/Tests/Prism_channel_varP.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Prism_channel_varP.xml
@@ -198,9 +198,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Pyr_channel_SVV.xml b/solvers/IncNavierStokesSolver/Tests/Pyr_channel_SVV.xml
index 1a9de7c287145667ab56cf2e6fe984e6a216113b..7b98ff398e664a4b75c4af6207f39d371bb3ad91 100644
--- a/solvers/IncNavierStokesSolver/Tests/Pyr_channel_SVV.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Pyr_channel_SVV.xml
@@ -9,10 +9,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 50 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Pyr_channel_m3.xml b/solvers/IncNavierStokesSolver/Tests/Pyr_channel_m3.xml
index a992d4602b0ceb3a0cc51da12abc58455fbafb83..3dce5d6e52df342cbf67f2c9fdc947dcbef2f6ed 100644
--- a/solvers/IncNavierStokesSolver/Tests/Pyr_channel_m3.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Pyr_channel_m3.xml
@@ -9,9 +9,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Pyr_channel_m6.xml b/solvers/IncNavierStokesSolver/Tests/Pyr_channel_m6.xml
index d42404603236fea4ba6c5e2d8608c5963c041d08..b01e43dbfc0f31dcf484be53f97884d6ce1578d8 100644
--- a/solvers/IncNavierStokesSolver/Tests/Pyr_channel_m6.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Pyr_channel_m6.xml
@@ -9,9 +9,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Pyr_channel_varP.xml b/solvers/IncNavierStokesSolver/Tests/Pyr_channel_varP.xml
index 25b08d337fb096b0d8dc5ee3781ca9725f3a609c..d589e831dbdde6d8655216540d310cff8240bd76 100644
--- a/solvers/IncNavierStokesSolver/Tests/Pyr_channel_varP.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Pyr_channel_varP.xml
@@ -11,9 +11,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/SM.xml b/solvers/IncNavierStokesSolver/Tests/SM.xml
index 54a02b5d07cc5932e347cc2700a1a2a36da332a4..5b0c5c6417376470967971a134f616ef65dd4068 100644
--- a/solvers/IncNavierStokesSolver/Tests/SM.xml
+++ b/solvers/IncNavierStokesSolver/Tests/SM.xml
@@ -15,9 +15,13 @@
<I PROPERTY="Driver" VALUE= "Standard" />
<I PROPERTY="ModeType" VALUE= "SingleMode" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/SM_Adj.xml b/solvers/IncNavierStokesSolver/Tests/SM_Adj.xml
index bc08e88a9a752fc76ec34f19d255d39c5b25adda..95ae4ac7b5996860412536676c4c2a58b60406b3 100644
--- a/solvers/IncNavierStokesSolver/Tests/SM_Adj.xml
+++ b/solvers/IncNavierStokesSolver/Tests/SM_Adj.xml
@@ -15,9 +15,13 @@
<I PROPERTY="Driver" VALUE= "Standard" />
<I PROPERTY="ModeType" VALUE= "SingleMode" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/SM_Adj_base_file.xml b/solvers/IncNavierStokesSolver/Tests/SM_Adj_base_file.xml
index b16f29f70f2256cc9523ff898d24dd97d820ab47..3429d8da91194c35fdffc48d4551d98d4b396427 100644
--- a/solvers/IncNavierStokesSolver/Tests/SM_Adj_base_file.xml
+++ b/solvers/IncNavierStokesSolver/Tests/SM_Adj_base_file.xml
@@ -15,9 +15,13 @@
<I PROPERTY="Driver" VALUE= "Standard" />
<I PROPERTY="ModeType" VALUE= "SingleMode" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/SM_base_file.xml b/solvers/IncNavierStokesSolver/Tests/SM_base_file.xml
index 89933008d8e82d3c2efb86dd3bd82bc3f0609e56..8730ab4f87484d2ae749bbd230ecbcd70ab1209e 100644
--- a/solvers/IncNavierStokesSolver/Tests/SM_base_file.xml
+++ b/solvers/IncNavierStokesSolver/Tests/SM_base_file.xml
@@ -15,9 +15,13 @@
<I PROPERTY="Driver" VALUE= "Standard" />
<I PROPERTY="ModeType" VALUE= "SingleMode" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/SelfPropel_MRF_naca0012.xml b/solvers/IncNavierStokesSolver/Tests/SelfPropel_MRF_naca0012.xml
index 0a99a9f7eb23b56c49c8cfff343bff809ee90a29..58320dac0fed0d3690e343e4ffff2cc8d31e1648 100644
--- a/solvers/IncNavierStokesSolver/Tests/SelfPropel_MRF_naca0012.xml
+++ b/solvers/IncNavierStokesSolver/Tests/SelfPropel_MRF_naca0012.xml
@@ -11,9 +11,12 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="DGKernel" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 2.0e-3 </P>
<P> NumSteps = 20 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/TGV3d_2_2.xml b/solvers/IncNavierStokesSolver/Tests/TGV3d_2_2.xml
index 08ef985256d84260a1be88cdd4104cf4fac3dda8..ec679258ecbc15f82f375b5eae34a1a71e6a424c 100644
--- a/solvers/IncNavierStokesSolver/Tests/TGV3d_2_2.xml
+++ b/solvers/IncNavierStokesSolver/Tests/TGV3d_2_2.xml
@@ -27,7 +27,6 @@
<I PROPERTY="EqType" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<!-- <I PROPERTY="Homogeneous" VALUE="1D" /> -->
<!-- <I PROPERTY="UseFFT" VALUE="FFTW" /> -->
<!-- <I PROPERTY="GlobalSysSoln" VALUE="DirectMultiLevelStaticCond" /> -->
@@ -36,6 +35,10 @@
<I PROPERTY="SpectralVanishingViscosity" VALUE="DGKernel" />
<!-- <I PROPERTY="SpectralVanishingViscosity" VALUE="True" /> -->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> FinalTime = 20.0 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/TaylorVor_dt1.xml b/solvers/IncNavierStokesSolver/Tests/TaylorVor_dt1.xml
index 07db688c35217d2532bf65d454a7c9d4132254f9..3567af5b90ad59d9b782b570ec81e3a56fb57573 100644
--- a/solvers/IncNavierStokesSolver/Tests/TaylorVor_dt1.xml
+++ b/solvers/IncNavierStokesSolver/Tests/TaylorVor_dt1.xml
@@ -118,9 +118,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 50 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/TaylorVor_dt2.xml b/solvers/IncNavierStokesSolver/Tests/TaylorVor_dt2.xml
index 040eba4f25c833cf9abb9e725bfd7e720260f6c2..6b4055a27dc488582081be62e8496d657c59660a 100644
--- a/solvers/IncNavierStokesSolver/Tests/TaylorVor_dt2.xml
+++ b/solvers/IncNavierStokesSolver/Tests/TaylorVor_dt2.xml
@@ -118,9 +118,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 500 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_GJP.xml b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_GJP.xml
index 5cc813062a54c3472d244e41bec5e97bacfb7770..987b55db57fcd7c11bc4f5f15e458db5f98b26d7 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_GJP.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_GJP.xml
@@ -30,10 +30,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="GJPStabilisation" VALUE="SemiImplicit" />
<I PROPERTY="SpectralHPDealiasing" VALUE="True" />
</SOLVERINFO>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.005 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_HOBC.xml b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_HOBC.xml
index 7fb9cb39df17eb58420a8b1adffdddda1dc59927..abfb96553e136e8b5723e0cb9da4bbd22187ab34 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_HOBC.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_HOBC.xml
@@ -29,8 +29,11 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.005 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_PreconditionerBlock.xml b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_PreconditionerBlock.xml
index b5ce37a3aab7efd39c83b7fa425cabe41f2bcdbc..cf874eabe35ba6ee728c5808ae796eb51a9b7a3c 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_PreconditionerBlock.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_PreconditionerBlock.xml
@@ -29,9 +29,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v,w">
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond"/>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_PreconditionerLowEnergyBlock.xml b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_PreconditionerLowEnergyBlock.xml
index 6b160a1a2744161304c2d91b8b593fe59ada32ce..e6cac9efe4a8994be92ac6d3cc928e1a78d3d80f 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_PreconditionerLowEnergyBlock.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_PreconditionerLowEnergyBlock.xml
@@ -29,9 +29,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v,w">
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond"/>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_SVV_DGKer.xml b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_SVV_DGKer.xml
index 4c0b1f4b960480cb0aa48fe9f8ab215ceb0e2973..2103a61d3b06688e262bd2bd123133835f1a8188 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_SVV_DGKer.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_SVV_DGKer.xml
@@ -29,10 +29,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="DGKernel" />
<I PROPERTY="SpectralHPDealiasing" VALUE="True" />
</SOLVERINFO>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.005 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_SubStep.xml b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_SubStep.xml
index a0448ac3688d21aee4474f8637c9dd734dc652a7..16768a74af5028786124f019b2c7a3924e53232d 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_SubStep.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_Kovasnay_SubStep.xml
@@ -323,11 +323,15 @@
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Mixed_CG_Discontinuous" />
<I PROPERTY="Extrapolation" VALUE="SubStepping" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="BDFImplicitOrder1" />
<!--I PROPERTY="CollectionOptions" VALUE="AutoTuning" /-->
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> BDFImplicit </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.05 </P>
<P> NumSteps = 20 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3.xml b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3.xml
index 2dd143709d79690c85497178688b41f231b40d03..dd2e2dc8438f7fa56eef456b6d278f64e65838b6 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3.xml
@@ -322,9 +322,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_ConOBC.xml b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_ConOBC.xml
index 991b0bad31af16217258615f4883fa883a94c9c4..2ecd12265d20a0868741efea498786c806ec69e0 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_ConOBC.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_ConOBC.xml
@@ -322,9 +322,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 50 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_VCSWeakPress.xml b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_VCSWeakPress.xml
index 111ae35eb8f431f05a933d3aa33c0188a1f8d247..2389176f828e48512fa21b27127ab587def1f2f5 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_VCSWeakPress.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_VCSWeakPress.xml
@@ -322,9 +322,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_VCSWeakPress_ConOBC.xml b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_VCSWeakPress_ConOBC.xml
index c91d967c261ed7e218d8a6dca6e32b6356853b45..e73d07de97e20ea3e00c8f33a2b8581a66be6f6e 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_VCSWeakPress_ConOBC.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_VCSWeakPress_ConOBC.xml
@@ -322,9 +322,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 50 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_dealiasing.xml b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_dealiasing.xml
index 2908edeb1bc07894a4840cd7791684852140621b..cb8117d19317380182d71e404207350133492b35 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_dealiasing.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m3_dealiasing.xml
@@ -322,10 +322,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="SpectralHPDealiasing" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m4_per.xml b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m4_per.xml
index 2140fb6ea4276699962eabfc52d17c8379d56742..6f7ae77d6476401884f28de4055f5d1bc660c2b2 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m4_per.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m4_per.xml
@@ -83,9 +83,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.1 </P>
<P> NumSteps = 2 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m4_per_hdf5.xml b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m4_per_hdf5.xml
index 3f74fd1992fad1809f31f78578c90d0a92e85ba5..68a6a875dafc1821a1de412b344406a6505aa95a 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m4_per_hdf5.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m4_per_hdf5.xml
@@ -10,9 +10,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.1 </P>
<P> NumSteps = 2 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m8_par.xml b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m8_par.xml
index 7b6dc90730a8db6dc9ca972b4da1ee25e9c96065..ad148f54b4556817ddc7a27461e460a83d00e327 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_channel_m8_par.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_channel_m8_par.xml
@@ -322,9 +322,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_channel_robin_m3.xml b/solvers/IncNavierStokesSolver/Tests/Tet_channel_robin_m3.xml
index b16ec0945efdf53d26f7e1d04bdc2a286ca8f555..6e02e9cbd23aeef98ddaf9c50fb7bf731f4f3703 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_channel_robin_m3.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_channel_robin_m3.xml
@@ -323,9 +323,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<GLOBALSYSSOLNINFO>
<V VAR="u,v,w">
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_channel_varP.xml b/solvers/IncNavierStokesSolver/Tests/Tet_channel_varP.xml
index c3d55e4f44d38bdb3e09daba6978c817ddaa1202..7a95eafde20f92e180aba1df62914e96202564e3 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_channel_varP.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_channel_varP.xml
@@ -328,9 +328,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_equitri.xml b/solvers/IncNavierStokesSolver/Tests/Tet_equitri.xml
index a90f3284cb95b438210fca16904ea4020a3980dd..34613a5bedf162772c8ec06f762c1b5c9809f746 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_equitri.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_equitri.xml
@@ -647,10 +647,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Tet_prism_channel_rad.xml b/solvers/IncNavierStokesSolver/Tests/Tet_prism_channel_rad.xml
index 19448f7d601bfa788862ab043c394d60216dc66e..b527ff23eb1f8f111cf31bf5458689bf2f6a4cb8 100644
--- a/solvers/IncNavierStokesSolver/Tests/Tet_prism_channel_rad.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Tet_prism_channel_rad.xml
@@ -5473,9 +5473,13 @@
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
<I PROPERTY="SpectralHPDealiasing" VALUE="False" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 50 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ThermStab_adj.xml b/solvers/IncNavierStokesSolver/Tests/ThermStab_adj.xml
index 1aba6cfb6a498a035d6a4d1134736beeea66c054..fb9be2cae92d591cc9989e6474c24350bf7c5ed5 100644
--- a/solvers/IncNavierStokesSolver/Tests/ThermStab_adj.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ThermStab_adj.xml
@@ -11,11 +11,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Adjoint" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
<I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<!-- Need to pick Delta t strategically, dont want CFL number to be too large! -->
<P> TimeStep = 0.01 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ThermStab_adj_Ar.xml b/solvers/IncNavierStokesSolver/Tests/ThermStab_adj_Ar.xml
index 5cca682029473068212663b7b0e2d4bb785f212a..b3ef06ab0e8ccbe6ac2f7c65883fef8bfb90c6bc 100644
--- a/solvers/IncNavierStokesSolver/Tests/ThermStab_adj_Ar.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ThermStab_adj_Ar.xml
@@ -11,11 +11,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Adjoint" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Driver" VALUE="Arpack" />
<I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<!-- Need to pick Delta t strategically, dont want CFL number to be too large! -->
<P> TimeStep = 0.01 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ThermStab_dir.xml b/solvers/IncNavierStokesSolver/Tests/ThermStab_dir.xml
index d9834a29608d6140595adf333a7169c122715fa8..2f93f40e0493595242f8106ca35a678e89d0c232 100644
--- a/solvers/IncNavierStokesSolver/Tests/ThermStab_dir.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ThermStab_dir.xml
@@ -11,11 +11,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Direct" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
<I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<!-- Need to pick Delta t strategically, dont want CFL number to be too large! -->
<P> TimeStep = 0.01 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/ThermStab_dir_Ar.xml b/solvers/IncNavierStokesSolver/Tests/ThermStab_dir_Ar.xml
index bcf121988862aec1d1e94bc43c1d434afd37fdb3..a7189e6c0acf5872877517d8ecc532fdfac7a66d 100644
--- a/solvers/IncNavierStokesSolver/Tests/ThermStab_dir_Ar.xml
+++ b/solvers/IncNavierStokesSolver/Tests/ThermStab_dir_Ar.xml
@@ -11,11 +11,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Direct" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Driver" VALUE="Arpack" />
<I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<!-- Need to pick Delta t strategically, dont want CFL number to be too large! -->
<P> TimeStep = 0.01 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/TriQuadChannel.xml b/solvers/IncNavierStokesSolver/Tests/TriQuadChannel.xml
index dfc96ae65178d1d923ee22c7b1762fcc30c8c08f..1789bc852e7a36a32b7f52e6832334b5c3d6c677 100644
--- a/solvers/IncNavierStokesSolver/Tests/TriQuadChannel.xml
+++ b/solvers/IncNavierStokesSolver/Tests/TriQuadChannel.xml
@@ -36,9 +36,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/TriQuadChannelHdf5.xml b/solvers/IncNavierStokesSolver/Tests/TriQuadChannelHdf5.xml
index c475ac28fc966249fc14169ab8ae3b4e0f414edc..1e95f41c7328a6b82b54cee1962a58395ac17474 100644
--- a/solvers/IncNavierStokesSolver/Tests/TriQuadChannelHdf5.xml
+++ b/solvers/IncNavierStokesSolver/Tests/TriQuadChannelHdf5.xml
@@ -36,9 +36,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/Womersley_PipeFlow.xml b/solvers/IncNavierStokesSolver/Tests/Womersley_PipeFlow.xml
index 43540f8b640dc2ed38832981f2c62968c4cdf0f5..46fb579855f025be0b6bcfdb7016b5db2bfc984f 100644
--- a/solvers/IncNavierStokesSolver/Tests/Womersley_PipeFlow.xml
+++ b/solvers/IncNavierStokesSolver/Tests/Womersley_PipeFlow.xml
@@ -38,9 +38,12 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="Preconditioner" VALUE="FullLinearSpaceWithLowEnergyBlock" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 10 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/bfs_tg-AR.xml b/solvers/IncNavierStokesSolver/Tests/bfs_tg-AR.xml
index 203ee7495cc9ec19b6e41e95c72de290be676d01..448ccd4ff32e71c7341da0c84b3df043c1f91d36 100644
--- a/solvers/IncNavierStokesSolver/Tests/bfs_tg-AR.xml
+++ b/solvers/IncNavierStokesSolver/Tests/bfs_tg-AR.xml
@@ -1686,12 +1686,16 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="TransientGrowth" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
<I PROPERTY="Driver" VALUE="Arpack" />
<I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> FinalTime = 0.1 </P>
<P> TimeStep = 0.005 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/bfs_tg.xml b/solvers/IncNavierStokesSolver/Tests/bfs_tg.xml
index cd09479676bfe05676f2ae0d1e07565016761de4..bec8563931f15e63fb3c6a500714139dec0cdab1 100644
--- a/solvers/IncNavierStokesSolver/Tests/bfs_tg.xml
+++ b/solvers/IncNavierStokesSolver/Tests/bfs_tg.xml
@@ -1685,12 +1685,16 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="TransientGrowth" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> FinalTime = 0.1 </P>
<P> TimeStep = 0.005 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/channelFlow_nonuniform_Heating.xml b/solvers/IncNavierStokesSolver/Tests/channelFlow_nonuniform_Heating.xml
index 79f5a6065cecc51c0bf16d771e5f75a3714e4b6d..0693ceda75a119137aedd14030ce57c1b6c69137 100644
--- a/solvers/IncNavierStokesSolver/Tests/channelFlow_nonuniform_Heating.xml
+++ b/solvers/IncNavierStokesSolver/Tests/channelFlow_nonuniform_Heating.xml
@@ -11,13 +11,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <!-- <I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond" />-->
- <!-- <I PROPERTY="GlobalSysSoln" VALUE="DirectMultiLevelStaticCond" /> -->
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="SPECTRALHPDEALIASING" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<!-- Need to pick Delta t strategically, dont want CFL number to be too large! -->
<P> TimeStep = 1e-2 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/channelTemp.xml b/solvers/IncNavierStokesSolver/Tests/channelTemp.xml
index 11f277eed44e0e1f478804bab3b4f1a3a9162bc6..bc01d1f3671f49f2780f7414e0e90077b9cfa62c 100644
--- a/solvers/IncNavierStokesSolver/Tests/channelTemp.xml
+++ b/solvers/IncNavierStokesSolver/Tests/channelTemp.xml
@@ -12,12 +12,16 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="True" />
<I PROPERTY="SPECTRALHPDEALIASING" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<!-- Need to pick Delta t strategically, dont want CFL number to be too large! -->
<P> TimeStep = 4e-4 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/cube-tet.xml b/solvers/IncNavierStokesSolver/Tests/cube-tet.xml
index 468ce2b093106785f68fe4d35391d4d7f212c4e9..22212935618d20d99261c3f607b0433cb746ebb9 100644
--- a/solvers/IncNavierStokesSolver/Tests/cube-tet.xml
+++ b/solvers/IncNavierStokesSolver/Tests/cube-tet.xml
@@ -10,10 +10,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="Projection" VALUE="Continuous"/>
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="Driver" VALUE="Standard"/>
<I PROPERTY="SpectralVanishingViscosity" VALUE="DGKernel"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> IO_InfoSteps = 1 </P>
<P> TimeStep = 1e-05 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/manufactured_3DH1D.xml b/solvers/IncNavierStokesSolver/Tests/manufactured_3DH1D.xml
index 21f34ecc1b6dc2f365b103b2e5d7f6466259127c..988ec6e00621c0ff5c4a5859dcca27d91c0e2456 100644
--- a/solvers/IncNavierStokesSolver/Tests/manufactured_3DH1D.xml
+++ b/solvers/IncNavierStokesSolver/Tests/manufactured_3DH1D.xml
@@ -56,10 +56,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 500 </P>
diff --git a/solvers/IncNavierStokesSolver/Tests/rbc.xml b/solvers/IncNavierStokesSolver/Tests/rbc.xml
index 04350349febe1dd131a7b7eaa08e977ade5aa166..9754461f342268a02c3b7e3fa4eb2f8bb3e18fc8 100644
--- a/solvers/IncNavierStokesSolver/Tests/rbc.xml
+++ b/solvers/IncNavierStokesSolver/Tests/rbc.xml
@@ -11,10 +11,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Driver" VALUE="Standard" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
<V ID="1"> v </V>
diff --git a/solvers/IncNavierStokesSolver/Tests/testLag.xml b/solvers/IncNavierStokesSolver/Tests/testLag.xml
index 252931fee72b6735ae263b49af96cac484c08128..6e1a478ddc9e22be88c9b22625b89fa18d1021e3 100644
--- a/solvers/IncNavierStokesSolver/Tests/testLag.xml
+++ b/solvers/IncNavierStokesSolver/Tests/testLag.xml
@@ -11,11 +11,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" />
<I PROPERTY="Driver" VALUE="Standard" />
- <I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond" />
+ <I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 3 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
<V ID="1"> v </V>
@@ -36,7 +40,6 @@
<P> Kinvis = Pr </P>
</PARAMETERS>
-
<BOUNDARYREGIONS>
<B ID="0"> C[1] </B>
<B ID="1"> C[2] </B>
diff --git a/solvers/MMFSolver/Tests/MMFMaxwell2D.xml b/solvers/MMFSolver/Tests/MMFMaxwell2D.xml
index 9ba604361c28e4e86ee317bdfbf60a4eeb9bf16f..de8d4c1559edaf1965a0dc1287eb39e3f8e5be3f 100644
--- a/solvers/MMFSolver/Tests/MMFMaxwell2D.xml
+++ b/solvers/MMFSolver/Tests/MMFMaxwell2D.xml
@@ -598,13 +598,17 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFMaxwell" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="TestMaxwellType" VALUE="TestMaxwell2DPEC" />
<I PROPERTY="PolType" VALUE="TransElectric" /> <!-- TransElectric, TransMagnetic-->
<I PROPERTY="MMFDir" VALUE="LOCAL" /> <!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/MMFSolver/Tests/MMFMaxwellSphere.xml b/solvers/MMFSolver/Tests/MMFMaxwellSphere.xml
index 48f00ff65e9b857bcf1e6698fc35367bb8136d26..158c84a67dcf764b2978f8a0df796d481d03c2cc 100644
--- a/solvers/MMFSolver/Tests/MMFMaxwellSphere.xml
+++ b/solvers/MMFSolver/Tests/MMFMaxwellSphere.xml
@@ -1984,7 +1984,6 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFMaxwell" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="SurfaceType" VALUE="Sphere" />
<I PROPERTY="TestMaxwellType" VALUE="MaxwellSphere" />
@@ -1992,6 +1991,11 @@
<I PROPERTY="MMFDir" VALUE="LOCAL" /> <!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/MMFSolver/Tests/TestMMFMaxwell2D.xml b/solvers/MMFSolver/Tests/TestMMFMaxwell2D.xml
index 9ba604361c28e4e86ee317bdfbf60a4eeb9bf16f..de8d4c1559edaf1965a0dc1287eb39e3f8e5be3f 100644
--- a/solvers/MMFSolver/Tests/TestMMFMaxwell2D.xml
+++ b/solvers/MMFSolver/Tests/TestMMFMaxwell2D.xml
@@ -598,13 +598,17 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFMaxwell" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="TestMaxwellType" VALUE="TestMaxwell2DPEC" />
<I PROPERTY="PolType" VALUE="TransElectric" /> <!-- TransElectric, TransMagnetic-->
<I PROPERTY="MMFDir" VALUE="LOCAL" /> <!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/MMFSolver/Tests/TestMaxwellSphereh07.xml b/solvers/MMFSolver/Tests/TestMaxwellSphereh07.xml
index c7dd746e3d3936220ada43cb796aa0129b7fd161..bbb30150f01bf9b649857206a072a76c8611c5c4 100644
--- a/solvers/MMFSolver/Tests/TestMaxwellSphereh07.xml
+++ b/solvers/MMFSolver/Tests/TestMaxwellSphereh07.xml
@@ -1984,7 +1984,6 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFMaxwell" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="SurfaceType" VALUE="Sphere" />
<I PROPERTY="TestMaxwellType" VALUE="MaxwellSphere" />
@@ -1992,6 +1991,11 @@
<I PROPERTY="MMFDir" VALUE="LOCAL" /> <!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/PulseWaveSolver/Examples/55_Artery_Network.xml b/solvers/PulseWaveSolver/Examples/55_Artery_Network.xml
index 5a2f741040ea30ce9aa0195486f93a5b6511ff88..1864356d79d16defaa54f5436addec132dd838d8 100644
--- a/solvers/PulseWaveSolver/Examples/55_Artery_Network.xml
+++ b/solvers/PulseWaveSolver/Examples/55_Artery_Network.xml
@@ -693,10 +693,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/Benchmarks/CCA.xml b/solvers/PulseWaveSolver/Examples/Benchmarks/CCA.xml
index da7fa7f1e0b7fdfbfaad9df7b9af351915dbeb07..000b01f52f24a3abe885ac1695cf842297962dfe 100644
--- a/solvers/PulseWaveSolver/Examples/Benchmarks/CCA.xml
+++ b/solvers/PulseWaveSolver/Examples/Benchmarks/CCA.xml
@@ -49,10 +49,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/Benchmarks/aorticBifurcation.xml b/solvers/PulseWaveSolver/Examples/Benchmarks/aorticBifurcation.xml
index 8014c5158657f3bc9202e598a75fe4af9a763e89..7db293148372c90e2bd1f049fd5baeaafa4009c8 100644
--- a/solvers/PulseWaveSolver/Examples/Benchmarks/aorticBifurcation.xml
+++ b/solvers/PulseWaveSolver/Examples/Benchmarks/aorticBifurcation.xml
@@ -82,10 +82,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/Benchmarks/singlePulse.xml b/solvers/PulseWaveSolver/Examples/Benchmarks/singlePulse.xml
index ef8d9ceda6c5eedbf79f1a7bc85ba51300277dae..15f7f6be51c916bf48b1a49a837885995b04ce6f 100644
--- a/solvers/PulseWaveSolver/Examples/Benchmarks/singlePulse.xml
+++ b/solvers/PulseWaveSolver/Examples/Benchmarks/singlePulse.xml
@@ -45,10 +45,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/Benchmarks/thoracicAorta.xml b/solvers/PulseWaveSolver/Examples/Benchmarks/thoracicAorta.xml
index 748ad1246e4baabdc499322491eda46cbb076d23..62c2c445a621c71c373f8b7ea2bf7a91d55d7098 100644
--- a/solvers/PulseWaveSolver/Examples/Benchmarks/thoracicAorta.xml
+++ b/solvers/PulseWaveSolver/Examples/Benchmarks/thoracicAorta.xml
@@ -56,10 +56,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/Bifurcation.xml b/solvers/PulseWaveSolver/Examples/Bifurcation.xml
index 9dccb7dbd304afbe5b771f905901e8b557b06ce6..d3b0fd226fa58ce207a1e76d851fd886a7a100df 100644
--- a/solvers/PulseWaveSolver/Examples/Bifurcation.xml
+++ b/solvers/PulseWaveSolver/Examples/Bifurcation.xml
@@ -89,10 +89,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/Bifurcationareainput.xml b/solvers/PulseWaveSolver/Examples/Bifurcationareainput.xml
index c412d2c31ba6ce617b4657134283494a8d68da9c..2bf730264f0e5045452bcac3be9acd8b8cbc6806 100644
--- a/solvers/PulseWaveSolver/Examples/Bifurcationareainput.xml
+++ b/solvers/PulseWaveSolver/Examples/Bifurcationareainput.xml
@@ -88,11 +88,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <!I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/Junction.xml b/solvers/PulseWaveSolver/Examples/Junction.xml
index 9a4f9dd93c2fbf6945c0b46e0c7dde4311411b93..cb31d5ff9006688a5bc780e51500e957528a250d 100644
--- a/solvers/PulseWaveSolver/Examples/Junction.xml
+++ b/solvers/PulseWaveSolver/Examples/Junction.xml
@@ -70,10 +70,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/Merging.xml b/solvers/PulseWaveSolver/Examples/Merging.xml
index d8ea3321b4a4e93ceaa6c6331bbec023f794af9b..6eb8486348e8129edccc06cc21d85f9bcd88b296 100644
--- a/solvers/PulseWaveSolver/Examples/Merging.xml
+++ b/solvers/PulseWaveSolver/Examples/Merging.xml
@@ -88,11 +88,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <!I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/NewTwoBifurcations.xml b/solvers/PulseWaveSolver/Examples/NewTwoBifurcations.xml
index 5a89f5921ececa3876fd9be84d5aaa6acc1f9a38..716abee9f587a7fc66fc2efdd8ab9e6fbf6c401b 100644
--- a/solvers/PulseWaveSolver/Examples/NewTwoBifurcations.xml
+++ b/solvers/PulseWaveSolver/Examples/NewTwoBifurcations.xml
@@ -99,10 +99,15 @@
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/TestRCR.xml b/solvers/PulseWaveSolver/Examples/TestRCR.xml
index bb32d564c259be343d06371a01b76a96c831ecc2..cfd884d245459788ad713c4263ae85720a2bd5c9 100644
--- a/solvers/PulseWaveSolver/Examples/TestRCR.xml
+++ b/solvers/PulseWaveSolver/Examples/TestRCR.xml
@@ -82,10 +82,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/TwoBifurcations.xml b/solvers/PulseWaveSolver/Examples/TwoBifurcations.xml
index 43814f6d2daed356ffecc0946c333eecf2b9511a..b92dbcfa4fcd0366292e4cf2e07dfe494b0d4bce 100644
--- a/solvers/PulseWaveSolver/Examples/TwoBifurcations.xml
+++ b/solvers/PulseWaveSolver/Examples/TwoBifurcations.xml
@@ -131,10 +131,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Examples/TwoBifurcationsvelinput.xml b/solvers/PulseWaveSolver/Examples/TwoBifurcationsvelinput.xml
index 4f858790fcddd29ebffba288783690d498ae0696..c7ccacd74dece7e7870e41f2235a0a26d241571c 100644
--- a/solvers/PulseWaveSolver/Examples/TwoBifurcationsvelinput.xml
+++ b/solvers/PulseWaveSolver/Examples/TwoBifurcationsvelinput.xml
@@ -131,10 +131,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/55_Artery_Network.xml b/solvers/PulseWaveSolver/Tests/55_Artery_Network.xml
index ac0ffb55a37094b4eb50ca085d54e74cc2db73be..5e8da6c5cf85aae2a4d1d6f6483dcafabe8feeff 100644
--- a/solvers/PulseWaveSolver/Tests/55_Artery_Network.xml
+++ b/solvers/PulseWaveSolver/Tests/55_Artery_Network.xml
@@ -693,10 +693,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/AInflow.xml b/solvers/PulseWaveSolver/Tests/AInflow.xml
index f0d921915c12ad2e25b1e8fe9917eff4cff937c8..be5d20c5cfe7c0939c92c04214bc3e2a3db6a8c0 100644
--- a/solvers/PulseWaveSolver/Tests/AInflow.xml
+++ b/solvers/PulseWaveSolver/Tests/AInflow.xml
@@ -63,10 +63,15 @@
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/Bifurcation.xml b/solvers/PulseWaveSolver/Tests/Bifurcation.xml
index 9f86704e471c1b8a27cdb55410a5176fbdeff0f5..5acb792ad179d024fb272b0ea6d7493cd39323ac 100644
--- a/solvers/PulseWaveSolver/Tests/Bifurcation.xml
+++ b/solvers/PulseWaveSolver/Tests/Bifurcation.xml
@@ -88,11 +88,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <!I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/EmpiricalPressure.xml b/solvers/PulseWaveSolver/Tests/EmpiricalPressure.xml
index fff086c2832bdb7436bad9d62f92b1f9d891f2d2..3806b26af7cede630fa646a3419738314ced0671 100644
--- a/solvers/PulseWaveSolver/Tests/EmpiricalPressure.xml
+++ b/solvers/PulseWaveSolver/Tests/EmpiricalPressure.xml
@@ -63,11 +63,16 @@
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
<I PROPERTY="PressureArea" VALUE="Empirical" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/Junction.xml b/solvers/PulseWaveSolver/Tests/Junction.xml
index 9a4f9dd93c2fbf6945c0b46e0c7dde4311411b93..cb31d5ff9006688a5bc780e51500e957528a250d 100644
--- a/solvers/PulseWaveSolver/Tests/Junction.xml
+++ b/solvers/PulseWaveSolver/Tests/Junction.xml
@@ -70,10 +70,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/Merging.xml b/solvers/PulseWaveSolver/Tests/Merging.xml
index d8ea3321b4a4e93ceaa6c6331bbec023f794af9b..6eb8486348e8129edccc06cc21d85f9bcd88b296 100644
--- a/solvers/PulseWaveSolver/Tests/Merging.xml
+++ b/solvers/PulseWaveSolver/Tests/Merging.xml
@@ -88,11 +88,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <!I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/Paper1_DG.xml b/solvers/PulseWaveSolver/Tests/Paper1_DG.xml
index 6da3d1b9071c07de0e05414534b4190a0e6fdf49..dc74ff7d6b6564c0c284d88287e7aaacaa53e5c3 100644
--- a/solvers/PulseWaveSolver/Tests/Paper1_DG.xml
+++ b/solvers/PulseWaveSolver/Tests/Paper1_DG.xml
@@ -105,10 +105,15 @@
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/Paper2_DG.xml b/solvers/PulseWaveSolver/Tests/Paper2_DG.xml
index 138ede86477794f6ade5f7c6e6d31f313cbecf13..66a512bcb9fc9ebc8d4e92f40382fb012a472a5f 100644
--- a/solvers/PulseWaveSolver/Tests/Paper2_DG.xml
+++ b/solvers/PulseWaveSolver/Tests/Paper2_DG.xml
@@ -60,10 +60,14 @@
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/Paper3_DG.xml b/solvers/PulseWaveSolver/Tests/Paper3_DG.xml
index 50d4131d28cfc80535ec6439f5e979862cacdf68..f4546bdccdc58478ada83ee3732bb3d31d29dac3 100644
--- a/solvers/PulseWaveSolver/Tests/Paper3_DG.xml
+++ b/solvers/PulseWaveSolver/Tests/Paper3_DG.xml
@@ -60,10 +60,14 @@
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/Paper4_55Network.xml b/solvers/PulseWaveSolver/Tests/Paper4_55Network.xml
index b6a76d1e67eefb368697ebbc5477dfeba9772d5d..481d16ddfaa3ddcbf0b00b945430d105c4d3170f 100644
--- a/solvers/PulseWaveSolver/Tests/Paper4_55Network.xml
+++ b/solvers/PulseWaveSolver/Tests/Paper4_55Network.xml
@@ -582,10 +582,14 @@
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/Perf_TwoBifurcations.xml b/solvers/PulseWaveSolver/Tests/Perf_TwoBifurcations.xml
index cfabbff5e48a4c41fe92d58d6a98796ea4f7a614..8edf6243a840cc16619a60bd711a7eba6563dd42 100644
--- a/solvers/PulseWaveSolver/Tests/Perf_TwoBifurcations.xml
+++ b/solvers/PulseWaveSolver/Tests/Perf_TwoBifurcations.xml
@@ -131,10 +131,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/PowerPressure.xml b/solvers/PulseWaveSolver/Tests/PowerPressure.xml
index 28f9105a0057a3f872dc9f89738f89d7e739a8d5..9eda6b38c0e4964a07a315664feadabfe4ac6a07 100644
--- a/solvers/PulseWaveSolver/Tests/PowerPressure.xml
+++ b/solvers/PulseWaveSolver/Tests/PowerPressure.xml
@@ -82,11 +82,16 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
<I PROPERTY="PressureArea" VALUE="Power" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/QInflow.xml b/solvers/PulseWaveSolver/Tests/QInflow.xml
index 91302c1452abf1bec3d154f841c4896e7642db84..fe03ed92d438d4e9e03f8a13581f44f94c35d352 100644
--- a/solvers/PulseWaveSolver/Tests/QInflow.xml
+++ b/solvers/PulseWaveSolver/Tests/QInflow.xml
@@ -63,10 +63,15 @@
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/RCR_boundary.xml b/solvers/PulseWaveSolver/Tests/RCR_boundary.xml
index 2166000b637d2104bac46ddf7a1f68f87b357aec..90f7d54cb821a0db9c9d357c9576005c8f56a43d 100644
--- a/solvers/PulseWaveSolver/Tests/RCR_boundary.xml
+++ b/solvers/PulseWaveSolver/Tests/RCR_boundary.xml
@@ -82,9 +82,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/TwoBifurcations.xml b/solvers/PulseWaveSolver/Tests/TwoBifurcations.xml
index b566044a4040449e900a4410dd6ddf23f7f46c43..8d323c1a3c3d25f6a4c0483ca882bb7c5fb55837 100644
--- a/solvers/PulseWaveSolver/Tests/TwoBifurcations.xml
+++ b/solvers/PulseWaveSolver/Tests/TwoBifurcations.xml
@@ -147,10 +147,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/UInflow.xml b/solvers/PulseWaveSolver/Tests/UInflow.xml
index a9f57b42a2cb562cdefdc43a8f440649fe7614a8..d11690de9a1e4e9f624982d1831af6778f4f3962 100644
--- a/solvers/PulseWaveSolver/Tests/UInflow.xml
+++ b/solvers/PulseWaveSolver/Tests/UInflow.xml
@@ -63,10 +63,15 @@
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/VariableAreaTest.xml b/solvers/PulseWaveSolver/Tests/VariableAreaTest.xml
index 8ca2a55a212207062f691f7dfb0a27a799ce8c50..b42eb40df77ad3a21b51860c1f608c685b9643da 100644
--- a/solvers/PulseWaveSolver/Tests/VariableAreaTest.xml
+++ b/solvers/PulseWaveSolver/Tests/VariableAreaTest.xml
@@ -63,11 +63,14 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
-
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/VariableMatPropTest.xml b/solvers/PulseWaveSolver/Tests/VariableMatPropTest.xml
index c7d5da781de076ab4c5882473d552e3193b45cb0..556a9fd650a4a8350835c762c2ba73c084977a0e 100644
--- a/solvers/PulseWaveSolver/Tests/VariableMatPropTest.xml
+++ b/solvers/PulseWaveSolver/Tests/VariableMatPropTest.xml
@@ -107,10 +107,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/VelocityInputTest.xml b/solvers/PulseWaveSolver/Tests/VelocityInputTest.xml
index fd29b2ef1173bf97473f49af9045d5f5b1b3f1f0..509143d59bb71f58bc649468d18b623e161ecaa3 100644
--- a/solvers/PulseWaveSolver/Tests/VelocityInputTest.xml
+++ b/solvers/PulseWaveSolver/Tests/VelocityInputTest.xml
@@ -62,11 +62,14 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
-
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/Viscoelasticity.xml b/solvers/PulseWaveSolver/Tests/Viscoelasticity.xml
index 6bcf6eb3c832f11fc7fbc377a3c52ea70f079791..0ca05df62375e1816e8e0cd331c8f0cb0de64d9a 100644
--- a/solvers/PulseWaveSolver/Tests/Viscoelasticity.xml
+++ b/solvers/PulseWaveSolver/Tests/Viscoelasticity.xml
@@ -63,10 +63,15 @@
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation"/>
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <ORDER> 1 </ORDER>
+ <VARIANT> Forward </VARIANT>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/test_Junction_base.xml b/solvers/PulseWaveSolver/Tests/test_Junction_base.xml
index b1374e29e37538900227ee17a1b792104a9b4fd1..73d6d6c916449addaae74ac40c3cc44b07ad81fb 100644
--- a/solvers/PulseWaveSolver/Tests/test_Junction_base.xml
+++ b/solvers/PulseWaveSolver/Tests/test_Junction_base.xml
@@ -51,10 +51,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/PulseWaveSolver/Tests/test_three_Junction_base.xml b/solvers/PulseWaveSolver/Tests/test_three_Junction_base.xml
index 3743a9f43ffd5791a4e2aee0870a1fbbad6dad5e..b346b5b999d3ec0ee363ea748b8ad1ec19bf56e3 100644
--- a/solvers/PulseWaveSolver/Tests/test_three_Junction_base.xml
+++ b/solvers/PulseWaveSolver/Tests/test_three_Junction_base.xml
@@ -62,10 +62,15 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="PulseWavePropagation" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="RungeKutta2_ImprovedEuler" />
<I PROPERTY="UpwindTypePulse" VALUE="UpwindPulse"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <VARIANT> SSP </VARIANT>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> A </V>
<V ID="1"> u </V>
diff --git a/solvers/ReviewSolution/Tests/ReviewSolution_2D.xml b/solvers/ReviewSolution/Tests/ReviewSolution_2D.xml
index 36294be456f900cf5873e35ca286e285f8fb1c51..cf367cb10042c741acbe9d60ad185f9c79da1ce3 100644
--- a/solvers/ReviewSolution/Tests/ReviewSolution_2D.xml
+++ b/solvers/ReviewSolution/Tests/ReviewSolution_2D.xml
@@ -11,10 +11,14 @@
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="FileSolution" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="NoScheme" />
<I PROPERTY="Projection" VALUE="Galerkin" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> NoScheme </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/solvers/ReviewSolution/Tests/ReviewSolution_3DH1D.xml b/solvers/ReviewSolution/Tests/ReviewSolution_3DH1D.xml
index adf06872c3c49be465b9ad95b44d1901aee2fed8..e93f91e301a1a9782e9751da91e152565c7b6f09 100644
--- a/solvers/ReviewSolution/Tests/ReviewSolution_3DH1D.xml
+++ b/solvers/ReviewSolution/Tests/ReviewSolution_3DH1D.xml
@@ -58,9 +58,13 @@
<I PROPERTY="EQTYPE" VALUE="FileSolution" />
<I PROPERTY="Projection" VALUE="Continuous" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="NoScheme" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> NoScheme </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 200 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_PeriodicBC_CG_P8.xml b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_PeriodicBC_CG_P8.xml
index 4d302de4d34d80d827fedf1d2c16bb3b40226a14..384b5a7be5a4ab382b8a41ce372701cc6da4dcc2 100644
--- a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_PeriodicBC_CG_P8.xml
+++ b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_PeriodicBC_CG_P8.xml
@@ -116,10 +116,14 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="LinearSWE" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="LinearAverage" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 9.030472819714618/100 </P>
<P> NumSteps = 100*1 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_PeriodicBC_DG_P8.xml b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_PeriodicBC_DG_P8.xml
index 9b8804cb509cbd458cefb97d5809bdd56966cd26..df047f4b813cc459ddce5d78840a8555f57c9780 100644
--- a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_PeriodicBC_DG_P8.xml
+++ b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_PeriodicBC_DG_P8.xml
@@ -117,10 +117,14 @@
<I PROPERTY="EQType" VALUE="LinearSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="LinearHLL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 9.030472819714618/200 </P>
<P> NumSteps = 200*1 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_CG_P4.xml b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_CG_P4.xml
index 182ee254312223f2867c829e95e24a64372a09a4..9098b079ee0b2844223e67a0b55067115ff719ac 100644
--- a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_CG_P4.xml
+++ b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_CG_P4.xml
@@ -116,10 +116,14 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="LinearSWE" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="LinearAverage" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 9.030472819714618/100 </P>
<P> NumSteps = 100*1 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_CG_P8.xml b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_CG_P8.xml
index a8df777c4a774a4b9825a7721971726d6fc84d27..8c6edb406f97a00a99afcdcf6eb770e3c1ec6cb9 100644
--- a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_CG_P8.xml
+++ b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_CG_P8.xml
@@ -116,10 +116,14 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="LinearSWE" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="LinearAverage" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 9.030472819714618/100 </P>
<P> NumSteps = 100*1 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_DG_P4.xml b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_DG_P4.xml
index 0f0dfe43cc1277cc2531ca080400b5ca3b839d7e..8597026dd3be90f7ee90204334f648565cdeceac 100644
--- a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_DG_P4.xml
+++ b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_DG_P4.xml
@@ -117,10 +117,14 @@
<I PROPERTY="EQType" VALUE="LinearSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="LinearAverage" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 9.030472819714618/100 </P>
<P> NumSteps = 100*1 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_DG_P8.xml b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_DG_P8.xml
index 073c351c9d77db0187e2500097ed22c1346d9152..c5f9f9c8c3ecc357ddb296c89b99781e21d1e3e4 100644
--- a/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_DG_P8.xml
+++ b/solvers/ShallowWaterSolver/Tests/LinearSWE_StandingWave_WallBC_DG_P8.xml
@@ -117,10 +117,14 @@
<I PROPERTY="EQType" VALUE="LinearSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="LinearHLL"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 9.030472819714618/200 </P>
<P> NumSteps = 200*1 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/MMFSWEPlane.xml b/solvers/ShallowWaterSolver/Tests/MMFSWEPlane.xml
index f0aedb5e96cf11b62c364b4974e29ae5f235eeed..8d1b28c964ecec04e3808f909c7f37a9af0ea989 100644
--- a/solvers/ShallowWaterSolver/Tests/MMFSWEPlane.xml
+++ b/solvers/ShallowWaterSolver/Tests/MMFSWEPlane.xml
@@ -344,7 +344,6 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="LaxFriedrich" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<I PROPERTY="TestType" VALUE="TestPlane" />
@@ -352,6 +351,10 @@
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.001 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/MMFSWERossbySphere.xml b/solvers/ShallowWaterSolver/Tests/MMFSWERossbySphere.xml
index ef1849ad5f2c2182e9e5b939bd66adb1d223a163..88f4d7e37bf76a9123f6af6f3e8bc998f4b80498 100644
--- a/solvers/ShallowWaterSolver/Tests/MMFSWERossbySphere.xml
+++ b/solvers/ShallowWaterSolver/Tests/MMFSWERossbySphere.xml
@@ -2632,13 +2632,17 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="LaxFriedrich" />
<I PROPERTY="SurfaceType" VALUE="Sphere" />
<I PROPERTY="TestType" VALUE="TestRossbyWave" />
<I PROPERTY="MMFDir" VALUE="LOCAL" /> <!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/MMFSWEZonalSphere.xml b/solvers/ShallowWaterSolver/Tests/MMFSWEZonalSphere.xml
index 59b4f5a02b512f1ca642b583b5e43ad616d68a78..c7ed9db07ae4e8064a5ebea5e94afe44e7e85e11 100644
--- a/solvers/ShallowWaterSolver/Tests/MMFSWEZonalSphere.xml
+++ b/solvers/ShallowWaterSolver/Tests/MMFSWEZonalSphere.xml
@@ -2632,13 +2632,17 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="LaxFriedrich" />
<I PROPERTY="SurfaceType" VALUE="Sphere" />
<I PROPERTY="TestType" VALUE="TestUnsteadyZonal" /> <!-- TestSteadyZonal, TestUnSteadyZonal-->
<I PROPERTY="MMFDir" VALUE="LOCAL" /> <!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/NonlinearSWE_Peregrine_SolitaryWave_DG_P6.xml b/solvers/ShallowWaterSolver/Tests/NonlinearSWE_Peregrine_SolitaryWave_DG_P6.xml
index 9e8c0973693bde488d29c099ef0820dabdb2d899..284abf345284e1d7f1d1595f11d31d66a475b90c 100644
--- a/solvers/ShallowWaterSolver/Tests/NonlinearSWE_Peregrine_SolitaryWave_DG_P6.xml
+++ b/solvers/ShallowWaterSolver/Tests/NonlinearSWE_Peregrine_SolitaryWave_DG_P6.xml
@@ -1752,11 +1752,14 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="NonlinearPeregrine" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="SolitaryWave" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.005 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/NonlinearSWE_Peregrine_SolitaryWave_DG_P6_implicit.xml b/solvers/ShallowWaterSolver/Tests/NonlinearSWE_Peregrine_SolitaryWave_DG_P6_implicit.xml
index 41c0c0a7261485d2eeac097db1ea34faf4435b3f..b44732394ef7dc4cc6d247ce9984bd7b8b39d18d 100644
--- a/solvers/ShallowWaterSolver/Tests/NonlinearSWE_Peregrine_SolitaryWave_DG_P6_implicit.xml
+++ b/solvers/ShallowWaterSolver/Tests/NonlinearSWE_Peregrine_SolitaryWave_DG_P6_implicit.xml
@@ -26,7 +26,6 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="NonlinearPeregrine" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="SolitaryWave" />
<I PROPERTY="AdvectionAdvancement" VALUE="Implicit" />
@@ -34,6 +33,11 @@
<I PROPERTY="LinSysIterSolverTypeInNonlin" VALUE="GMRES" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.05 </P>
<P> NumSteps = 4 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/NonlinearSWE_RossbyModon_CG_P9.xml b/solvers/ShallowWaterSolver/Tests/NonlinearSWE_RossbyModon_CG_P9.xml
index 0799982df05b6af785d848a17a5bdff9bd8c6721..40842a78e12bdbce8204494ac4679abe358eb833 100644
--- a/solvers/ShallowWaterSolver/Tests/NonlinearSWE_RossbyModon_CG_P9.xml
+++ b/solvers/ShallowWaterSolver/Tests/NonlinearSWE_RossbyModon_CG_P9.xml
@@ -260,9 +260,12 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="NonlinearSWE" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.04 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/NonlinearSWE_RossbyModon_DG_P9.xml b/solvers/ShallowWaterSolver/Tests/NonlinearSWE_RossbyModon_DG_P9.xml
index b019d14739635e80decb915001fb4e3dae6736af..f43e86ba9a2eb58e546e5cb0c667a9c709ecd16e 100644
--- a/solvers/ShallowWaterSolver/Tests/NonlinearSWE_RossbyModon_DG_P9.xml
+++ b/solvers/ShallowWaterSolver/Tests/NonlinearSWE_RossbyModon_DG_P9.xml
@@ -260,10 +260,13 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="NonlinearSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="HLLC" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.04 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/Perf_TestMMFSWEPlane.xml b/solvers/ShallowWaterSolver/Tests/Perf_TestMMFSWEPlane.xml
index 276b6cd40688a6da1eefc2fd27c2d0206f43f39b..b691927b6f2072448a2b6c7d744218312b23ce78 100644
--- a/solvers/ShallowWaterSolver/Tests/Perf_TestMMFSWEPlane.xml
+++ b/solvers/ShallowWaterSolver/Tests/Perf_TestMMFSWEPlane.xml
@@ -344,7 +344,6 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="LaxFriedrich" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<I PROPERTY="TestType" VALUE="TestPlane" />
@@ -352,6 +351,10 @@
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.001 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/TestMMFSWEPlane.xml b/solvers/ShallowWaterSolver/Tests/TestMMFSWEPlane.xml
index f0aedb5e96cf11b62c364b4974e29ae5f235eeed..8d1b28c964ecec04e3808f909c7f37a9af0ea989 100644
--- a/solvers/ShallowWaterSolver/Tests/TestMMFSWEPlane.xml
+++ b/solvers/ShallowWaterSolver/Tests/TestMMFSWEPlane.xml
@@ -344,7 +344,6 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="LaxFriedrich" />
<I PROPERTY="SurfaceType" VALUE="Plane" />
<I PROPERTY="TestType" VALUE="TestPlane" />
@@ -352,6 +351,10 @@
<I PROPERTY="MMFDir" VALUE="LOCAL" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 0.001 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/TestMMFSWERossbySphere.xml b/solvers/ShallowWaterSolver/Tests/TestMMFSWERossbySphere.xml
index ef1849ad5f2c2182e9e5b939bd66adb1d223a163..88f4d7e37bf76a9123f6af6f3e8bc998f4b80498 100644
--- a/solvers/ShallowWaterSolver/Tests/TestMMFSWERossbySphere.xml
+++ b/solvers/ShallowWaterSolver/Tests/TestMMFSWERossbySphere.xml
@@ -2632,13 +2632,17 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="LaxFriedrich" />
<I PROPERTY="SurfaceType" VALUE="Sphere" />
<I PROPERTY="TestType" VALUE="TestRossbyWave" />
<I PROPERTY="MMFDir" VALUE="LOCAL" /> <!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/solvers/ShallowWaterSolver/Tests/TestMMFSWEZonalSphere.xml b/solvers/ShallowWaterSolver/Tests/TestMMFSWEZonalSphere.xml
index 59b4f5a02b512f1ca642b583b5e43ad616d68a78..c7ed9db07ae4e8064a5ebea5e94afe44e7e85e11 100644
--- a/solvers/ShallowWaterSolver/Tests/TestMMFSWEZonalSphere.xml
+++ b/solvers/ShallowWaterSolver/Tests/TestMMFSWEZonalSphere.xml
@@ -2632,13 +2632,17 @@
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="MMFSWE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
<I PROPERTY="UpwindType" VALUE="LaxFriedrich" />
<I PROPERTY="SurfaceType" VALUE="Sphere" />
<I PROPERTY="TestType" VALUE="TestUnsteadyZonal" /> <!-- TestSteadyZonal, TestUnSteadyZonal-->
<I PROPERTY="MMFDir" VALUE="LOCAL" /> <!-- TangentX, TangentY, TangentXY, TangentZ, TangentCircular, LOCAL-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 100 </P>
diff --git a/utilities/FieldConvert/Tests/Hex_channel_C0helmsmoothing.xml b/utilities/FieldConvert/Tests/Hex_channel_C0helmsmoothing.xml
index af9dd66b3df0937b2075477af987d4e967edbc56..4929da63d01ccb73c2ea76ec20cb7fba66edc6ef 100644
--- a/utilities/FieldConvert/Tests/Hex_channel_C0helmsmoothing.xml
+++ b/utilities/FieldConvert/Tests/Hex_channel_C0helmsmoothing.xml
@@ -39,10 +39,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/utilities/FieldConvert/Tests/Hex_channel_m3.xml b/utilities/FieldConvert/Tests/Hex_channel_m3.xml
index 5bfba43a54e1522093f42d589a9e7d697fe2abcb..51daa1eca1c531789b53aa157c687d96068b6af5 100644
--- a/utilities/FieldConvert/Tests/Hex_channel_m3.xml
+++ b/utilities/FieldConvert/Tests/Hex_channel_m3.xml
@@ -156,9 +156,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/utilities/FieldConvert/Tests/KovaFlow_varP.xml b/utilities/FieldConvert/Tests/KovaFlow_varP.xml
index 1dc45005c4e8c767ce3a530febe06a87fa693fe1..2c71ea32c46622669ed6650904686aa23c043daa 100644
--- a/utilities/FieldConvert/Tests/KovaFlow_varP.xml
+++ b/utilities/FieldConvert/Tests/KovaFlow_varP.xml
@@ -15,9 +15,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1 </P>
diff --git a/utilities/FieldConvert/Tests/MRF.xml b/utilities/FieldConvert/Tests/MRF.xml
index a033df4973170548b704e4b6a41611b0915141d6..49e8a7e0cc02d75aae823cff4d7ea3998bd4ee83 100644
--- a/utilities/FieldConvert/Tests/MRF.xml
+++ b/utilities/FieldConvert/Tests/MRF.xml
@@ -10,12 +10,15 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="DEALIASING" VALUE="True" />
<I PROPERTY="SPECTRALDEALIASING" VALUE="True" />
<I PROPERTY="SPECTRALHPDEALIASING" VALUE="True" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="DGKernel" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 1e-4 </P>
<P> NumSteps = 1250 </P>
diff --git a/utilities/FieldConvert/Tests/Tet_channel_m3.xml b/utilities/FieldConvert/Tests/Tet_channel_m3.xml
index 2dd143709d79690c85497178688b41f231b40d03..dd2e2dc8438f7fa56eef456b6d278f64e65838b6 100644
--- a/utilities/FieldConvert/Tests/Tet_channel_m3.xml
+++ b/utilities/FieldConvert/Tests/Tet_channel_m3.xml
@@ -322,9 +322,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 10 </P>
diff --git a/utilities/FieldConvert/Tests/Tet_channel_m3_xml/P0000000.xml b/utilities/FieldConvert/Tests/Tet_channel_m3_xml/P0000000.xml
index d20905a73c01045bf423770b11d103c175f17304..d23f6e6efb03dab7246a780c7652481d13d71df6 100644
--- a/utilities/FieldConvert/Tests/Tet_channel_m3_xml/P0000000.xml
+++ b/utilities/FieldConvert/Tests/Tet_channel_m3_xml/P0000000.xml
@@ -189,8 +189,11 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P>TimeStep = 0.001</P>
<P>NumSteps = 10</P>
diff --git a/utilities/FieldConvert/Tests/Tet_channel_m3_xml/P0000001.xml b/utilities/FieldConvert/Tests/Tet_channel_m3_xml/P0000001.xml
index 9bbf603f5ddfbd6c56b40df43f32cf915239ba75..9e4de47ae55f3b0ee317b2bb7b63bac4f04bece3 100644
--- a/utilities/FieldConvert/Tests/Tet_channel_m3_xml/P0000001.xml
+++ b/utilities/FieldConvert/Tests/Tet_channel_m3_xml/P0000001.xml
@@ -189,8 +189,11 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P>TimeStep = 0.001</P>
<P>NumSteps = 10</P>
diff --git a/utilities/FieldConvert/Tests/TriQuad.xml b/utilities/FieldConvert/Tests/TriQuad.xml
index 3c7ffd34b11ae1a29d733a62695f7d84aee14994..719cbb2e0319a492fe0517e785a51a8f2eba46a5 100644
--- a/utilities/FieldConvert/Tests/TriQuad.xml
+++ b/utilities/FieldConvert/Tests/TriQuad.xml
@@ -68,9 +68,13 @@
<I PROPERTY="Driver" VALUE= "Standard" />
<I PROPERTY="ModeType" VALUE= "HalfMode" />
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 300</P>
diff --git a/utilities/FieldConvert/Tests/bfs_tg.xml b/utilities/FieldConvert/Tests/bfs_tg.xml
index 0d79b77a5b7354938f0bbd14b91ccd5e57983aaf..0b478439e2ff5bcfe6cc215405a00fe85ac4b303 100644
--- a/utilities/FieldConvert/Tests/bfs_tg.xml
+++ b/utilities/FieldConvert/Tests/bfs_tg.xml
@@ -1685,11 +1685,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="TransientGrowth" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> FinalTime = 0.1 </P>
<P> TimeStep = 0.005 </P>
diff --git a/utilities/FieldConvert/Tests/bfs_tg_hdf5.xml b/utilities/FieldConvert/Tests/bfs_tg_hdf5.xml
index f108cf1865e0d48432f15853dc07dcb2cae359bc..e458c819b2320c5330ff8d09453c2c6f28da6daf 100644
--- a/utilities/FieldConvert/Tests/bfs_tg_hdf5.xml
+++ b/utilities/FieldConvert/Tests/bfs_tg_hdf5.xml
@@ -10,11 +10,15 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="EvolutionOperator" VALUE="TransientGrowth" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme" />
<I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> FinalTime = 0.1 </P>
<P> TimeStep = 0.005 </P>
diff --git a/utilities/FieldConvert/Tests/chan3DH1D.xml b/utilities/FieldConvert/Tests/chan3DH1D.xml
index 29e8afe068f76025494793c2a74f175950970334..9836ed2bc6476d98ba0cc7ff2ba4847d30ef6f04 100644
--- a/utilities/FieldConvert/Tests/chan3DH1D.xml
+++ b/utilities/FieldConvert/Tests/chan3DH1D.xml
@@ -12,10 +12,14 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
<I PROPERTY="AdvectionForm" VALUE="Convective"/>
<I PROPERTY="Projection" VALUE="Galerkin"/>
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
<I PROPERTY="HOMOGENEOUS" VALUE="1D"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000000.xml b/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000000.xml
index 5b1d3b78773d5d129b7e8e52e2a6bdb73423c76d..c6771f689c04720df787a9bbeff2ab251819853d 100644
--- a/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000000.xml
+++ b/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000000.xml
@@ -63,8 +63,11 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<VARIABLES>
<V ID="0">u</V>
<V ID="1">v</V>
diff --git a/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000001.xml b/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000001.xml
index cce16e0f61ec5ce6dd55320a1b7d59d5dc772cb6..ee902de6931740a0e0ed0e36ad5187b83146a765 100644
--- a/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000001.xml
+++ b/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000001.xml
@@ -63,8 +63,11 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<VARIABLES>
<V ID="0">u</V>
<V ID="1">v</V>
diff --git a/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000002.xml b/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000002.xml
index 43293c8a3f635cf0a9b098c88d1e124ce0e653e9..0055352db4e8d9fc3d8328d18bf6e7c073aa8542 100644
--- a/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000002.xml
+++ b/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000002.xml
@@ -63,8 +63,11 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<VARIABLES>
<V ID="0">u</V>
<V ID="1">v</V>
diff --git a/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000003.xml b/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000003.xml
index 1a2739daf08fbf552bb4b6b83428e25439e20919..b7873317a8da4dca04b2be5d0f19cd2f93ce889c 100644
--- a/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000003.xml
+++ b/utilities/FieldConvert/Tests/chan_interpfield_nparts_xml/P0000003.xml
@@ -69,8 +69,11 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<VARIABLES>
<V ID="0">u</V>
<V ID="1">v</V>
diff --git a/utilities/FieldConvert/Tests/chan_quad_interppointdatatofld.xml b/utilities/FieldConvert/Tests/chan_quad_interppointdatatofld.xml
index 9c95fd9a9483d0ffeb3fc6c390cbf8bbe24e209c..8c9d2387eec296330076363836a8f5704dd8235a 100644
--- a/utilities/FieldConvert/Tests/chan_quad_interppointdatatofld.xml
+++ b/utilities/FieldConvert/Tests/chan_quad_interppointdatatofld.xml
@@ -160,9 +160,13 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="DiffusionType" VALUE="LDG" />
<I PROPERTY="DiffusionAdvancement" VALUE="Explicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> u </V>
<V ID="1"> v </V>
diff --git a/utilities/FieldConvert/Tests/chanflow_m8_addfld.xml b/utilities/FieldConvert/Tests/chanflow_m8_addfld.xml
index 5ad494525158c16bb81ad75012f4c4069e6dcf13..b60c03e2b5d3f2dd1b224f7f9e4d15eda515a339 100644
--- a/utilities/FieldConvert/Tests/chanflow_m8_addfld.xml
+++ b/utilities/FieldConvert/Tests/chanflow_m8_addfld.xml
@@ -14,9 +14,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> NumSteps = 1000 </P>
diff --git a/utilities/FieldConvert/Tests/interptest.xml b/utilities/FieldConvert/Tests/interptest.xml
index 81b271dea5cb148191036cec2c24386a13727aef..2ac78fd7a786ca655dee5aa008f638a4bcedd00c 100644
--- a/utilities/FieldConvert/Tests/interptest.xml
+++ b/utilities/FieldConvert/Tests/interptest.xml
@@ -28,10 +28,13 @@
<I PROPERTY="EvolutionOperator" VALUE="Nonlinear" />
<I PROPERTY="Projection" VALUE="Galerkin" />
<I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="Driver" VALUE="Standard" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="True" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<!-- Need to pick Delta t strategically, dont want CFL number to be too large! -->
<P>TimeStep = 1e-5</P>
diff --git a/utilities/FieldConvert/Tests/localStabilityAnalysis_session.xml b/utilities/FieldConvert/Tests/localStabilityAnalysis_session.xml
index cdbc7f8602d0dc0ece6a1d19a6b93103c0f262b8..fef8b3045198e75dd6c46fa253c637dcdf22bd7e 100644
--- a/utilities/FieldConvert/Tests/localStabilityAnalysis_session.xml
+++ b/utilities/FieldConvert/Tests/localStabilityAnalysis_session.xml
@@ -14,12 +14,14 @@
<I PROPERTY="DiffusionType" VALUE="InteriorPenalty" />
<I PROPERTY="AdvectionAdvancement" VALUE="Implicit" />
<I PROPERTY="DiffusionAdvancement" VALUE="Implicit" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="DIRKOrder2" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Constant" />
-
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> DIRK </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<!--Computational parameters-->
<P> TimeStep = 1e-6 </P>
diff --git a/utilities/FieldConvert/Tests/session_zero-homo-plane.xml b/utilities/FieldConvert/Tests/session_zero-homo-plane.xml
index d5c844d38dec7e7c8fbb334b4ddf8f377ebfda3e..800a1c5188a08ca2aa849b37bae3f28df5ef6951 100644
--- a/utilities/FieldConvert/Tests/session_zero-homo-plane.xml
+++ b/utilities/FieldConvert/Tests/session_zero-homo-plane.xml
@@ -9,7 +9,6 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
<I PROPERTY="SpectralhpDealiasing" VALUE="True" />
<I PROPERTY="SpectralVanishingViscositySpectralHP" VALUE="True" />
<I PROPERTY="SpectralVanishingViscosityHomo1D" VALUE="True" />
@@ -17,6 +16,10 @@
<!--<I PROPERTY="UseFFT" VALUE="FFTW" />-->
<I PROPERTY="GlobalSysSoln" VALUE="XxtMultiLevelStaticCond" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P> TimeStep = 1.0e-3 </P>
<P> NumSteps = 5e3 </P>
diff --git a/utilities/FieldConvert/Tests/smallmesh.xml b/utilities/FieldConvert/Tests/smallmesh.xml
index 9a08017f8a949b88ac2884e3f46a25136b3e8ca9..39a4b530b448dd0954c1ea4fa8e94b011af02b05 100644
--- a/utilities/FieldConvert/Tests/smallmesh.xml
+++ b/utilities/FieldConvert/Tests/smallmesh.xml
@@ -27,8 +27,11 @@
<I PROPERTY="WeightPartitions" VALUE="NonUniform" />
<I PROPERTY="SpectralVanishingViscosity" VALUE="TRUE" />
<I PROPERTY="Projection" VALUE="Continuous" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<P>OutputEvery = 1000</P>
<P>TimeStep = 1.00e-5</P>
diff --git a/utilities/FieldConvert/Tests/surfDist.xml b/utilities/FieldConvert/Tests/surfDist.xml
index 3134fd629fe3f685a9e668765dae0fa9e17ed23e..9799d0e48c37a7c88a0ff5f52df5aec1acc6d7ee 100644
--- a/utilities/FieldConvert/Tests/surfDist.xml
+++ b/utilities/FieldConvert/Tests/surfDist.xml
@@ -14,9 +14,13 @@
<I PROPERTY="GlobalSysSoln" VALUE="IterativeStaticCond" />
<I PROPERTY="SuccessiveRHS" VALUE="-8" />
<I PROPERTY="WeightPartitions" VALUE="Boundary" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 2 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 5e-5 </P>
<P> T = 10.0 </P>
diff --git a/utilities/FieldConvert/Tests/taylor_vortex_2D.xml b/utilities/FieldConvert/Tests/taylor_vortex_2D.xml
index 92396d187ad2698a6030a04437140886f5d5f922..56b4275aabdf15ed2dfbe0fe9031b0a4a136a186 100644
--- a/utilities/FieldConvert/Tests/taylor_vortex_2D.xml
+++ b/utilities/FieldConvert/Tests/taylor_vortex_2D.xml
@@ -40,9 +40,13 @@
<I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
<I PROPERTY="AdvectionForm" VALUE="Convective" />
<I PROPERTY="Projection" VALUE="Galerkin" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> IMEX </METHOD>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<PARAMETERS>
<P> TimeStep = 0.0004 </P>
<P> NumSteps = 16000 </P>
diff --git a/utilities/FieldConvert/Tests/wallNormalData.xml b/utilities/FieldConvert/Tests/wallNormalData.xml
index c626508539480c5f496c7bcef29fca643319d6d9..55a21af7a47c06f96c06a351566b9448e7960f6a 100644
--- a/utilities/FieldConvert/Tests/wallNormalData.xml
+++ b/utilities/FieldConvert/Tests/wallNormalData.xml
@@ -39,12 +39,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" /> <!-- ClassicalRungeKutta4 -->
<I PROPERTY="UpwindType" VALUE="HLLC" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="EquationOfState" VALUE="IdealGas" />
<!--<I PROPERTY="ViscosityType" VALUE="Variable" />-->
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> Euler </METHOD>
+ <VARIANT> Forward </VARIANT>
+ <ORDER> 1 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
<PARAMETERS>
<!--Computational parameters-->
<P> TimeStep = 0.002 </P>
diff --git a/utilities/FieldConvert/Tests/wss_3D_periodic.xml b/utilities/FieldConvert/Tests/wss_3D_periodic.xml
index f1511acd4f6ebbe5fd1e7723c770656fb266ca9d..d633f5692360b696ab024994557e4a309fb82e10 100644
--- a/utilities/FieldConvert/Tests/wss_3D_periodic.xml
+++ b/utilities/FieldConvert/Tests/wss_3D_periodic.xml
@@ -42,12 +42,16 @@
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="DiffusionType" VALUE="LDGNS" />
- <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ViscosityType" VALUE="Variable" />
</SOLVERINFO>
+ <TIMEINTEGRATIONSCHEME>
+ <METHOD> RungeKutta </METHOD>
+ <ORDER> 4 </ORDER>
+ </TIMEINTEGRATIONSCHEME>
+
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>