From 1bb98783cd8ef6efb37fd2441556b6529d4def4f Mon Sep 17 00:00:00 2001
From: Brandon Allen <ballen@mit.edu>
Date: Mon, 29 Jun 2020 19:58:20 -0400
Subject: [PATCH] check reference values fo aux again

---
 .../SplitExplicit/hydrostatic_spindown.jl     |   6 +-
 .../refvals/hydrostatic_spindown_refvals.jl   | 516 +++++++++++++-----
 2 files changed, 390 insertions(+), 132 deletions(-)

diff --git a/test/Ocean/SplitExplicit/hydrostatic_spindown.jl b/test/Ocean/SplitExplicit/hydrostatic_spindown.jl
index 1121752ab13..3fe550506c3 100644
--- a/test/Ocean/SplitExplicit/hydrostatic_spindown.jl
+++ b/test/Ocean/SplitExplicit/hydrostatic_spindown.jl
@@ -332,9 +332,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,
@@ -388,7 +388,7 @@ const cᶻ = 0
             run_hydrostatic_spindown(
                 coupling = FullyCoupled(),
                 dt_slow = 300,
-                # refDat = refVals.fully_coupled,
+                refDat = refVals.fully_coupled,
             )
         end
     end
diff --git a/test/Ocean/refvals/hydrostatic_spindown_refvals.jl b/test/Ocean/refvals/hydrostatic_spindown_refvals.jl
index 20a39c2cf90..2e52c9cea4a 100644
--- a/test/Ocean/refvals/hydrostatic_spindown_refvals.jl
+++ b/test/Ocean/refvals/hydrostatic_spindown_refvals.jl
@@ -7,7 +7,6 @@ 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],
@@ -16,11 +15,9 @@ parr = [
     ["3D aux", "uᵈ[2]", 12, 12, 0, 12],
     ["3D aux", "ΔGᵘ[1]", 12, 12, 0, 12],
     ["3D aux", "ΔGᵘ[2]", 12, 12, 0, 12],
-    =#
     ["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],
@@ -28,33 +25,32 @@ parr = [
     ["2D aux", "Gᵁ[2]", 12, 12, 0, 12],
     ["2D aux", "Δu[1]", 12, 12, 0, 12],
     ["2D aux", "Δu[2]", 12, 12, 0, 12],
-    =#
 ]
 
 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.52735654368523166013e-01,
+        8.52839610988159746441e-01,
+        -2.76223488526738946074e-16,
+        6.03463847107759798760e-01,
     ],
     [
         "2D state",
         "U[1]",
-        -3.15391722007734536248e+01,
-        3.15391722007730805899e+01,
-        4.59412508035939049964e-15,
+        -3.15391722007734429667e+01,
+        3.15391722007731125643e+01,
+        -6.71651623207480911555e-16,
         2.24261366371601056358e+01,
     ],
     [
         "2D state",
         "U[2]",
-        -4.37584346168357661464e-13,
-        5.56621403621539302858e-13,
-        1.62907035110957408041e-14,
-        1.42652658850586700348e-13,
+        -5.28660196640225304769e-13,
+        5.53654892335427414531e-13,
+        1.42161375233088450725e-14,
+        1.42047464518599267171e-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.58693436976225776824e-01,
+        9.58636496537599080980e-01,
+        4.81602228023803030096e-06,
+        4.45400743325408854378e-01,
     ],
     [
         "3D state",
         "u[2]",
-        -5.34954449329680479380e-05,
-        9.56394271461731787596e-05,
-        1.41658660512563957739e-07,
-        1.03060542771323416372e-05,
+        -2.71598638837175200772e-05,
+        3.55854848651311712004e-05,
+        1.84327093792491436951e-07,
+        6.17355496875005675808e-06,
     ],
     [
         "3D state",
         :η,
-        -8.53000730930055017787e-01,
-        8.52896671352524671228e-01,
-        1.16182894068970207099e-06,
-        6.02991581555750166821e-01,
+        -8.52887140616245043034e-01,
+        8.52864583469863490883e-01,
+        -4.21657595448778024403e-06,
+        6.02988833484664032980e-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.53398896942187725097e-04,
+        3.53426573803516312459e-04,
+        -1.94862647855731362759e-09,
+        1.76703855691529086551e-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.77997212888963193000e-16,
+        2.62483971083202364971e-16,
+        1.58694278019185457679e-18,
+        3.68531621786603462856e-17,
     ],
     [
         "3D aux",
         "uᵈ[1]",
-        -8.79815521725190063940e-01,
-        8.79860306849815310137e-01,
-        -3.36235206981427825909e-08,
-        4.41872889723482875635e-01,
+        -8.79855936055210063884e-01,
+        8.79780915332670110374e-01,
+        -2.42309805668128330477e-08,
+        4.41872531796921430569e-01,
     ],
     [
         "3D aux",
         "uᵈ[2]",
-        -7.64485889244402041197e-08,
-        1.07475092686394092540e-07,
-        1.97594920215074170770e-12,
-        1.00383435739831354977e-08,
+        -1.78430126588856534755e-07,
+        1.83594716921623647330e-07,
+        -1.25618929682421908736e-12,
+        1.16636006620689195083e-08,
     ],
     [
         "3D aux",
         "ΔGᵘ[1]",
-        -8.90270808298916137079e-09,
-        8.90270808302469374118e-09,
-        -3.03471576210481703598e-21,
-        1.85087492582869203479e-09,
+        -4.73337959244426957476e-09,
+        5.50011029468127584823e-09,
+        -3.02773621061944176802e-21,
+        1.19543380514335098912e-09,
     ],
     [
         "3D aux",
         "ΔGᵘ[2]",
-        -3.15722602438961622861e-09,
-        5.35717978250396107350e-09,
-        -2.15993401549846601979e-25,
-        7.02233250473352312290e-10,
+        -2.14390435954465154230e-09,
+        1.97161910653024846657e-09,
+        -4.92337900591562100699e-26,
+        3.83319788473010807425e-10,
     ],
-    =#
     [
         "2D state",
         :η,
-        -8.53000730930055017787e-01,
-        8.52896671352524671228e-01,
-        1.16182894073002528620e-06,
-        6.03462484854037639614e-01,
+        -8.52887140616245043034e-01,
+        8.52864583469863490883e-01,
+        -4.21657595449893566795e-06,
+        6.03459734636858979862e-01,
     ],
     [
         "2D state",
         "U[1]",
-        -3.15731740631152391074e+01,
-        3.15623403633881167707e+01,
-        -1.54618387206766983236e-03,
-        2.24243954053573801843e+01,
+        -3.15750036522214649892e+01,
+        3.15560567037303556504e+01,
+        1.93497179137620562567e-03,
+        2.24248717533683574743e+01,
     ],
     [
         "2D state",
         "U[2]",
-        -2.13769342942716975009e-02,
-        3.82134429332010097657e-02,
-        5.66626758280705091560e-05,
-        4.12563894411444639226e-03,
+        -1.08596523034599542340e-02,
+        1.42150930009644193425e-02,
+        7.37313206025229259067e-05,
+        2.47134337053802471962e-03,
     ],
-    #=
     [
         "2D aux",
         :f,
@@ -275,38 +355,216 @@ fully_coupled = [
     [
         "2D aux",
         "Gᵁ[1]",
-        -3.56108323320987754941e-06,
-        3.56108323319566433656e-06,
-        1.21388901534735797970e-18,
-        7.40928142985258653790e-07,
+        -2.20004411787251037900e-06,
+        1.89335183697770782990e-06,
+        1.21111244134625836625e-18,
+        4.78546949308363618867e-07,
     ],
     [
         "2D aux",
         "Gᵁ[2]",
-        -2.14287191300158429705e-06,
-        1.26289040975584651791e-06,
-        9.16489648929153005052e-23,
-        2.81112662425186374727e-07,
+        -7.88647642612099446184e-07,
+        8.57561743817860689712e-07,
+        1.66018457661842861097e-23,
+        1.53447656067656341278e-07,
     ],
     [
         "2D aux",
         "Δu[1]",
-        -6.54477648201510250718e-04,
-        6.54167531208154056505e-04,
-        1.02401396398448558772e-07,
-        4.64940295021459143454e-04,
+        -6.54163343711688916558e-04,
+        6.54074252409548922635e-04,
+        3.59608027647928276027e-08,
+        4.65076960289650238010e-04,
     ],
     [
         "2D aux",
         "Δu[2]",
-        -2.30864769013247066032e-06,
-        4.06331319646622782525e-06,
-        9.84808153015545305074e-10,
-        4.00443091670026613147e-07,
+        -8.55710007672207043993e-07,
+        6.72871812726469319505e-07,
+        -1.03609612933625755503e-09,
+        1.31809933731672044976e-07,
     ],
-    =#
 ]
 
+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))