diff --git a/test/Ocean/ShallowWater/2D_hydrostatic_spindown.jl b/test/Ocean/ShallowWater/2D_hydrostatic_spindown.jl index 3fb19db7925..72a2c3e67c9 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 3fe550506c3..9913da9a03e 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(), ) 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 2e52c9cea4a..48e0d04d137 100644 --- a/test/Ocean/refvals/hydrostatic_spindown_refvals.jl +++ b/test/Ocean/refvals/hydrostatic_spindown_refvals.jl @@ -206,31 +206,30 @@ not_coupled = [ ], ] - fully_coupled = [ [ "3D state", "u[1]", - -9.58693436976225776824e-01, - 9.58636496537599080980e-01, - 4.81602228023803030096e-06, - 4.45400743325408854378e-01, + -9.58544854429326798062e-01, + 9.58544854429326798062e-01, + -4.09272615797817732838e-17, + 4.45400401208546903309e-01, ], [ "3D state", "u[2]", - -2.71598638837175200772e-05, - 3.55854848651311712004e-05, - 1.84327093792491436951e-07, - 6.17355496875005675808e-06, + -4.09119364541065205420e-15, + 3.41954410407034240802e-15, + 1.57855184364031418231e-19, + 7.69982545727116047928e-16, ], [ "3D state", :η, - -8.52887140616245043034e-01, - 8.52864583469863490883e-01, - -4.21657595448778024403e-06, - 6.02988833484664032980e-01, + -8.52733075123627615177e-01, + 8.52843573070954374948e-01, + 7.27595761418342649852e-17, + 6.02992194663175995473e-01, ], [ "3D state", @@ -251,10 +250,10 @@ fully_coupled = [ [ "3D aux", :w, - -3.53398896942187725097e-04, - 3.53426573803516312459e-04, - -1.94862647855731362759e-09, - 1.76703855691529086551e-04, + -3.53382959639255767644e-04, + 3.53382959639288022659e-04, + 1.29021793249251000411e-18, + 1.76702345735587040528e-04, ], [ "3D aux", @@ -267,66 +266,66 @@ fully_coupled = [ [ "3D aux", :wz0, - -2.77997212888963193000e-16, - 2.62483971083202364971e-16, - 1.58694278019185457679e-18, - 3.68531621786603462856e-17, + -2.77662643533088964773e-16, + 2.60995737116479818354e-16, + 1.59158778279162806691e-18, + 3.68298754631880342784e-17, ], [ "3D aux", "uᵈ[1]", - -8.79855936055210063884e-01, - 8.79780915332670110374e-01, - -2.42309805668128330477e-08, - 4.41872531796921430569e-01, + -8.79713597641291755735e-01, + 8.79713597641291200624e-01, + -9.26547727431170607429e-17, + 4.41871673548253185437e-01, ], [ "3D aux", "uᵈ[2]", - -1.78430126588856534755e-07, - 1.83594716921623647330e-07, - -1.25618929682421908736e-12, - 1.16636006620689195083e-08, + -5.88884665747485312740e-28, + 6.47654803186450692243e-28, + 1.40221555861782666734e-30, + 4.22950073030020620100e-29, ], [ "3D aux", "ΔGᵘ[1]", - -4.73337959244426957476e-09, - 5.50011029468127584823e-09, - -3.02773621061944176802e-21, - 1.19543380514335098912e-09, + -1.50292385646252865781e-09, + 1.50292385640701573972e-09, + -3.03178502810731714103e-21, + 6.72141424487058536370e-10, ], [ "3D aux", "ΔGᵘ[2]", - -2.14390435954465154230e-09, - 1.97161910653024846657e-09, - -4.92337900591562100699e-26, - 3.83319788473010807425e-10, + -2.50330922252795548175e-19, + 2.79421319642066487612e-19, + 8.87468518373638336981e-36, + 5.19465794381941235415e-20, ], [ "2D state", :η, - -8.52887140616245043034e-01, - 8.52864583469863490883e-01, - -4.21657595449893566795e-06, - 6.03459734636858979862e-01, + -8.52733075123627615177e-01, + 8.52843573070954374948e-01, + 1.61115565333602722195e-16, + 6.03463098440266798583e-01, ], [ "2D state", "U[1]", - -3.15750036522214649892e+01, - 3.15560567037303556504e+01, - 1.93497179137620562567e-03, - 2.24248717533683574743e+01, + -3.15402749945522060671e+01, + 3.15402749945527389741e+01, + 2.12974776703234167348e-14, + 2.24262621677375086904e+01, ], [ "2D state", "U[2]", - -1.08596523034599542340e-02, - 1.42150930009644193425e-02, - 7.37313206025229259067e-05, - 2.47134337053802471962e-03, + -1.63647745816416607002e-12, + 1.36781764162808076476e-12, + 6.31420737450488849608e-17, + 3.08233543917742288569e-13, ], [ "2D aux", @@ -355,216 +354,36 @@ fully_coupled = [ [ "2D aux", "Gᵁ[1]", - -2.20004411787251037900e-06, - 1.89335183697770782990e-06, - 1.21111244134625836625e-18, - 4.78546949308363618867e-07, + -6.01169542562806285963e-07, + 6.01169542585011466433e-07, + 1.21270571032004377760e-18, + 2.69066532005499711718e-07, ], [ "2D aux", "Gᵁ[2]", - -7.88647642612099446184e-07, - 8.57561743817860689712e-07, - 1.66018457661842861097e-23, - 1.53447656067656341278e-07, + -1.11768527856826595815e-16, + 1.00132368901118217729e-16, + -3.50057026691823957451e-33, + 2.07948587451660775232e-17, ], [ "2D aux", "Δu[1]", - -6.54163343711688916558e-04, - 6.54074252409548922635e-04, - 3.59608027647928276027e-08, - 4.65076960289650238010e-04, + -6.53936429129693404076e-04, + 6.53936429129569046087e-04, + -2.70378337774435083119e-18, + 4.64975945389895016328e-04, ], [ "2D aux", "Δu[2]", - -8.55710007672207043993e-07, - 6.72871812726469319505e-07, - -1.03609612933625755503e-09, - 1.31809933731672044976e-07, + -3.76049176138251460297e-17, + 3.57641761985933683411e-17, + -4.12443309266433447246e-19, + 7.09162842149286857838e-18, ], ] -fully_coupled = - varr = [ - [ - "3D state", - "u[1]", - -9.58563136375032431857e-01, - 9.58596814677659558868e-01, - 9.46137511407414428135e-07, - 4.45399982054627496808e-01, - ], - [ - "3D state", - "u[2]", - -6.97680484966063145448e-06, - 5.24706721739022056452e-06, - -3.43054142266428371863e-08, - 1.60148718228965786928e-06, - ], - [ - "3D state", - :η, - -8.52742260188508183205e-01, - 8.52844941526662458919e-01, - -7.16234549554428657555e-08, - 6.02990635895589877080e-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.53383226283543146803e-04, - 3.53408467233362339876e-04, - -2.46602760369668563935e-10, - 1.76702531654480656442e-04, - ], - [ - "3D aux", - :pkin, - 0.00000000000000000000e+00, - 0.00000000000000000000e+00, - 0.00000000000000000000e+00, - 0.00000000000000000000e+00, - ], - [ - "3D aux", - :wz0, - -2.78144942685956866743e-16, - 2.60993871469522605377e-16, - 1.57319465578561186977e-18, - 3.68409905210016180487e-17, - ], - [ - "3D aux", - "uᵈ[1]", - -8.79725378479474739990e-01, - 8.79733712094078579291e-01, - 1.28078369243667107674e-11, - 4.41871338371318589378e-01, - ], - [ - "3D aux", - "uᵈ[2]", - -3.72090673784392900170e-09, - 2.62643139164467678668e-09, - -2.03925926753278452901e-16, - 2.09690394427573106063e-10, - ], - [ - "3D aux", - "ΔGᵘ[1]", - -5.98112425171949920721e-08, - 2.46790690311795014851e-07, - 9.12971708143794058958e-10, - 1.51251576110256677877e-08, - ], - [ - "3D aux", - "ΔGᵘ[2]", - -3.67517877714320784666e-10, - 3.65639300690161840589e-10, - 4.19400837434125458455e-14, - 7.87930639403160541547e-11, - ], - [ - "2D state", - :η, - -8.52742260188508183205e-01, - 8.52844941526662458919e-01, - -7.16234549582139869820e-08, - 6.03461538455368873279e-01, - ], - [ - "2D state", - "U[1]", - -3.15475775248099630232e+01, - 3.15599156258251447582e+01, - 3.78449895496069002414e-04, - 2.24259860535744479648e+01, - ], - [ - "2D state", - "U[2]", - -2.79059501638067404203e-03, - 2.09879688070981106421e-03, - -1.37221656093219849252e-05, - 6.41095136999071321671e-04, - ], - [ - "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]", - -9.87162761247180017051e-05, - 2.39244970068779951348e-05, - -3.65188683257517646744e-07, - 6.05478781127203476538e-06, - ], - [ - "2D aux", - "Gᵁ[2]", - -1.46255720276064739544e-07, - 1.47007151085728316348e-07, - -1.67760334973652071599e-11, - 3.15418387978207963569e-08, - ], - [ - "2D aux", - "Δu[1]", - -6.53987697451610108454e-04, - 6.53975442536385248408e-04, - -4.10297338434939063448e-08, - 4.65009999582348268823e-04, - ], - [ - "2D aux", - "Δu[2]", - -1.07710571136527776445e-06, - 1.44495905291259778928e-06, - -5.01841587460294798507e-10, - 1.35316835204929275527e-07, - ], - ] - refVals = (not_coupled = (not_coupled, parr), fully_coupled = (fully_coupled, parr))