From 7a55938c102bf848846f09173fe38fb964257fe6 Mon Sep 17 00:00:00 2001 From: Brandon Allen Date: Thu, 2 Jul 2020 15:20:49 -0400 Subject: [PATCH] Switch to using `CentralNumericalFluxFirstOrder` for ShallowWaterModel This matches up numerical fluxes for the continuity equation in the baroclinic and barotropic models Fix `shallow_boundary_state!` numerical flux signatures. --- src/Ocean/ShallowWater/ShallowWaterModel.jl | 47 +- .../ShallowWater/2D_hydrostatic_spindown.jl | 2 +- .../SplitExplicit/hydrostatic_spindown.jl | 7 +- .../2D_hydrostatic_spindown_refvals.jl | 24 +- .../refvals/hydrostatic_spindown_refvals.jl | 898 +++++++++++++++--- 5 files changed, 799 insertions(+), 179 deletions(-) diff --git a/src/Ocean/ShallowWater/ShallowWaterModel.jl b/src/Ocean/ShallowWater/ShallowWaterModel.jl index 35cf7c187ff..490656a9892 100644 --- a/src/Ocean/ShallowWater/ShallowWaterModel.jl +++ b/src/Ocean/ShallowWater/ShallowWaterModel.jl @@ -268,6 +268,7 @@ function init_state_conservative!(m::SWModel, state::Vars, aux::Vars, coords, t) shallow_init_state!(m, m.problem, state, aux, coords, t) end +function shallow_boundary_state! end function boundary_state!( nf, m::SWModel, @@ -283,8 +284,25 @@ function boundary_state!( shallow_boundary_state!(nf, m, m.turbulence, q⁺, a⁺, n⁻, q⁻, a⁻, t) end +function boundary_state!( + nf, + m::SWModel, + q⁺::Vars, + σ⁺::Vars, + α⁺::Vars, + n⁻, + q⁻::Vars, + σ⁻::Vars, + α⁻::Vars, + bctype, + t, + _..., +) + shallow_boundary_state!(nf, m, m.turbulence, q⁺, σ⁺, α⁺, n⁻, q⁻, σ⁻, α⁻, t) +end + @inline function shallow_boundary_state!( - ::RusanovNumericalFlux, + ::NumericalFluxFirstOrder, m::SWModel, ::LinearDrag, q⁺, @@ -304,38 +322,21 @@ end end shallow_boundary_state!( - ::CentralNumericalFluxGradient, + ::NumericalFluxGradient, m::SWModel, ::LinearDrag, _..., ) = nothing shallow_boundary_state!( - ::CentralNumericalFluxSecondOrder, + ::NumericalFluxSecondOrder, m::SWModel, ::LinearDrag, _..., ) = nothing -function boundary_state!( - nf, - m::SWModel, - q⁺::Vars, - σ⁺::Vars, - α⁺::Vars, - n⁻, - q⁻::Vars, - σ⁻::Vars, - α⁻::Vars, - bctype, - t, - _..., -) - shallow_boundary_state!(nf, m, m.turbulence, q⁺, σ⁺, α⁺, n⁻, q⁻, σ⁻, α⁻, t) -end - @inline function shallow_boundary_state!( - ::RusanovNumericalFlux, + ::NumericalFluxFirstOrder, m::SWModel, ::ConstantViscosity, q⁺, @@ -352,7 +353,7 @@ end end @inline function shallow_boundary_state!( - ::CentralNumericalFluxGradient, + ::NumericalFluxGradient, m::SWModel, ::ConstantViscosity, q⁺, @@ -369,7 +370,7 @@ end end @inline function shallow_boundary_state!( - ::CentralNumericalFluxSecondOrder, + ::NumericalFluxSecondOrder, m::SWModel, ::ConstantViscosity, q⁺, diff --git a/test/Ocean/ShallowWater/2D_hydrostatic_spindown.jl b/test/Ocean/ShallowWater/2D_hydrostatic_spindown.jl index f09c3ca1e81..0a5d9d920b7 100644 --- a/test/Ocean/ShallowWater/2D_hydrostatic_spindown.jl +++ b/test/Ocean/ShallowWater/2D_hydrostatic_spindown.jl @@ -116,7 +116,7 @@ function run_hydrostatic_spindown(; refDat = ()) dg_2D = DGModel( model_2D, grid_2D, - RusanovNumericalFlux(), + CentralNumericalFluxFirstOrder(), CentralNumericalFluxSecondOrder(), CentralNumericalFluxGradient(), ) diff --git a/test/Ocean/SplitExplicit/hydrostatic_spindown.jl b/test/Ocean/SplitExplicit/hydrostatic_spindown.jl index 36873946d2e..493f53c4247 100644 --- a/test/Ocean/SplitExplicit/hydrostatic_spindown.jl +++ b/test/Ocean/SplitExplicit/hydrostatic_spindown.jl @@ -186,7 +186,7 @@ function run_hydrostatic_spindown(; dg_2D = DGModel( model_2D, grid_2D, - RusanovNumericalFlux(), + CentralNumericalFluxFirstOrder(), CentralNumericalFluxSecondOrder(), CentralNumericalFluxGradient(), ) @@ -315,9 +315,9 @@ function make_callbacks( cbcs_dg = ClimateMachine.StateCheck.sccreate( [ (Q_slow, "3D state"), - # (dg_slow.state_auxiliary, "3D aux"), + (dg_slow.state_auxiliary, "3D aux"), (Q_fast, "2D state"), - # (dg_fast.state_auxiliary, "2D aux"), + (dg_fast.state_auxiliary, "2D aux"), ], nout; prec = 12, @@ -357,7 +357,6 @@ const cᶻ = 0 include("../refvals/hydrostatic_spindown_refvals.jl") @testset "Multi-rate" begin - # run_hydrostatic_spindown(coupling = PartiallyCoupled()) @testset "Fully Coupled" begin @testset "Δt = 30 mins" begin diff --git a/test/Ocean/refvals/2D_hydrostatic_spindown_refvals.jl b/test/Ocean/refvals/2D_hydrostatic_spindown_refvals.jl index ddddc247c8c..94ab62facdb 100644 --- a/test/Ocean/refvals/2D_hydrostatic_spindown_refvals.jl +++ b/test/Ocean/refvals/2D_hydrostatic_spindown_refvals.jl @@ -13,26 +13,26 @@ explicit = [ [ "2D state", :η, - -8.52722863677453757347e-01, - 8.52828186384614328475e-01, - -2.32169838909612754587e-16, - 6.03454974395413956678e-01, + -8.52722969951589915283e-01, + 8.52846676313531282254e-01, + -2.49578135935735214742e-16, + 6.03454239990563690021e-01, ], [ "2D state", "U[1]", - -3.15402615071803076319e+01, - 3.15402615071801157853e+01, - 6.16398876385204608714e-15, - 2.24269405191038053715e+01, + -3.15431401945821825450e+01, + 3.15431401945818628008e+01, + 6.11504145930918957291e-15, + 2.24273815174625497093e+01, ], [ "2D state", "U[2]", - -4.60204855830197230363e-13, - 5.29714995818968166418e-13, - 1.33362479920413591115e-14, - 1.36912259776863805290e-13, + -7.62224398365580242501e-13, + 9.72156930292624284356e-13, + 1.39269607441935025982e-14, + 1.95606703846656748360e-13, ], ] diff --git a/test/Ocean/refvals/hydrostatic_spindown_refvals.jl b/test/Ocean/refvals/hydrostatic_spindown_refvals.jl index 20a39c2cf90..5252795c6e6 100644 --- a/test/Ocean/refvals/hydrostatic_spindown_refvals.jl +++ b/test/Ocean/refvals/hydrostatic_spindown_refvals.jl @@ -7,54 +7,50 @@ parr = [ ["3D state", "u[2]", 0, 0, 0, 0], ["3D state", :η, 12, 12, 0, 12], ["3D state", :θ, 15, 15, 15, 15], - #= ["3D aux", :y, 15, 15, 15, 15], ["3D aux", :w, 12, 12, 0, 12], ["3D aux", :pkin, 15, 15, 15, 15], - ["3D aux", :wz0, 12, 12, 0, 12], + ["3D aux", :wz0, 0, 0, 0, 0], ["3D aux", "uᵈ[1]", 12, 12, 0, 12], - ["3D aux", "uᵈ[2]", 12, 12, 0, 12], - ["3D aux", "ΔGᵘ[1]", 12, 12, 0, 12], - ["3D aux", "ΔGᵘ[2]", 12, 12, 0, 12], - =# + ["3D aux", "uᵈ[2]", 0, 0, 0, 0], + ["3D aux", "ΔGᵘ[1]", 11, 12, 0, 12], + ["3D aux", "ΔGᵘ[2]", 0, 0, 0, 0], ["2D state", :η, 12, 12, 0, 12], ["2D state", "U[1]", 12, 12, 0, 12], ["2D state", "U[2]", 0, 0, 0, 0], - #= ["2D aux", :f, 15, 15, 15, 15], ["2D aux", "τ[1]", 15, 15, 15, 15], ["2D aux", "τ[2]", 15, 15, 15, 15], - ["2D aux", "Gᵁ[1]", 12, 12, 0, 12], - ["2D aux", "Gᵁ[2]", 12, 12, 0, 12], + ["2D aux", "Gᵁ[1]", 11, 11, 0, 12], + ["2D aux", "Gᵁ[2]", 0, 0, 0, 0], ["2D aux", "Δu[1]", 12, 12, 0, 12], - ["2D aux", "Δu[2]", 12, 12, 0, 12], - =# + ["2D aux", "Δu[2]", 0, 0, 0, 0], ] not_coupled = [ [ "3D state", "u[1]", - -9.58547428246829258391e-01, - 9.58547428246829924525e-01, - -2.72848410531878478287e-17, - 4.45400655325317695876e-01, + -9.58547428246646071592e-01, + 9.58547428246646959771e-01, + 1.81898940354585662463e-17, + 4.45400655325261352058e-01, ], [ "3D state", "u[2]", - -4.17338353173569118678e-14, - 1.83725063946779860804e-14, - 2.10967530406246663799e-17, - 2.12845310693392360741e-15, + -4.13737237436503306134e-14, + 1.83048219938112200884e-14, + 1.54166397974686221412e-17, + 2.12793160613647754603e-15, ], [ "3D state", :η, - -8.52721734395888830704e-01, - 8.52834259382379111791e-01, - 2.16959961107932042100e-14, - 6.02983573168680564436e-01, + -8.52721734395831765241e-01, + 8.52834259382320158949e-01, + 2.19642970478162181523e-14, + 6.02983573168638931072e-01, ], [ "3D state", @@ -64,90 +60,177 @@ not_coupled = [ 0.00000000000000000000e+00, 0.00000000000000000000e+00, ], - #= - [ - "3D aux", - :y, - 0.00000000000000000000e+00, - 1.00000000000000011642e+06, - 5.00000000000000000000e+05, - 2.92775877460665535182e+05, - ], - [ - "3D aux", - :w, - -4.04489222828921936130e-04, - 4.04649979048339884964e-04, - 6.73350264435157450488e-19, - 1.63949585575251874240e-04, - ], - [ - "3D aux", - :pkin, - 0.00000000000000000000e+00, - 0.00000000000000000000e+00, - 0.00000000000000000000e+00, - 0.00000000000000000000e+00, - ], - [ - "3D aux", - :wz0, - -2.00933099660539595454e-04, - 2.00809859469747143366e-04, - 9.99200722162640859033e-20, - 1.42064682697776525650e-04, - ], - =# + [ + "3D aux", + :y, + 0.00000000000000000000e+00, + 1.00000000000000011642e+06, + 5.00000000000000000000e+05, + 2.92775877460665535182e+05, + ], + [ + "3D aux", + :w, + -4.04489222828861979750e-04, + 4.04649979048277977020e-04, + 4.14668299697495972147e-19, + 1.63949585575227777846e-04, + ], + [ + "3D aux", + :pkin, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "3D aux", + :wz0, + -2.00933099660526883184e-04, + 2.00809859469731666380e-04, + 3.21964677141295398610e-20, + 1.42064682697767499667e-04, + ], + [ + "3D aux", + "uᵈ[1]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "3D aux", + "uᵈ[2]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "3D aux", + "ΔGᵘ[1]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "3D aux", + "ΔGᵘ[2]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], [ "2D state", :η, - -8.52735654368523721125e-01, - 8.52839610988160190530e-01, - -5.46940270851337130538e-16, - 6.03463847107759909782e-01, + -8.52715894965927923010e-01, + 8.52861218874714666072e-01, + -7.70938868299708696148e-16, + 6.03458382295490314284e-01, ], [ "2D state", "U[1]", - -3.15391722007734536248e+01, - 3.15391722007730805899e+01, - 4.59412508035939049964e-15, - 2.24261366371601056358e+01, + -3.15423945317149438949e+01, + 3.15423945317147342848e+01, + 1.42724412149908289268e-14, + 2.24262219407601044452e+01, ], [ "2D state", "U[2]", - -4.37584346168357661464e-13, - 5.56621403621539302858e-13, - 1.62907035110957408041e-14, - 1.42652658850586700348e-13, + -9.38673083374999972374e-13, + 1.16534781393478256382e-12, + 1.93385973223830695204e-14, + 2.16634164433978071172e-13, + ], + [ + "2D aux", + :f, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "τ[1]", + -0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "τ[2]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "Gᵁ[1]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "Gᵁ[2]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "Δu[1]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "Δu[2]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, ], ] + fully_coupled = [ [ "3D state", "u[1]", - -9.58660726483847924762e-01, - 9.58615148375367986944e-01, - -3.89899325474971198514e-06, - 4.45401015112516618366e-01, + -9.58544854429326798062e-01, + 9.58544854429326798062e-01, + -4.09272615797817732838e-17, + 4.45400401208546903309e-01, ], [ "3D state", "u[2]", - -5.34954449329680479380e-05, - 9.56394271461731787596e-05, - 1.41658660512563957739e-07, - 1.03060542771323416372e-05, + -4.09119364541065205420e-15, + 3.41954410407034240802e-15, + 1.57855184364031418231e-19, + 7.69982545727116047928e-16, ], [ "3D state", :η, - -8.53000730930055017787e-01, - 8.52896671352524671228e-01, - 1.16182894068970207099e-06, - 6.02991581555750166821e-01, + -8.52733075123627615177e-01, + 8.52843573070954374948e-01, + 7.27595761418342649852e-17, + 6.02992194663175995473e-01, ], [ "3D state", @@ -157,7 +240,6 @@ fully_coupled = [ 0.00000000000000000000e+00, 0.00000000000000000000e+00, ], - #= [ "3D aux", :y, @@ -169,10 +251,10 @@ fully_coupled = [ [ "3D aux", :w, - -3.53444692332414609707e-04, - 3.53393768653404403979e-04, - -2.62684474750210507396e-09, - 1.76703229531742088583e-04, + -3.53382959639255767644e-04, + 3.53382959639288022659e-04, + 1.29021793249251000411e-18, + 1.76702345735587040528e-04, ], [ "3D aux", @@ -185,69 +267,67 @@ fully_coupled = [ [ "3D aux", :wz0, - -2.75669561310449110355e-16, - 2.61116688526775137768e-16, - 1.59449559147079600665e-18, - 3.68498533954047109486e-17, + -2.77662643533088964773e-16, + 2.60995737116479818354e-16, + 1.59158778279162806691e-18, + 3.68298754631880342784e-17, ], [ "3D aux", "uᵈ[1]", - -8.79815521725190063940e-01, - 8.79860306849815310137e-01, - -3.36235206981427825909e-08, - 4.41872889723482875635e-01, + -8.79713597641291755735e-01, + 8.79713597641291200624e-01, + -9.26547727431170607429e-17, + 4.41871673548253185437e-01, ], [ "3D aux", "uᵈ[2]", - -7.64485889244402041197e-08, - 1.07475092686394092540e-07, - 1.97594920215074170770e-12, - 1.00383435739831354977e-08, + -5.88884665747485312740e-28, + 6.47654803186450692243e-28, + 1.40221555861782666734e-30, + 4.22950073030020620100e-29, ], [ "3D aux", "ΔGᵘ[1]", - -8.90270808298916137079e-09, - 8.90270808302469374118e-09, - -3.03471576210481703598e-21, - 1.85087492582869203479e-09, + -1.50292385646252865781e-09, + 1.50292385640701573972e-09, + -3.03178502810731714103e-21, + 6.72141424487058536370e-10, ], [ "3D aux", "ΔGᵘ[2]", - -3.15722602438961622861e-09, - 5.35717978250396107350e-09, - -2.15993401549846601979e-25, - 7.02233250473352312290e-10, + -2.50330922252795548175e-19, + 2.79421319642066487612e-19, + 8.87468518373638336981e-36, + 5.19465794381941235415e-20, ], - =# [ "2D state", :η, - -8.53000730930055017787e-01, - 8.52896671352524671228e-01, - 1.16182894073002528620e-06, - 6.03462484854037639614e-01, + -8.52733075123627615177e-01, + 8.52843573070954374948e-01, + 1.61115565333602722195e-16, + 6.03463098440266798583e-01, ], [ "2D state", "U[1]", - -3.15731740631152391074e+01, - 3.15623403633881167707e+01, - -1.54618387206766983236e-03, - 2.24243954053573801843e+01, + -3.15402749945522060671e+01, + 3.15402749945527389741e+01, + 2.12974776703234167348e-14, + 2.24262621677375086904e+01, ], [ "2D state", "U[2]", - -2.13769342942716975009e-02, - 3.82134429332010097657e-02, - 5.66626758280705091560e-05, - 4.12563894411444639226e-03, + -1.63647745816416607002e-12, + 1.36781764162808076476e-12, + 6.31420737450488849608e-17, + 3.08233543917742288569e-13, ], - #= [ "2D aux", :f, @@ -275,38 +355,578 @@ fully_coupled = [ [ "2D aux", "Gᵁ[1]", - -3.56108323320987754941e-06, - 3.56108323319566433656e-06, - 1.21388901534735797970e-18, - 7.40928142985258653790e-07, + -6.01169542562806285963e-07, + 6.01169542585011466433e-07, + 1.21270571032004377760e-18, + 2.69066532005499711718e-07, ], [ "2D aux", "Gᵁ[2]", - -2.14287191300158429705e-06, - 1.26289040975584651791e-06, - 9.16489648929153005052e-23, - 2.81112662425186374727e-07, + -1.11768527856826595815e-16, + 1.00132368901118217729e-16, + -3.50057026691823957451e-33, + 2.07948587451660775232e-17, ], [ "2D aux", "Δu[1]", - -6.54477648201510250718e-04, - 6.54167531208154056505e-04, - 1.02401396398448558772e-07, - 4.64940295021459143454e-04, + -6.53936429129693404076e-04, + 6.53936429129569046087e-04, + -2.70378337774435083119e-18, + 4.64975945389895016328e-04, ], [ "2D aux", "Δu[2]", - -2.30864769013247066032e-06, - 4.06331319646622782525e-06, - 9.84808153015545305074e-10, - 4.00443091670026613147e-07, + -3.76049176138251460297e-17, + 3.57641761985933683411e-17, + -4.12443309266433447246e-19, + 7.09162842149286857838e-18, ], - =# ] +thirty_minutes = [ + [ + "3D state", + "u[1]", + -9.58527737426365766815e-01, + 9.58527737426364989659e-01, + -2.95585778076201651428e-17, + 4.45397585011924779241e-01, + ], + [ + "3D state", + "u[2]", + -3.91776258115697290002e-15, + 3.71573344368902785991e-15, + 9.99453214450878842160e-18, + 7.55533641450465537744e-16, + ], + [ + "3D state", + :η, + -8.52729582431237531637e-01, + 8.52830944991449846349e-01, + -2.54658516496419884307e-16, + 6.02990141900936249542e-01, + ], + [ + "3D state", + :θ, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "3D aux", + :y, + 0.00000000000000000000e+00, + 1.00000000000000011642e+06, + 5.00000000000000000000e+05, + 2.92775877460665535182e+05, + ], + [ + "3D aux", + :w, + -3.53414526318909707342e-04, + 3.53414526318917838858e-04, + 1.01391117723892420974e-18, + 1.76718134047034022751e-04, + ], + [ + "3D aux", + :pkin, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "3D aux", + :wz0, + -2.80660293737636040354e-16, + 2.60653535197941481007e-16, + 1.59719046528058323339e-18, + 3.69294984541935055746e-17, + ], + [ + "3D aux", + "uᵈ[1]", + -8.79792191807299950312e-01, + 8.79792191807298729067e-01, + -9.54969436861574689412e-17, + 4.41911149114936674387e-01, + ], + [ + "3D aux", + "uᵈ[2]", + -4.49650715975976729085e-28, + 3.22939933074851707840e-28, + 1.28559371735991545201e-30, + 3.12162656228539824003e-29, + ], + [ + "3D aux", + "ΔGᵘ[1]", + -1.52356619979685413105e-09, + 1.52356619973800994984e-09, + -3.00415481336788178489e-21, + 6.81373145706173027634e-10, + ], + [ + "3D aux", + "ΔGᵘ[2]", + -2.17115289587171316651e-19, + 2.99271337844227832879e-19, + 3.57452597678270976423e-36, + 5.23982958192948877053e-20, + ], + [ + "2D state", + :η, + -8.52729582431237531637e-01, + 8.52830944991449846349e-01, + -3.20454773827805192348e-16, + 6.03461044074932395631e-01, + ], + [ + "2D state", + "U[1]", + -3.15407643291233448224e+01, + 3.15407643291237640426e+01, + 2.30678864898692384736e-14, + 2.24265574817805202201e+01, + ], + [ + "2D state", + "U[2]", + -1.56710503246274425174e-12, + 1.48629337747559491236e-12, + 3.99781285780299048032e-15, + 3.02449468686897625244e-13, + ], + [ + "2D aux", + :f, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "τ[1]", + -0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "τ[2]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "Gᵁ[1]", + -6.09426479895203986555e-07, + 6.09426479918741655731e-07, + 1.20165633492970096897e-18, + 2.72762104279987029506e-07, + ], + [ + "2D aux", + "Gᵁ[2]", + -1.19708535137691129300e-16, + 8.68461158348685235787e-17, + -1.50869648123518501517e-33, + 2.09756864038773538444e-17, + ], + [ + "2D aux", + "Δu[1]", + -3.89449877638695009935e-03, + 3.89449877638627485824e-03, + -2.02396849009311295664e-17, + 2.76903473119681107703e-03, + ], + [ + "2D aux", + "Δu[2]", + -2.13991366909841745553e-16, + 2.02991354131742782465e-16, + -1.26781868574011981865e-18, + 4.34606820130057938426e-17, + ], +] + +sixty_minutes = [ + [ + "3D state", + "u[1]", + -9.58507705628042327994e-01, + 9.58507705628042550039e-01, + -5.22959453519433752618e-17, + 4.45394100308371843067e-01, + ], + [ + "3D state", + "u[2]", + -4.09893498131451878178e-15, + 3.66595063838075513859e-15, + 3.52058149555652693147e-18, + 7.65972478919525466697e-16, + ], + [ + "3D state", + :η, + -8.52715753705294066123e-01, + 8.52819886810596838878e-01, + 0.00000000000000000000e+00, + 6.02986351734545844572e-01, + ], + [ + "3D state", + :θ, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "3D aux", + :y, + 0.00000000000000000000e+00, + 1.00000000000000011642e+06, + 5.00000000000000000000e+05, + 2.92775877460665535182e+05, + ], + [ + "3D aux", + :w, + -3.53452249660253059287e-04, + 3.53452249660259076609e-04, + 9.71167590790855691193e-19, + 1.76737001559205427316e-04, + ], + [ + "3D aux", + :pkin, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "3D aux", + :wz0, + -2.79181036120644505053e-16, + 2.61030972352905244480e-16, + 1.54154914202599159790e-18, + 3.70358655371325481067e-17, + ], + [ + "3D aux", + "uᵈ[1]", + -8.79886113674857694988e-01, + 8.79886113674856806810e-01, + -8.81072992342524199517e-17, + 4.41958323665245178535e-01, + ], + [ + "3D aux", + "uᵈ[2]", + -5.04476548888837049561e-28, + 4.09418809809705127009e-28, + 1.53142189509630563206e-30, + 3.27579623353337388378e-29, + ], + [ + "3D aux", + "ΔGᵘ[1]", + -1.12461707299293835875e-09, + 1.12461707291060059378e-09, + -2.89803852573586336546e-21, + 5.02954103857782471789e-10, + ], + [ + "3D aux", + "ΔGᵘ[2]", + -2.29220407034248886795e-19, + 3.23795504633739099693e-19, + 4.19082355898662551731e-36, + 5.50021671320874203932e-20, + ], + [ + "2D state", + :η, + -8.52715753705294066123e-01, + 8.52819886810596838878e-01, + -2.04281036531028799987e-17, + 6.03457250948630341547e-01, + ], + [ + "2D state", + "U[1]", + -3.15415180428826182890e+01, + 3.15415180428829948767e+01, + 1.77902803599749859788e-14, + 2.24265293235027023400e+01, + ], + [ + "2D state", + "U[2]", + -1.63957399252576030728e-12, + 1.46638025535227397199e-12, + 1.40823259822193190848e-15, + 3.06628264537953242560e-13, + ], + [ + "2D aux", + :f, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "τ[1]", + -0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "τ[2]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "Gᵁ[1]", + -4.49846829164240224277e-07, + 4.49846829197175353425e-07, + 1.15921837490966064206e-18, + 2.01338753352722549629e-07, + ], + [ + "2D aux", + "Gᵁ[2]", + -1.29518201853495637566e-16, + 9.16881628136995516365e-17, + -2.08062063752041870574e-33, + 2.20180483211723137251e-17, + ], + [ + "2D aux", + "Δu[1]", + -7.71677156339491132631e-03, + 7.71677156339359640591e-03, + -2.97775205101297201914e-17, + 5.48673197909435757247e-03, + ], + [ + "2D aux", + "Δu[2]", + -5.01794629524824969143e-16, + 5.51655281127317078031e-16, + 3.20748218455203547025e-18, + 9.36761976343254920594e-17, + ], +] + +ninety_minutes = [ + [ + "3D state", + "u[1]", + -9.58488051495743564878e-01, + 9.58488051495744008967e-01, + -2.72848410531878478287e-17, + 4.45390687454859546257e-01, + ], + [ + "3D state", + "u[2]", + -4.05044403917298945083e-15, + 3.37351039462521829098e-15, + 2.85851376495618499592e-18, + 7.53889134369023261669e-16, + ], + [ + "3D state", + :η, + -8.52731405452108237597e-01, + 8.52809353848989259994e-01, + -1.36424205265939223736e-16, + 6.02988963894262375298e-01, + ], + [ + "3D state", + :θ, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "3D aux", + :y, + 0.00000000000000000000e+00, + 1.00000000000000011642e+06, + 5.00000000000000000000e+05, + 2.92775877460665535182e+05, + ], + [ + "3D aux", + :w, + -3.53489801387351135729e-04, + 3.53489801387356394110e-04, + 9.49240686054508876267e-19, + 1.76755783127780625140e-04, + ], + [ + "3D aux", + :pkin, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "3D aux", + :wz0, + -2.81605075727949063494e-16, + 2.62678958932129790667e-16, + 1.52127950807292491834e-18, + 3.72794870497354256528e-17, + ], + [ + "3D aux", + "uᵈ[1]", + -8.79979607451059520073e-01, + 8.79979607451058964962e-01, + -9.32232069317251423826e-17, + 4.42005283454923125763e-01, + ], + [ + "3D aux", + "uᵈ[2]", + -5.48652759581213710664e-28, + 3.92852730800063879095e-28, + 1.36055159257466689218e-30, + 3.58669418355622340063e-29, + ], + [ + "3D aux", + "ΔGᵘ[1]", + -8.86991425948811828542e-10, + 8.86991425888052000430e-10, + -2.87311034609816924955e-21, + 3.96682558396691740283e-10, + ], + [ + "3D aux", + "ΔGᵘ[2]", + -2.66880587297174792697e-19, + 3.32595187063539502433e-19, + 3.45126646034192634633e-36, + 5.71491963745139874533e-20, + ], + [ + "2D state", + :η, + -8.52731405452108237597e-01, + 8.52809353848989259994e-01, + -1.20259358027396949872e-16, + 6.03459865148300300675e-01, + ], + [ + "2D state", + "U[1]", + -3.15423820746578229546e+01, + 3.15423820746582954655e+01, + 2.75259190440912945341e-14, + 2.24266774102465760166e+01, + ], + [ + "2D state", + "U[2]", + -1.62017761566911967103e-12, + 1.34940415784996204528e-12, + 1.14340550598186518880e-15, + 3.01791152146446424566e-13, + ], + [ + "2D aux", + :f, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "τ[1]", + -0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "τ[2]", + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + 0.00000000000000000000e+00, + ], + [ + "2D aux", + "Gᵁ[1]", + -3.54796570355220815061e-07, + 3.54796570379524731417e-07, + 1.14925108410943513278e-18, + 1.58796938272805492033e-07, + ], + [ + "2D aux", + "Gᵁ[2]", + -1.33038074825415802514e-16, + 1.06752234918869909375e-16, + -1.45939267465887190460e-33, + 2.28775307028972280128e-17, + ], + [ + "2D aux", + "Δu[1]", + -1.14629123365995507638e-02, + 1.14629123365980502280e-02, + -3.95057006856089328375e-17, + 8.15149713200660763768e-03, + ], + [ + "2D aux", + "Δu[2]", + -7.52467366304891760665e-16, + 5.94961001279223574512e-16, + 6.25849006198159897312e-19, + 1.42516297748358802032e-16, + ], +] -refVals = - (not_coupled = (not_coupled, parr), fully_coupled = (fully_coupled, parr)) +refVals = ( + not_coupled = (not_coupled, parr), + fully_coupled = (fully_coupled, parr), + thirty_minutes = (thirty_minutes, parr), + sixty_minutes = (sixty_minutes, parr), + ninety_minutes = (ninety_minutes, parr), +)