From 2f5ae54f0159c07aa5e12e059b577515bec8eebb Mon Sep 17 00:00:00 2001 From: Jacques Xing <jxing@londonbridge.ae.ic.ac.uk> Date: Tue, 11 Mar 2025 09:20:36 +0000 Subject: [PATCH] Update tutorial to use TIMEINTEGRATIONSCHEME --- .../basics-advection-diffusion.tex | 15 +++++++++------ .../completed/ADR_conditions.xml | 6 +++++- .../tutorial/ADR_conditions.xml | 6 +++++- .../cfs-CylinderSubsonic_NS.tex | 5 ++--- .../completed/1000steps/CylinderSubsonic_NS.xml | 8 ++++++-- .../completed/Time0.6/CylinderSubsonic_NS.xml | 6 +++++- .../tutorial/CylinderSubsonic_NS.xml | 6 +++++- .../Cambridge-AIM/Channel/Base/Channel-Base.xml | 8 +++++--- .../Channel/Stability/Channel_Coupled.xml | 6 +++++- .../Channel/Stability/Channel_VCS.xml | 6 +++++- .../Cylinder/Base/Cylinder-Base.xml | 6 +++++- .../Stability/Adjoint/Cylinder_Adjoint.xml | 6 +++++- .../Stability/Direct/Cylinder_Direct.xml | 6 +++++- .../Stability/Receptivity/Cylinder_Direct.xml | 8 +++++--- .../Channel/Base/Channel-Base.xml | 6 +++++- .../Channel/Stability/Channel_Coupled.xml | 6 +++++- .../Channel/Stability/Channel_VCS.xml | 8 +++++--- .../Cylinder/Base/Cylinder-Base.xml | 6 +++++- .../Stability/Adjoint/Cylinder_Adjoint.xml | 6 +++++- .../Stability/Direct/Cylinder_Direct.xml | 6 +++++- .../backward-facing_step/Base/bfs-Base.xml | 6 +++++- .../backward-facing_step/Stability/bfs_tg.xml | 8 +++++--- .../backward-facing_step/Base/bfs-Base.xml | 6 +++++- .../backward-facing_step/Stability/bfs_tg.xml | 8 +++++--- events/2011/Cambridge-AIM/bfs-cc-tg.xml | 8 +++++--- events/2011/Cambridge-AIM/bfs-cc.xml | 6 +++++- .../nektutorial/Channel/Base/Channel-Base.xml | 8 +++++--- .../Channel/Stability/Channel_Coupled.xml | 6 +++++- .../Channel/Stability/Channel_VCS.xml | 8 +++++--- .../nektutorial/Cylinder/Base/Cylinder-Base.xml | 6 +++++- .../Stability/Adjoint/Cylinder_Adjoint.xml | 6 +++++- .../Stability/Direct/Cylinder_Direct.xml | 6 +++++- .../backward-facing_step/Base/bfs-Base.xml | 6 +++++- .../backward-facing_step/Stability/bfs_tg.xml | 8 +++++--- .../TutorialFiles/BackwardStep/Base/bfs-Base.xml | 6 +++++- .../BackwardStep/Energy/bfs_energy_tau01.xml | 6 +++++- .../BackwardStep/Energy/bfs_energy_tau20.xml | 6 +++++- .../BackwardStep/Stability/bfs_tg.xml | 8 +++++--- .../TutorialFiles/Channel/Base/Channel-Base.xml | 8 +++++--- .../Channel/Stability/VCS/Channel-VCS.xml | 8 +++++--- .../Cylinder/Base/Cylinder-Base.xml | 6 +++++- .../Stability/Adjoint/Cylinder_Adjoint.xml | 6 +++++- .../Stability/Direct/Cylinder_Direct.xml | 6 +++++- .../Stability/Receptivity/Cylinder_Direct.xml | 6 +++++- .../BackwardStep/Base/bfs-Base.xml | 6 +++++- .../BackwardStep/Energy/bfs_energy_tau01.xml | 6 +++++- .../BackwardStep/Energy/bfs_energy_tau20.xml | 6 +++++- .../BackwardStep/Stability/bfs_tg.xml | 6 +++++- .../Channel/Base/Channel-Base.xml | 6 +++++- .../Channel/Stability/VCS/Channel-VCS.xml | 6 +++++- .../Cylinder/Base/Cylinder-Base.xml | 6 +++++- .../Stability/Adjoint/Cylinder_Adjoint.xml | 6 +++++- .../Stability/Direct/Cylinder_Direct.xml | 6 +++++- .../Stability/Receptivity/Cylinder_Direct.xml | 6 +++++- .../tutorial1-adr/Files/ADR_conditions.xml | 6 +++++- .../Files/ADR_mesh_aligned_xml/P0000000.xml | 5 ++++- .../Files/ADR_mesh_aligned_xml/P0000001.xml | 5 ++++- .../Files/ADR_mesh_xml/P0000000.xml | 5 ++++- .../Files/ADR_mesh_xml/P0000001.xml | 5 ++++- .../tutorial1-adr/tutorial1-adr.tex | 16 ++++++++++------ .../completed/base/bfs-Base.xml | 6 +++++- .../completed/energy/bfs_energy_tau01.xml | 6 +++++- .../completed/energy/bfs_energy_tau20.xml | 6 +++++- .../completed/stability/bfs_tg.xml | 6 +++++- .../tutorial/base/bfs-Base.xml | 6 +++++- .../tutorial/energy/bfs_energy_tau01.xml | 6 +++++- .../tutorial/energy/bfs_energy_tau20.xml | 6 +++++- .../tutorial/stability/bfs_tg.xml | 7 +++++-- .../completed/base/Channel-Base.xml | 6 +++++- .../completed/stability/VCS/Channel-VCS.xml | 6 +++++- .../tutorial/base/Channel-Base.xml | 8 +++++--- .../tutorial/stability/VCS/Channel-VCS.xml | 8 +++++--- .../completed/base/Cylinder-Base.xml | 6 +++++- .../stability/Adjoint/Cylinder_Adjoint.xml | 6 +++++- .../stability/Direct/Cylinder_Direct.xml | 6 +++++- .../stability/Receptivity/Cylinder_Direct.xml | 6 +++++- .../tutorial/base/Cylinder-Base.xml | 6 +++++- .../stability/Adjoint/Cylinder_Adjoint.xml | 6 +++++- .../stability/Direct/Cylinder_Direct.xml | 7 +++++-- .../stability/Receptivity/Cylinder_Direct.xml | 6 +++++- .../rbc/completed/DNS/Ra_1e4_Pr0p71/rbc-DNS.xml | 6 +++++- .../rbc/completed/DNS/Ra_3e3_Pr_7/rbc-DNS.xml | 6 +++++- .../rbc/completed/DNS/Ra_5e3_Pr0p71/rbc-DNS.xml | 6 +++++- incns/rbc/rbc/completed/LSA/Ra1600/rbc-LSA.xml | 5 ++++- incns/rbc/rbc/completed/LSA/Ra1700/rbc-LSA.xml | 5 ++++- incns/rbc/rbc/completed/LSA/Ra1800/rbc-LSA.xml | 5 ++++- incns/rbc/rbc/completed/LSA/Ra1900/rbc-LSA.xml | 5 ++++- .../rbc/tutorial/DNS/Ra_5e3_Pr_0p71/rbc-DNS.xml | 8 +++++--- incns/rbc/rbc/tutorial/LSA/Ra_1900/rbc-LSA.xml | 8 +++++--- .../incns-taylor-green-vortex.tex | 1 - .../completed/solver128/TGV128_conditions.xml | 5 ++++- .../completed/solver64/TGV64_conditions.xml | 5 ++++- .../completed/session_naca.xml | 6 +++++- .../tutorial/session_naca.xml | 6 +++++- .../completed/session_cyl.xml | 6 +++++- .../tutorial/session_cyl.xml | 6 +++++- 96 files changed, 472 insertions(+), 143 deletions(-) diff --git a/basics/advection-diffusion/basics-advection-diffusion.tex b/basics/advection-diffusion/basics-advection-diffusion.tex index da3f455..87ba5bd 100644 --- a/basics/advection-diffusion/basics-advection-diffusion.tex +++ b/basics/advection-diffusion/basics-advection-diffusion.tex @@ -408,8 +408,8 @@ computed. After having configured the \inltt{VARIABLES} tag, the initial and boundary conditions, the advection velocity and the exact solution we can complete the tag \inltt{CONDITIONS} prescribing the parameters -necessary (\inltt{PARAMETERS})and the solver settings -(\inltt{SOLVERINFO}): +necessary (\inltt{PARAMETERS}), solver settings (\inltt{SOLVERINFO}), +and time integration scheme (\inltt{TIMEINTEGRATIONSCHEME}): % \begin{lstlisting}[style=XMLStyle] <CONDITIONS> @@ -429,8 +429,12 @@ necessary (\inltt{PARAMETERS})and the solver settings <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> ... ... ... @@ -453,8 +457,7 @@ to be solved, \inltt{Projection} is the spatial projection operator to be used (which in this case is specified to be `DisContinuous'), \inltt{AdvectionType} is the advection operator to be adopted (where the \inltt{VALUE} `WeakDG' implies the use of a weak Discontinuous Galerkin technique), \inltt{UpwindType} is the numerical flux to be used at the element interfaces when a discontinuous -projection is used, \inltt{TimeIntegrationMethod} allows selecting the -time-integration scheme. For additional solver-setting options refer +projection is used. For additional solver-setting options refer to the \href{http://www.nektar.info/src/user-guide-\nekver.pdf}{User-Guide}. Finally, we need to specify the expansion bases we want to use in each @@ -524,7 +527,7 @@ screen output: Time Step: 0.001 No. of Steps: 1000 Checkpoints (steps): 100 - Integration Type: ClassicalRungeKutta4 + Integration Type: RungeKutta4 ========================================== Initial Conditions: - Field u: sin(k*x)*cos(k*y) diff --git a/basics/advection-diffusion/basics-advection-diffusion/completed/ADR_conditions.xml b/basics/advection-diffusion/basics-advection-diffusion/completed/ADR_conditions.xml index 0306eaf..aad0aab 100644 --- a/basics/advection-diffusion/basics-advection-diffusion/completed/ADR_conditions.xml +++ b/basics/advection-diffusion/basics-advection-diffusion/completed/ADR_conditions.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/basics/advection-diffusion/basics-advection-diffusion/tutorial/ADR_conditions.xml b/basics/advection-diffusion/basics-advection-diffusion/tutorial/ADR_conditions.xml index 0306eaf..aad0aab 100644 --- a/basics/advection-diffusion/basics-advection-diffusion/tutorial/ADR_conditions.xml +++ b/basics/advection-diffusion/basics-advection-diffusion/tutorial/ADR_conditions.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/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS.tex b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS.tex index 2095a33..af2116f 100644 --- a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS.tex +++ b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS.tex @@ -474,7 +474,7 @@ presents the $FR_{DG}$ scheme, which recovers the $DG$ scheme with exact mass matrix, the $FR_{HU}$ scheme, which recovers the $DG$ scheme with lumped mass matrix and the $FR_{SD}$ scheme, which recovers a spectral difference scheme. We must also define the diffusion operator we want to use, which will be local Discontinuous Galerkin and -the time integration method which will be the Classical Runge Kutta of order 4. +the time integration method which will be the Runge Kutta of order 4. \begin{tipbox} When selecting the Advection Type scheme, bear in mind that: @@ -504,7 +504,7 @@ provide lower computational cost but lower accuracy. \begin{tutorialtask} In the .xml file under the tag \inltt{SOLVERINFO}, define all the solver parameters as described above. These are declared as EQType, Projection, -AdvectionType, DiffusionType, TimeIntegrationMethod, UpwindType, ViscosityType. +AdvectionType, DiffusionType, UpwindType, ViscosityType. \end{tutorialtask} \begin{lstlisting}[style=XMLStyle] <SOLVERINFO> @@ -512,7 +512,6 @@ AdvectionType, DiffusionType, TimeIntegrationMethod, UpwindType, ViscosityType. <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" /> diff --git a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/1000steps/CylinderSubsonic_NS.xml b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/1000steps/CylinderSubsonic_NS.xml index 3e0c34d..f880564 100644 --- a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/1000steps/CylinderSubsonic_NS.xml +++ b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/1000steps/CylinderSubsonic_NS.xml @@ -4090,12 +4090,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/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/Time0.6/CylinderSubsonic_NS.xml b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/Time0.6/CylinderSubsonic_NS.xml index bdb8316..fcd46eb 100644 --- a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/Time0.6/CylinderSubsonic_NS.xml +++ b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/Time0.6/CylinderSubsonic_NS.xml @@ -4091,12 +4091,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/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/tutorial/CylinderSubsonic_NS.xml b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/tutorial/CylinderSubsonic_NS.xml index fa73a9e..40085e9 100644 --- a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/tutorial/CylinderSubsonic_NS.xml +++ b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/tutorial/CylinderSubsonic_NS.xml @@ -4090,12 +4090,16 @@ <I PROPERTY="Projection" VALUE="" /> <I PROPERTY="AdvectionType" VALUE="" /> <I PROPERTY="DiffusionType" VALUE="LDGNS" /> - <I PROPERTY="TimeIntegrationMethod" VALUE=""/> <I PROPERTY="UpwindType" VALUE="" /> <I PROPERTY="ProblemType" VALUE="General" /> <I PROPERTY="ViscosityType" VALUE="" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> </METHOD> + <ORDER> </ORDER> + </TIMEINTEGRATIONSCHEME> + <VARIABLES> <V ID="0"> rho </V> <V ID="1"> rhou </V> diff --git a/events/2011/Cambridge-AIM/Channel/Base/Channel-Base.xml b/events/2011/Cambridge-AIM/Channel/Base/Channel-Base.xml index d73747c..6d86181 100644 --- a/events/2011/Cambridge-AIM/Channel/Base/Channel-Base.xml +++ b/events/2011/Cambridge-AIM/Channel/Base/Channel-Base.xml @@ -6,12 +6,14 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Nonlinear"/> <I PROPERTY="Projection" VALUE="Continuous"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/> <I PROPERTY="Driver" VALUE="Standard"/> - - </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 1000 </P> diff --git a/events/2011/Cambridge-AIM/Channel/Stability/Channel_Coupled.xml b/events/2011/Cambridge-AIM/Channel/Stability/Channel_Coupled.xml index 6f94993..3636922 100644 --- a/events/2011/Cambridge-AIM/Channel/Stability/Channel_Coupled.xml +++ b/events/2011/Cambridge-AIM/Channel/Stability/Channel_Coupled.xml @@ -247,12 +247,16 @@ <I PROPERTY="EQTYPE" VALUE="......"/> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/> <I PROPERTY="Driver" VALUE="...."/> <I PROPERTY="InitialVector" VALUE="Random"/> <I PROPERTY="ArpackProblemType" VALUE="...."/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 1 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 500 </P> diff --git a/events/2011/Cambridge-AIM/Channel/Stability/Channel_VCS.xml b/events/2011/Cambridge-AIM/Channel/Stability/Channel_VCS.xml index 01ca4ac..721b751 100644 --- a/events/2011/Cambridge-AIM/Channel/Stability/Channel_VCS.xml +++ b/events/2011/Cambridge-AIM/Channel/Stability/Channel_VCS.xml @@ -247,10 +247,14 @@ <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"/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 500 </P> diff --git a/events/2011/Cambridge-AIM/Cylinder/Base/Cylinder-Base.xml b/events/2011/Cambridge-AIM/Cylinder/Base/Cylinder-Base.xml index 748385f..893b872 100644 --- a/events/2011/Cambridge-AIM/Cylinder/Base/Cylinder-Base.xml +++ b/events/2011/Cambridge-AIM/Cylinder/Base/Cylinder-Base.xml @@ -3446,10 +3446,14 @@ <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 625000 </P> diff --git a/events/2011/Cambridge-AIM/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml b/events/2011/Cambridge-AIM/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml index 066d814..e70eaa0 100644 --- a/events/2011/Cambridge-AIM/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml +++ b/events/2011/Cambridge-AIM/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml @@ -3447,11 +3447,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="......"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> diff --git a/events/2011/Cambridge-AIM/Cylinder/Stability/Direct/Cylinder_Direct.xml b/events/2011/Cambridge-AIM/Cylinder/Stability/Direct/Cylinder_Direct.xml index 200a983..2b160f7 100644 --- a/events/2011/Cambridge-AIM/Cylinder/Stability/Direct/Cylinder_Direct.xml +++ b/events/2011/Cambridge-AIM/Cylinder/Stability/Direct/Cylinder_Direct.xml @@ -3447,11 +3447,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="ModifiedArnoldi" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> diff --git a/events/2011/Cambridge-AIM/Cylinder/Stability/Receptivity/Cylinder_Direct.xml b/events/2011/Cambridge-AIM/Cylinder/Stability/Receptivity/Cylinder_Direct.xml index ceb7b0c..0222558 100644 --- a/events/2011/Cambridge-AIM/Cylinder/Stability/Receptivity/Cylinder_Direct.xml +++ b/events/2011/Cambridge-AIM/Cylinder/Stability/Receptivity/Cylinder_Direct.xml @@ -3447,11 +3447,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> @@ -3461,8 +3465,6 @@ <P> Kinvis =1./Re </P> <P> nvec =2 </P> <P> evtol =1e-5</P> - - </PARAMETERS> <VARIABLES> diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Base/Channel-Base.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Base/Channel-Base.xml index f464700..601fb43 100644 --- a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Base/Channel-Base.xml +++ b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Base/Channel-Base.xml @@ -6,10 +6,14 @@ <I PROPERTY="EQTYPE" VALUE="........."/> <I PROPERTY="EvolutionOperator" VALUE="........."/> <I PROPERTY="Projection" VALUE=".........."/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/> <I PROPERTY="Driver" VALUE="........."/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 1000 </P> diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_Coupled.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_Coupled.xml index 75b8185..d4a8261 100644 --- a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_Coupled.xml +++ b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_Coupled.xml @@ -247,12 +247,16 @@ <I PROPERTY="EQTYPE" VALUE="......"/> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/> <I PROPERTY="Driver" VALUE="...."/> <I PROPERTY="InitialVector" VALUE="......"/> <I PROPERTY="ArpackProblemType" VALUE="...."/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 1 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 500 </P> diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_VCS.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_VCS.xml index af93b07..1c47937 100644 --- a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_VCS.xml +++ b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_VCS.xml @@ -247,13 +247,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="......"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/> <I PROPERTY="Driver" VALUE="......"/> <I PROPERTY="ArpackProblemType" VALUE="......"/> - - </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 500 </P> diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Base/Cylinder-Base.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Base/Cylinder-Base.xml index 748385f..893b872 100644 --- a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Base/Cylinder-Base.xml +++ b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Base/Cylinder-Base.xml @@ -3446,10 +3446,14 @@ <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 625000 </P> diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml index 06ef850..901254f 100644 --- a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml +++ b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml @@ -3447,11 +3447,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="....."/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 500 </P> diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Direct/Cylinder_Direct.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Direct/Cylinder_Direct.xml index 2356e54..b85a638 100644 --- a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Direct/Cylinder_Direct.xml +++ b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Direct/Cylinder_Direct.xml @@ -3447,11 +3447,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 500 </P> diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Base/bfs-Base.xml b/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Base/bfs-Base.xml index cebd009..755b575 100644 --- a/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Base/bfs-Base.xml +++ b/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Base/bfs-Base.xml @@ -1684,11 +1684,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="AdvectionForm" VALUE="Convective"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="Driver" VALUE="Standard"/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 400000 </P> diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Stability/bfs_tg.xml b/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Stability/bfs_tg.xml index e389f67..76b9496 100644 --- a/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Stability/bfs_tg.xml +++ b/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Stability/bfs_tg.xml @@ -1685,14 +1685,16 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="......."/> <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> TimeStep = 0.002 </P> <P> IO_CheckSteps = 1/TimeStep </P> diff --git a/events/2011/Cambridge-AIM/backward-facing_step/Base/bfs-Base.xml b/events/2011/Cambridge-AIM/backward-facing_step/Base/bfs-Base.xml index cebd009..755b575 100644 --- a/events/2011/Cambridge-AIM/backward-facing_step/Base/bfs-Base.xml +++ b/events/2011/Cambridge-AIM/backward-facing_step/Base/bfs-Base.xml @@ -1684,11 +1684,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="AdvectionForm" VALUE="Convective"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="Driver" VALUE="Standard"/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 400000 </P> diff --git a/events/2011/Cambridge-AIM/backward-facing_step/Stability/bfs_tg.xml b/events/2011/Cambridge-AIM/backward-facing_step/Stability/bfs_tg.xml index 649c072..961de5b 100644 --- a/events/2011/Cambridge-AIM/backward-facing_step/Stability/bfs_tg.xml +++ b/events/2011/Cambridge-AIM/backward-facing_step/Stability/bfs_tg.xml @@ -1685,14 +1685,16 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="......."/> <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> TimeStep = 0.002 </P> <P> IO_CheckSteps = 1/TimeStep </P> diff --git a/events/2011/Cambridge-AIM/bfs-cc-tg.xml b/events/2011/Cambridge-AIM/bfs-cc-tg.xml index 87e0eab..3ded5c0 100644 --- a/events/2011/Cambridge-AIM/bfs-cc-tg.xml +++ b/events/2011/Cambridge-AIM/bfs-cc-tg.xml @@ -1684,15 +1684,17 @@ <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="InitialVector" VALUE="Random"/> <I PROPERTY="ArpackProblemType" VALUE="LargestMag"/> - - </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> FinalTime = 1 </P> <P> TimeStep = 0.002 </P> diff --git a/events/2011/Cambridge-AIM/bfs-cc.xml b/events/2011/Cambridge-AIM/bfs-cc.xml index cebd009..755b575 100644 --- a/events/2011/Cambridge-AIM/bfs-cc.xml +++ b/events/2011/Cambridge-AIM/bfs-cc.xml @@ -1684,11 +1684,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="AdvectionForm" VALUE="Convective"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="Driver" VALUE="Standard"/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 400000 </P> diff --git a/events/2011/Cambridge-AIM/nektutorial/Channel/Base/Channel-Base.xml b/events/2011/Cambridge-AIM/nektutorial/Channel/Base/Channel-Base.xml index f2a589e..de249df 100644 --- a/events/2011/Cambridge-AIM/nektutorial/Channel/Base/Channel-Base.xml +++ b/events/2011/Cambridge-AIM/nektutorial/Channel/Base/Channel-Base.xml @@ -6,12 +6,14 @@ <I PROPERTY="EQTYPE" VALUE="........."/> <I PROPERTY="EvolutionOperator" VALUE="........."/> <I PROPERTY="Projection" VALUE=".........."/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/> <I PROPERTY="Driver" VALUE="........."/> - - </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 1000 </P> diff --git a/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_Coupled.xml b/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_Coupled.xml index 75b8185..d4a8261 100644 --- a/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_Coupled.xml +++ b/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_Coupled.xml @@ -247,12 +247,16 @@ <I PROPERTY="EQTYPE" VALUE="......"/> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/> <I PROPERTY="Driver" VALUE="...."/> <I PROPERTY="InitialVector" VALUE="......"/> <I PROPERTY="ArpackProblemType" VALUE="...."/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 1 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 500 </P> diff --git a/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_VCS.xml b/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_VCS.xml index af93b07..1c47937 100644 --- a/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_VCS.xml +++ b/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_VCS.xml @@ -247,13 +247,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="......"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/> <I PROPERTY="Driver" VALUE="......"/> <I PROPERTY="ArpackProblemType" VALUE="......"/> - - </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 500 </P> diff --git a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Base/Cylinder-Base.xml b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Base/Cylinder-Base.xml index 748385f..893b872 100644 --- a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Base/Cylinder-Base.xml +++ b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Base/Cylinder-Base.xml @@ -3446,10 +3446,14 @@ <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 625000 </P> diff --git a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml index 06ef850..901254f 100644 --- a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml +++ b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml @@ -3447,11 +3447,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="....."/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 500 </P> diff --git a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Direct/Cylinder_Direct.xml b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Direct/Cylinder_Direct.xml index 2356e54..b85a638 100644 --- a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Direct/Cylinder_Direct.xml +++ b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Direct/Cylinder_Direct.xml @@ -3447,11 +3447,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 500 </P> diff --git a/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Base/bfs-Base.xml b/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Base/bfs-Base.xml index cebd009..755b575 100644 --- a/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Base/bfs-Base.xml +++ b/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Base/bfs-Base.xml @@ -1684,11 +1684,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="AdvectionForm" VALUE="Convective"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="Driver" VALUE="Standard"/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 400000 </P> diff --git a/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Stability/bfs_tg.xml b/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Stability/bfs_tg.xml index e389f67..76b9496 100644 --- a/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Stability/bfs_tg.xml +++ b/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Stability/bfs_tg.xml @@ -1685,14 +1685,16 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="......."/> <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> TimeStep = 0.002 </P> <P> IO_CheckSteps = 1/TimeStep </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Base/bfs-Base.xml b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Base/bfs-Base.xml index 910fc97..763251c 100644 --- a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Base/bfs-Base.xml +++ b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Base/bfs-Base.xml @@ -5,11 +5,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="AdvectionForm" VALUE="Convective" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 400000 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau01.xml b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau01.xml index a46082b..0d751f3 100644 --- a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau01.xml +++ b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau01.xml @@ -8,10 +8,14 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> FinalTime = 70 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau20.xml b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau20.xml index a46082b..0d751f3 100644 --- a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau20.xml +++ b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau20.xml @@ -8,10 +8,14 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> FinalTime = 70 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Stability/bfs_tg.xml b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Stability/bfs_tg.xml index aa1bcd7..f33b4ed 100644 --- a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Stability/bfs_tg.xml +++ b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Stability/bfs_tg.xml @@ -8,16 +8,18 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <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> TimeStep = 0.002 </P> - ... <P> IO_CheckSteps = 1/TimeStep </P> <P> IO_InfoSteps = 500 </P> <P> Re = 500 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Base/Channel-Base.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Base/Channel-Base.xml index e910284..5e1e16b 100644 --- a/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Base/Channel-Base.xml +++ b/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Base/Channel-Base.xml @@ -3,16 +3,18 @@ <CONDITIONS> <SOLVERINFO> <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> - ... </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 1000 </P> <P> IO_CheckSteps = 500 </P> <P> IO_InfoSteps = 100 </P> - ... </PARAMETERS> <VARIABLES> diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Stability/VCS/Channel-VCS.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Stability/VCS/Channel-VCS.xml index 575eb74..d5622c2 100644 --- a/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Stability/VCS/Channel-VCS.xml +++ b/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Stability/VCS/Channel-VCS.xml @@ -5,10 +5,13 @@ <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Continuous" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> - ... </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 500 </P> @@ -16,7 +19,6 @@ <P> IO_InfoSteps = 20 </P> <P> Re = 7500 </P> <P> Kinvis = 1.0/Re </P> - ... </PARAMETERS> <VARIABLES> diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Base/Cylinder-Base.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Base/Cylinder-Base.xml index 553deee..3e142cb 100644 --- a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Base/Cylinder-Base.xml +++ b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Base/Cylinder-Base.xml @@ -11,10 +11,14 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="EvolutionOperator" VALUE="Nonlinear" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 625000 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml index d0980d9..bfdb09e 100644 --- a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml +++ b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml @@ -6,11 +6,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="EvolutionOperator" VALUE="..." /> <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.001 </P> <P> FinalTime = 1 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Direct/Cylinder_Direct.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Direct/Cylinder_Direct.xml index 57476f8..86f3d36 100644 --- a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Direct/Cylinder_Direct.xml +++ b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Direct/Cylinder_Direct.xml @@ -6,11 +6,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="Driver" VALUE="..." /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Receptivity/Cylinder_Direct.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Receptivity/Cylinder_Direct.xml index 98b2a9e..9588075 100644 --- a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Receptivity/Cylinder_Direct.xml +++ b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Receptivity/Cylinder_Direct.xml @@ -10,11 +10,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Base/bfs-Base.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Base/bfs-Base.xml index 910fc97..763251c 100644 --- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Base/bfs-Base.xml +++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Base/bfs-Base.xml @@ -5,11 +5,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="AdvectionForm" VALUE="Convective" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 400000 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau01.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau01.xml index 93cf2e3..a3ea69b 100644 --- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau01.xml +++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau01.xml @@ -8,12 +8,16 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> FinalTime = 70 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau20.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau20.xml index 00fe3e1..dc8d84e 100644 --- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau20.xml +++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau20.xml @@ -8,12 +8,16 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> FinalTime = 70 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Stability/bfs_tg.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Stability/bfs_tg.xml index ddebd76..8320e5a 100644 --- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Stability/bfs_tg.xml +++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Stability/bfs_tg.xml @@ -8,13 +8,17 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <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" /> <I PROPERTY="EvolutionOperator" VALUE="TransientGrowth" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> FinalTime = 1 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Base/Channel-Base.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Base/Channel-Base.xml index 261e30a..b86606c 100644 --- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Base/Channel-Base.xml +++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Base/Channel-Base.xml @@ -3,13 +3,17 @@ <CONDITIONS> <SOLVERINFO> <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/> - <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" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 1000 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Stability/VCS/Channel-VCS.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Stability/VCS/Channel-VCS.xml index 95d55a8..c00f17c 100644 --- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Stability/VCS/Channel-VCS.xml +++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Stability/VCS/Channel-VCS.xml @@ -5,12 +5,16 @@ <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Continuous" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 500 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Base/Cylinder-Base.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Base/Cylinder-Base.xml index 553deee..3e142cb 100644 --- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Base/Cylinder-Base.xml +++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Base/Cylinder-Base.xml @@ -11,10 +11,14 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="EvolutionOperator" VALUE="Nonlinear" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 625000 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml index 90e847d..a93130f 100644 --- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml +++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml @@ -6,11 +6,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.001 </P> <P> FinalTime = 1 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Direct/Cylinder_Direct.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Direct/Cylinder_Direct.xml index d296af6..d6148d0 100644 --- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Direct/Cylinder_Direct.xml +++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Direct/Cylinder_Direct.xml @@ -6,11 +6,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Receptivity/Cylinder_Direct.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Receptivity/Cylinder_Direct.xml index ceb7b0c..cb115d7 100644 --- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Receptivity/Cylinder_Direct.xml +++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Receptivity/Cylinder_Direct.xml @@ -3447,11 +3447,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> diff --git a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_conditions.xml b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_conditions.xml index 0306eaf..aad0aab 100644 --- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_conditions.xml +++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_conditions.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/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000000.xml b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000000.xml index dd84d7b..fcbc9fb 100644 --- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000000.xml +++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000000.xml @@ -194,8 +194,11 @@ <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/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000001.xml b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000001.xml index 17b1d18..3390f9b 100644 --- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000001.xml +++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000001.xml @@ -194,8 +194,11 @@ <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/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000000.xml b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000000.xml index bdff10a..2d173e2 100644 --- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000000.xml +++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000000.xml @@ -194,8 +194,11 @@ <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/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000001.xml b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000001.xml index e3c80b3..e826cbe 100644 --- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000001.xml +++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000001.xml @@ -194,8 +194,11 @@ <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/events/2015/Imperial-NektarWorkshop/tutorial1-adr/tutorial1-adr.tex b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/tutorial1-adr.tex index 969f742..9333880 100644 --- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/tutorial1-adr.tex +++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/tutorial1-adr.tex @@ -311,7 +311,8 @@ exact solution, against which the L$_{2}$ and L$_{\infty}$ errors are computed. After having configured the \inltt{VARIABLES} tag, the initial and boundary conditions, the advection velocity and the exact solution we can complete the tag \inltt{CONDITIONS} -prescribing the parameters necessary (\inltt{PARAMETERS})and the solver settings (\inltt{SOLVERINFO}): +prescribing the parameters necessary (\inltt{PARAMETERS}), solver settings (\inltt{SOLVERINFO}), +and time integration scheme (\inltt{TIMEINTEGRATIONSCHEME}): % \begin{lstlisting}[style=XMLStyle] <CONDITIONS> @@ -331,8 +332,12 @@ prescribing the parameters necessary (\inltt{PARAMETERS})and the solver settings <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> ... ... ... @@ -350,9 +355,8 @@ In the \inltt{SOLVERINFO} tag, \inltt{EQTYPE} is the type of equation to be solv is the spatial projection operator to be used (which in this case is specified to be `DisContinuous'), \inltt{AdvectionType} is the advection operator to be adopted (where the \inltt{VALUE} `WeakDG' implies the use of a weak Discontinuous Galerkin technique), \inltt{UpwindType} is the numerical -flux to be used at the element interfaces when a discontinuous projection is used, \inltt{TimeIntegrationMethod} -allows selecting the time-integration scheme. For additional solver-setting options refer to the -\href{http://www.nektar.info/src/user-guide-\nekver.pdf}{User-Guide}. +flux to be used at the element interfaces when a discontinuous projection is used. For additional +solver-setting options refer to the \href{http://www.nektar.info/src/user-guide-\nekver.pdf}{User-Guide}. Finally, we need to specify the expansion bases we want to use in each of the three composites or sub-domains (\inltt{COMPOSITE=".."}) introduced in section \ref{adr-pre}: @@ -410,7 +414,7 @@ As soon as the file finishes running, we should see the following screen output: Time Step: 0.001 No. of Steps: 1000 Checkpoints (steps): 100 - Integration Type: ClassicalRungeKutta4 + Integration Type: RungeKutta4 ========================================== Initial Conditions: - Field u: sin(k*x)*cos(k*y) diff --git a/flow-stability/bfs/flow-stability-bfs/completed/base/bfs-Base.xml b/flow-stability/bfs/flow-stability-bfs/completed/base/bfs-Base.xml index 6ae02aa..3224b8d 100644 --- a/flow-stability/bfs/flow-stability-bfs/completed/base/bfs-Base.xml +++ b/flow-stability/bfs/flow-stability-bfs/completed/base/bfs-Base.xml @@ -5,11 +5,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="AdvectionForm" VALUE="Convective" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 400000 </P> diff --git a/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau01.xml b/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau01.xml index 93cf2e3..a3ea69b 100644 --- a/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau01.xml +++ b/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau01.xml @@ -8,12 +8,16 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> FinalTime = 70 </P> diff --git a/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau20.xml b/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau20.xml index 00fe3e1..dc8d84e 100644 --- a/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau20.xml +++ b/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau20.xml @@ -8,12 +8,16 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> FinalTime = 70 </P> diff --git a/flow-stability/bfs/flow-stability-bfs/completed/stability/bfs_tg.xml b/flow-stability/bfs/flow-stability-bfs/completed/stability/bfs_tg.xml index ddebd76..8320e5a 100644 --- a/flow-stability/bfs/flow-stability-bfs/completed/stability/bfs_tg.xml +++ b/flow-stability/bfs/flow-stability-bfs/completed/stability/bfs_tg.xml @@ -8,13 +8,17 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <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" /> <I PROPERTY="EvolutionOperator" VALUE="TransientGrowth" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> FinalTime = 1 </P> diff --git a/flow-stability/bfs/flow-stability-bfs/tutorial/base/bfs-Base.xml b/flow-stability/bfs/flow-stability-bfs/tutorial/base/bfs-Base.xml index 6ae02aa..3224b8d 100644 --- a/flow-stability/bfs/flow-stability-bfs/tutorial/base/bfs-Base.xml +++ b/flow-stability/bfs/flow-stability-bfs/tutorial/base/bfs-Base.xml @@ -5,11 +5,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="AdvectionForm" VALUE="Convective" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> NumSteps = 400000 </P> diff --git a/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau01.xml b/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau01.xml index a46082b..0d751f3 100644 --- a/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau01.xml +++ b/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau01.xml @@ -8,10 +8,14 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> FinalTime = 70 </P> diff --git a/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau20.xml b/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau20.xml index a46082b..0d751f3 100644 --- a/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau20.xml +++ b/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau20.xml @@ -8,10 +8,14 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.002 </P> <P> FinalTime = 70 </P> diff --git a/flow-stability/bfs/flow-stability-bfs/tutorial/stability/bfs_tg.xml b/flow-stability/bfs/flow-stability-bfs/tutorial/stability/bfs_tg.xml index aa1bcd7..f9d1c1a 100644 --- a/flow-stability/bfs/flow-stability-bfs/tutorial/stability/bfs_tg.xml +++ b/flow-stability/bfs/flow-stability-bfs/tutorial/stability/bfs_tg.xml @@ -8,13 +8,16 @@ <SOLVERINFO> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <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> TimeStep = 0.002 </P> ... diff --git a/flow-stability/channel/flow-stability-channel/completed/base/Channel-Base.xml b/flow-stability/channel/flow-stability-channel/completed/base/Channel-Base.xml index 261e30a..b86606c 100644 --- a/flow-stability/channel/flow-stability-channel/completed/base/Channel-Base.xml +++ b/flow-stability/channel/flow-stability-channel/completed/base/Channel-Base.xml @@ -3,13 +3,17 @@ <CONDITIONS> <SOLVERINFO> <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/> - <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" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 1000 </P> diff --git a/flow-stability/channel/flow-stability-channel/completed/stability/VCS/Channel-VCS.xml b/flow-stability/channel/flow-stability-channel/completed/stability/VCS/Channel-VCS.xml index 95d55a8..c00f17c 100644 --- a/flow-stability/channel/flow-stability-channel/completed/stability/VCS/Channel-VCS.xml +++ b/flow-stability/channel/flow-stability-channel/completed/stability/VCS/Channel-VCS.xml @@ -5,12 +5,16 @@ <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Continuous" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 500 </P> diff --git a/flow-stability/channel/flow-stability-channel/tutorial/base/Channel-Base.xml b/flow-stability/channel/flow-stability-channel/tutorial/base/Channel-Base.xml index e910284..5e1e16b 100644 --- a/flow-stability/channel/flow-stability-channel/tutorial/base/Channel-Base.xml +++ b/flow-stability/channel/flow-stability-channel/tutorial/base/Channel-Base.xml @@ -3,16 +3,18 @@ <CONDITIONS> <SOLVERINFO> <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> - ... </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 1000 </P> <P> IO_CheckSteps = 500 </P> <P> IO_InfoSteps = 100 </P> - ... </PARAMETERS> <VARIABLES> diff --git a/flow-stability/channel/flow-stability-channel/tutorial/stability/VCS/Channel-VCS.xml b/flow-stability/channel/flow-stability-channel/tutorial/stability/VCS/Channel-VCS.xml index 575eb74..d5622c2 100644 --- a/flow-stability/channel/flow-stability-channel/tutorial/stability/VCS/Channel-VCS.xml +++ b/flow-stability/channel/flow-stability-channel/tutorial/stability/VCS/Channel-VCS.xml @@ -5,10 +5,13 @@ <I PROPERTY="SolverType" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Continuous" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> - ... </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> NumSteps = 500 </P> @@ -16,7 +19,6 @@ <P> IO_InfoSteps = 20 </P> <P> Re = 7500 </P> <P> Kinvis = 1.0/Re </P> - ... </PARAMETERS> <VARIABLES> diff --git a/flow-stability/cylinder/flow-stability-cylinder/completed/base/Cylinder-Base.xml b/flow-stability/cylinder/flow-stability-cylinder/completed/base/Cylinder-Base.xml index 86099d2..8ac37c3 100644 --- a/flow-stability/cylinder/flow-stability-cylinder/completed/base/Cylinder-Base.xml +++ b/flow-stability/cylinder/flow-stability-cylinder/completed/base/Cylinder-Base.xml @@ -11,10 +11,14 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="EvolutionOperator" VALUE="Nonlinear" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 100 </P> diff --git a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Adjoint/Cylinder_Adjoint.xml b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Adjoint/Cylinder_Adjoint.xml index 90e847d..a93130f 100644 --- a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Adjoint/Cylinder_Adjoint.xml +++ b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Adjoint/Cylinder_Adjoint.xml @@ -6,11 +6,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.001 </P> <P> FinalTime = 1 </P> diff --git a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Direct/Cylinder_Direct.xml b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Direct/Cylinder_Direct.xml index d296af6..d6148d0 100644 --- a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Direct/Cylinder_Direct.xml +++ b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Direct/Cylinder_Direct.xml @@ -6,11 +6,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> diff --git a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Receptivity/Cylinder_Direct.xml b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Receptivity/Cylinder_Direct.xml index ceb7b0c..cb115d7 100644 --- a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Receptivity/Cylinder_Direct.xml +++ b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Receptivity/Cylinder_Direct.xml @@ -3447,11 +3447,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> diff --git a/flow-stability/cylinder/flow-stability-cylinder/tutorial/base/Cylinder-Base.xml b/flow-stability/cylinder/flow-stability-cylinder/tutorial/base/Cylinder-Base.xml index 553deee..3e142cb 100644 --- a/flow-stability/cylinder/flow-stability-cylinder/tutorial/base/Cylinder-Base.xml +++ b/flow-stability/cylinder/flow-stability-cylinder/tutorial/base/Cylinder-Base.xml @@ -11,10 +11,14 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="EvolutionOperator" VALUE="Nonlinear" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 625000 </P> diff --git a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Adjoint/Cylinder_Adjoint.xml b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Adjoint/Cylinder_Adjoint.xml index d0980d9..bfdb09e 100644 --- a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Adjoint/Cylinder_Adjoint.xml +++ b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Adjoint/Cylinder_Adjoint.xml @@ -6,11 +6,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="EvolutionOperator" VALUE="..." /> <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.001 </P> <P> FinalTime = 1 </P> diff --git a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Direct/Cylinder_Direct.xml b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Direct/Cylinder_Direct.xml index 57476f8..bfba31b 100644 --- a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Direct/Cylinder_Direct.xml +++ b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Direct/Cylinder_Direct.xml @@ -6,11 +6,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Projection" VALUE="Galerkin" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" /> <I PROPERTY="Driver" VALUE="..." /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> @@ -18,7 +22,6 @@ <P> IO_InfoSteps = 1250 </P> <P> Re = 42 </P> <P> Kinvis = 1./Re </P> - ... <P> nvec = 2 </P> <P> evtol = 1e-6 </P> </PARAMETERS> diff --git a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Receptivity/Cylinder_Direct.xml b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Receptivity/Cylinder_Direct.xml index 98b2a9e..9588075 100644 --- a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Receptivity/Cylinder_Direct.xml +++ b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Receptivity/Cylinder_Direct.xml @@ -10,11 +10,15 @@ <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/> <I PROPERTY="EvolutionOperator" VALUE="Direct"/> <I PROPERTY="Projection" VALUE="Galerkin"/> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/> <I PROPERTY="Driver" VALUE="Arpack" /> <I PROPERTY="ArpackProblemType" VALUE="LargestMag" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0008 </P> <P> NumSteps = 1250 </P> diff --git a/incns/rbc/rbc/completed/DNS/Ra_1e4_Pr0p71/rbc-DNS.xml b/incns/rbc/rbc/completed/DNS/Ra_1e4_Pr0p71/rbc-DNS.xml index 5957ba9..3d5d0e3 100644 --- a/incns/rbc/rbc/completed/DNS/Ra_1e4_Pr0p71/rbc-DNS.xml +++ b/incns/rbc/rbc/completed/DNS/Ra_1e4_Pr0p71/rbc-DNS.xml @@ -9,12 +9,16 @@ <SOLVERINFO> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> <I PROPERTY="EvolutionOperator" VALUE="Nonlinear" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.0005 </P> <P> T_Final = 10</P> diff --git a/incns/rbc/rbc/completed/DNS/Ra_3e3_Pr_7/rbc-DNS.xml b/incns/rbc/rbc/completed/DNS/Ra_3e3_Pr_7/rbc-DNS.xml index e6a5d9a..dc9096e 100644 --- a/incns/rbc/rbc/completed/DNS/Ra_3e3_Pr_7/rbc-DNS.xml +++ b/incns/rbc/rbc/completed/DNS/Ra_3e3_Pr_7/rbc-DNS.xml @@ -9,12 +9,16 @@ <SOLVERINFO> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> <I PROPERTY="EvolutionOperator" VALUE="Nonlinear" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> T_Final = 10</P> diff --git a/incns/rbc/rbc/completed/DNS/Ra_5e3_Pr0p71/rbc-DNS.xml b/incns/rbc/rbc/completed/DNS/Ra_5e3_Pr0p71/rbc-DNS.xml index 9a94ccf..0a6e1b3 100644 --- a/incns/rbc/rbc/completed/DNS/Ra_5e3_Pr0p71/rbc-DNS.xml +++ b/incns/rbc/rbc/completed/DNS/Ra_5e3_Pr0p71/rbc-DNS.xml @@ -9,12 +9,16 @@ <SOLVERINFO> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> <I PROPERTY="EvolutionOperator" VALUE="Nonlinear" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="Driver" VALUE="Standard" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> T_Final = 10</P> diff --git a/incns/rbc/rbc/completed/LSA/Ra1600/rbc-LSA.xml b/incns/rbc/rbc/completed/LSA/Ra1600/rbc-LSA.xml index 75b7499..803a2f4 100644 --- a/incns/rbc/rbc/completed/LSA/Ra1600/rbc-LSA.xml +++ b/incns/rbc/rbc/completed/LSA/Ra1600/rbc-LSA.xml @@ -9,12 +9,15 @@ <SOLVERINFO> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Driver" VALUE="ModifiedArnoldi" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> <PARAMETERS> <P> TimeStep = 0.001 </P> diff --git a/incns/rbc/rbc/completed/LSA/Ra1700/rbc-LSA.xml b/incns/rbc/rbc/completed/LSA/Ra1700/rbc-LSA.xml index 62f8733..b17d16d 100644 --- a/incns/rbc/rbc/completed/LSA/Ra1700/rbc-LSA.xml +++ b/incns/rbc/rbc/completed/LSA/Ra1700/rbc-LSA.xml @@ -9,12 +9,15 @@ <SOLVERINFO> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Driver" VALUE="ModifiedArnoldi" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> <PARAMETERS> <P> TimeStep = 0.001 </P> diff --git a/incns/rbc/rbc/completed/LSA/Ra1800/rbc-LSA.xml b/incns/rbc/rbc/completed/LSA/Ra1800/rbc-LSA.xml index 58f8a38..767351d 100644 --- a/incns/rbc/rbc/completed/LSA/Ra1800/rbc-LSA.xml +++ b/incns/rbc/rbc/completed/LSA/Ra1800/rbc-LSA.xml @@ -9,12 +9,15 @@ <SOLVERINFO> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Driver" VALUE="ModifiedArnoldi" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> <PARAMETERS> <P> TimeStep = 0.001 </P> diff --git a/incns/rbc/rbc/completed/LSA/Ra1900/rbc-LSA.xml b/incns/rbc/rbc/completed/LSA/Ra1900/rbc-LSA.xml index c332897..0d9bdcb 100644 --- a/incns/rbc/rbc/completed/LSA/Ra1900/rbc-LSA.xml +++ b/incns/rbc/rbc/completed/LSA/Ra1900/rbc-LSA.xml @@ -9,12 +9,15 @@ <SOLVERINFO> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> <I PROPERTY="Projection" VALUE="Continuous" /> <I PROPERTY="EvolutionOperator" VALUE="Direct" /> <I PROPERTY="Driver" VALUE="ModifiedArnoldi" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> <PARAMETERS> <P> TimeStep = 0.001 </P> diff --git a/incns/rbc/rbc/tutorial/DNS/Ra_5e3_Pr_0p71/rbc-DNS.xml b/incns/rbc/rbc/tutorial/DNS/Ra_5e3_Pr_0p71/rbc-DNS.xml index 0460c91..bea67bf 100644 --- a/incns/rbc/rbc/tutorial/DNS/Ra_5e3_Pr_0p71/rbc-DNS.xml +++ b/incns/rbc/rbc/tutorial/DNS/Ra_5e3_Pr_0p71/rbc-DNS.xml @@ -9,16 +9,18 @@ <SOLVERINFO> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> - ... </SOLVERINFO> + + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> <PARAMETERS> <P> TimeStep = 0.001 </P> <P> T_Final = 10</P> <P> NumSteps = T_Final/TimeStep </P> <P> IO_InfoSteps = 100 </P> - ... <P> Kinvis = Pr </P> </PARAMETERS> diff --git a/incns/rbc/rbc/tutorial/LSA/Ra_1900/rbc-LSA.xml b/incns/rbc/rbc/tutorial/LSA/Ra_1900/rbc-LSA.xml index 3925513..2d7c276 100644 --- a/incns/rbc/rbc/tutorial/LSA/Ra_1900/rbc-LSA.xml +++ b/incns/rbc/rbc/tutorial/LSA/Ra_1900/rbc-LSA.xml @@ -9,11 +9,14 @@ <SOLVERINFO> <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/> <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" /> - <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3" /> <I PROPERTY="Projection" VALUE="Continuous" /> - ... </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 3 </ORDER> + </TIMEINTEGRATIONSCHEME> + <PARAMETERS> <P> TimeStep = 0.001 </P> <P> T_Final = 0.1</P> @@ -22,7 +25,6 @@ <P> Ra = 1900 </P> <P> Pr = 0.71 </P> <P> Kinvis = Pr </P> - ... </PARAMETERS> <VARIABLES> diff --git a/incns/taylor-green-vortex/incns-taylor-green-vortex.tex b/incns/taylor-green-vortex/incns-taylor-green-vortex.tex index 5002fe9..abda49d 100644 --- a/incns/taylor-green-vortex/incns-taylor-green-vortex.tex +++ b/incns/taylor-green-vortex/incns-taylor-green-vortex.tex @@ -337,7 +337,6 @@ approach to be used when solving linear matrix systems of the form $Ax=b$ that a \begin{tutorialtask} In the file \texttt{TGV64\_conditions.xml} under the tag \inltt{SOLVERINFO}, define all the solver properties. These include: \begin{itemize} -\item Setting the \texttt{TimeIntegrationMethod} to \texttt{IMEXOrder2}. \item Setting the \texttt{SolverType} to \texttt{VelocityCorrectionScheme} and the \texttt{EqType} to \texttt{UnsteadyNavierStokes}. \item (Optional) Setting the \texttt{UseFFT} property to \texttt{True} to indicate that the Fast Fourier Transform method will be used to speed up the operations diff --git a/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver128/TGV128_conditions.xml b/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver128/TGV128_conditions.xml index 26b80bf..beb93c4 100644 --- a/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver128/TGV128_conditions.xml +++ b/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver128/TGV128_conditions.xml @@ -21,13 +21,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="GlobalSysSoln" VALUE="DirectMultiLevelStaticCond" /> <I PROPERTY="SpectralHPDealiasing" VALUE="True" /> <I PROPERTY="SpectralVanishingViscosity" VALUE="False" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> <PARAMETERS> <P> TimeStep = 0.005 </P> <P> FinalTime = 20.0 </P> diff --git a/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver64/TGV64_conditions.xml b/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver64/TGV64_conditions.xml index 9e0fb7a..573810c 100644 --- a/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver64/TGV64_conditions.xml +++ b/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver64/TGV64_conditions.xml @@ -21,13 +21,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="GlobalSysSoln" VALUE="DirectMultiLevelStaticCond" /> <I PROPERTY="SpectralHPDealiasing" VALUE="True" /> <I PROPERTY="SpectralVanishingViscosity" VALUE="True" /> </SOLVERINFO> + <TIMEINTEGRATIONSCHEME> + <METHOD> IMEX </METHOD> + <ORDER> 2 </ORDER> + </TIMEINTEGRATIONSCHEME> <PARAMETERS> <P> TimeStep = 0.01 </P> <P> FinalTime = 20.0 </P> diff --git a/mesh-generation/2d-naca/mesh-generation-2d-naca/completed/session_naca.xml b/mesh-generation/2d-naca/mesh-generation-2d-naca/completed/session_naca.xml index 960062a..d6ef463 100644 --- a/mesh-generation/2d-naca/mesh-generation-2d-naca/completed/session_naca.xml +++ b/mesh-generation/2d-naca/mesh-generation-2d-naca/completed/session_naca.xml @@ -13,8 +13,12 @@ <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.0005 </P> diff --git a/mesh-generation/2d-naca/mesh-generation-2d-naca/tutorial/session_naca.xml b/mesh-generation/2d-naca/mesh-generation-2d-naca/tutorial/session_naca.xml index fd09b48..49822eb 100644 --- a/mesh-generation/2d-naca/mesh-generation-2d-naca/tutorial/session_naca.xml +++ b/mesh-generation/2d-naca/mesh-generation-2d-naca/tutorial/session_naca.xml @@ -13,8 +13,12 @@ <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.0005 </P> diff --git a/mesh-generation/2d-step/mesh-generation-2d-step/completed/session_cyl.xml b/mesh-generation/2d-step/mesh-generation-2d-step/completed/session_cyl.xml index 1dd1289..9d76b27 100644 --- a/mesh-generation/2d-step/mesh-generation-2d-step/completed/session_cyl.xml +++ b/mesh-generation/2d-step/mesh-generation-2d-step/completed/session_cyl.xml @@ -13,8 +13,12 @@ <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> diff --git a/mesh-generation/2d-step/mesh-generation-2d-step/tutorial/session_cyl.xml b/mesh-generation/2d-step/mesh-generation-2d-step/tutorial/session_cyl.xml index 1dd1289..9d76b27 100644 --- a/mesh-generation/2d-step/mesh-generation-2d-step/tutorial/session_cyl.xml +++ b/mesh-generation/2d-step/mesh-generation-2d-step/tutorial/session_cyl.xml @@ -13,8 +13,12 @@ <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> -- GitLab