From 6ca1631d4176dd313fa5e8587da876b638d67d32 Mon Sep 17 00:00:00 2001 From: Anna Shlyaeva Date: Fri, 14 Feb 2025 15:09:46 -0700 Subject: [PATCH] Update yamls and test refs to an old change in yaml (#1112) Co-authored-by: shlyaeva --- test/testinput/3dhybfgat_pseudo.yml | 11 ++++++---- test/testinput/4dvar_htlm.yml | 11 ++++++---- test/testinput/4dvar_identity.yml | 11 ++++++---- test/testinput/varchange_balance.yml | 11 ++++++---- test/testinput/varchange_balance_TSSSH.yml | 11 ++++++---- test/testref/3dhybfgat_pseudo.test | 24 +++++++++++----------- test/testref/4dvar_htlm.test | 14 ++++++------- test/testref/4dvar_identity.test | 4 ++-- 8 files changed, 56 insertions(+), 41 deletions(-) diff --git a/test/testinput/3dhybfgat_pseudo.yml b/test/testinput/3dhybfgat_pseudo.yml index b7765985f..00610d06c 100644 --- a/test/testinput/3dhybfgat_pseudo.yml +++ b/test/testinput/3dhybfgat_pseudo.yml @@ -111,10 +111,13 @@ cost function: linear variable changes: - linear variable change name: BalanceSOCA - dsdtmax: 0.1 - dsdzmin: 3.0e-6 - dtdzmin: 1.0e-6 - nlayers: 2 + kst: + dsdtmax: 0.1 + dsdzmin: 3.0e-6 + dtdzmin: 1.0e-6 + nlayers: 2 + ksshts: + nlayers: 2 dcdt: filename: data_static/72x35x25/dcdt.nc name: dcdt diff --git a/test/testinput/4dvar_htlm.yml b/test/testinput/4dvar_htlm.yml index 6537024f3..4e964eec2 100644 --- a/test/testinput/4dvar_htlm.yml +++ b/test/testinput/4dvar_htlm.yml @@ -89,10 +89,13 @@ cost function: linear variable changes: - linear variable change name: BalanceSOCA - dsdtmax: 0.1 - dsdzmin: 3.0e-6 - dtdzmin: 1.0e-6 - nlayers: 2 + kst: + dsdtmax: 0.1 + dsdzmin: 3.0e-6 + dtdzmin: 1.0e-6 + nlayers: 2 + ksshts: + nlayers: 2 dcdt: filename: data_static/72x35x25/dcdt.nc name: dcdt diff --git a/test/testinput/4dvar_identity.yml b/test/testinput/4dvar_identity.yml index 138f99cf8..0fb4549ed 100644 --- a/test/testinput/4dvar_identity.yml +++ b/test/testinput/4dvar_identity.yml @@ -89,10 +89,13 @@ cost function: linear variable changes: - linear variable change name: BalanceSOCA - dsdtmax: 0.1 - dsdzmin: 3.0e-6 - dtdzmin: 1.0e-6 - nlayers: 2 + kst: + dsdtmax: 0.1 + dsdzmin: 3.0e-6 + dtdzmin: 1.0e-6 + nlayers: 2 + ksshts: + nlayers: 2 dcdt: filename: data_static/72x35x25/dcdt.nc name: dcdt diff --git a/test/testinput/varchange_balance.yml b/test/testinput/varchange_balance.yml index 1367b95c6..53188c1ec 100644 --- a/test/testinput/varchange_balance.yml +++ b/test/testinput/varchange_balance.yml @@ -37,10 +37,13 @@ linear variable change tests: output variables: *soca_an_vars linear variable changes: - linear variable change name: BalanceSOCA - dsdtmax: 1.0 - dsdzmin: 3.0e-3 - dtdzmin: 1.0e-3 + kst: + dsdtmax: 1.0 + dsdzmin: 3.0e-3 + dtdzmin: 1.0e-3 + nlayers: 10 + ksshts: + nlayers: 10 dcdt: filename: data_static/72x35x25/dcdt.nc name: dcdt - nlayers: 10 diff --git a/test/testinput/varchange_balance_TSSSH.yml b/test/testinput/varchange_balance_TSSSH.yml index f78f1c386..e5474f479 100644 --- a/test/testinput/varchange_balance_TSSSH.yml +++ b/test/testinput/varchange_balance_TSSSH.yml @@ -27,8 +27,11 @@ linear variable change tests: output variables: *soca_an_vars linear variable changes: - linear variable change name: BalanceSOCA - dsdtmax: 1.0 - dsdzmin: 3.0e-3 - dtdzmin: 1.0e-3 - nlayers: 10 + kst: + dsdtmax: 1.0 + dsdzmin: 3.0e-3 + dtdzmin: 1.0e-3 + nlayers: 10 + ksshts: + nlayers: 10 diff --git a/test/testref/3dhybfgat_pseudo.test b/test/testref/3dhybfgat_pseudo.test index b32cd887c..becc9db31 100644 --- a/test/testref/3dhybfgat_pseudo.test +++ b/test/testref/3dhybfgat_pseudo.test @@ -1,22 +1,22 @@ CostJb : Nonlinear Jb = 0.0000000000000000e+00 CostJo : Nonlinear Jo(ADT) = 2.2476814235841482e+02, nobs = 99, Jo/n = 2.2703852763476244e+00, err = 1.0000000149011613e-01 CostFunction: Nonlinear J = 2.2476814235841482e+02 -RPCGMinimizer: reduction in residual norm = 1.3320731298083168e-02 -CostFunction::addIncrement: Analysis: +RPCGMinimizer: reduction in residual norm = 1.3279821542958451e-02 +CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T12:00:00Z - sea_ice_area_fraction min=-0.0055418849744159 max=1.0000886961479574 mean=0.1175402571169394 - sea_ice_thickness min=-0.2230316173203144 max=4.0326713715018041 mean=0.4658882274471515 - sea_water_salinity min=10.7132817362146326 max=40.4416122444350350 mean=34.5582955552305791 - eastward_sea_water_velocity min=-0.8226354655295237 max=0.6737204173717148 mean=-0.0001433805834471 - northward_sea_water_velocity min=-0.9645810399665027 max=0.9240991277707887 mean=0.0002003548627873 -sea_water_potential_temperature min=-1.8651223187175390 max=31.8538874651658581 mean=6.0227097013390098 - sea_surface_height_above_geoid min=-2.1134175476076029 max=0.8955198009313518 mean=-0.2984377780518056 + sea_ice_area_fraction min=-0.0055436533627182 max=1.0000887718458058 mean=0.1175402973460810 + sea_ice_thickness min=-0.2231845811459730 max=4.0326713728872239 mean=0.4658857474068551 + sea_water_salinity min=10.7132817362146326 max=40.4416122444350350 mean=34.5582482935720563 + eastward_sea_water_velocity min=-0.8226354883602678 max=0.6737206737669789 mean=-0.0001433749781897 + northward_sea_water_velocity min=-0.9645802473946695 max=0.9240992002698506 mean=0.0002003563361414 +sea_water_potential_temperature min=-1.8651223187175390 max=31.8538874655882509 mean=6.0227102746676389 + sea_surface_height_above_geoid min=-2.1133324246109306 max=0.8957710504752534 mean=-0.2984314032216557 sea_water_cell_thickness min=0.0009999999999977 max=1345.6400000000007822 mean=128.6278147393432505 ocean_mixed_layer_thickness min=2.2805545996611403 max=4593.1693891607183104 mean=191.0555656854947131 sea_water_depth min=2.2805545996611403 max=5658.3062783710120129 mean=1200.5220907214948056 -CostJb : Nonlinear Jb = 6.4862665205739649 -CostJo : Nonlinear Jo(ADT) = 113.1627081523070899, nobs = 99, Jo/n = 1.1430576581041121, err = 0.1000000014901161 -CostFunction: Nonlinear J = 119.6489746728810530 +CostJb : Nonlinear Jb = 6.4429683342020123 +CostJo : Nonlinear Jo(ADT) = 113.2961818352593468, nobs = 99, Jo/n = 1.1444058771238317, err = 0.1000000014901161 +CostFunction: Nonlinear J = 119.7391501694613538 diff --git a/test/testref/4dvar_htlm.test b/test/testref/4dvar_htlm.test index cdbc1d666..44cd0bcbb 100644 --- a/test/testref/4dvar_htlm.test +++ b/test/testref/4dvar_htlm.test @@ -1,20 +1,20 @@ CostJb : Nonlinear Jb = 0.0000000000000000e+00 CostJo : Nonlinear Jo(SeaSufaceTemp) = 7.5731660125378380e+02, nobs = 90, Jo/n = 8.4146289028198193e+00, err = 3.7274007248048607e-01 CostFunction: Nonlinear J = 7.5731660125378380e+02 -RPCGMinimizer: reduction in residual norm = 1.2322699524464820e-01 +RPCGMinimizer: reduction in residual norm = 1.2269874777692313e-01 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z - sea_water_salinity min=10.7210460395083924 max=40.4416591897031168 mean=34.5439809125180375 + sea_water_salinity min=10.7210460395083924 max=40.4416591897031168 mean=34.5437862918539409 eastward_sea_water_velocity min=-0.8581693992488438 max=0.7000954286848975 mean=-0.0002411941155065 northward_sea_water_velocity min=-0.7661101215480253 max=1.4377766409421606 mean=0.0020193957336148 -sea_water_potential_temperature min=-1.8883899372702533 max=31.7004645720658580 mean=6.0184213300656824 - sea_surface_height_above_geoid min=-1.9243927498191502 max=0.9554915644585968 mean=-0.2782114584761634 +sea_water_potential_temperature min=-1.8883899372702533 max=31.7004645720658580 mean=6.0183786756706956 + sea_surface_height_above_geoid min=-1.9244009534418500 max=0.9547999799338502 mean=-0.2782054011933942 sea_water_cell_thickness min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642064969300 ocean_mixed_layer_thickness min=2.2854716757984130 max=4593.1533423819937525 mean=192.4109073940401515 sea_water_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158342398 -CostJb : Nonlinear Jb = 37.6857215674703809 -CostJo : Nonlinear Jo(SeaSufaceTemp) = 608.2853059430516396, nobs = 90, Jo/n = 6.7587256215894627, err = 0.3727400724804861 -CostFunction: Nonlinear J = 645.9710275105220489 +CostJb : Nonlinear Jb = 37.6443326387034602 +CostJo : Nonlinear Jo(SeaSufaceTemp) = 608.2917122363810449, nobs = 90, Jo/n = 6.7587968026264562, err = 0.3727400724804861 +CostFunction: Nonlinear J = 645.9360448750844625 diff --git a/test/testref/4dvar_identity.test b/test/testref/4dvar_identity.test index 801d5680a..117fc90be 100644 --- a/test/testref/4dvar_identity.test +++ b/test/testref/4dvar_identity.test @@ -4,11 +4,11 @@ CostFunction: Nonlinear J = 7.5731660125378380e+02 RPCGMinimizer: reduction in residual norm = 7.6550575118280284e-02 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z - sea_water_salinity min=10.7210460395083924 max=40.4416591897031168 mean=34.5443897261525663 + sea_water_salinity min=10.7210460395083924 max=40.4416591897031168 mean=34.5441632355969261 eastward_sea_water_velocity min=-0.8581693992488438 max=0.7000954286848975 mean=-0.0002411941155065 northward_sea_water_velocity min=-0.7661101215480253 max=1.4377766409421606 mean=0.0020193957336148 sea_water_potential_temperature min=-1.8883899372702533 max=31.7004645720658580 mean=6.0157314614329183 - sea_surface_height_above_geoid min=-1.9242749070275156 max=0.9526876430383274 mean=-0.2789223007557387 + sea_surface_height_above_geoid min=-1.9243038762262521 max=0.9520733875505107 mean=-0.2788664096789653 sea_water_cell_thickness min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642064969300 ocean_mixed_layer_thickness min=2.2854716757984130 max=4593.1533423819937525 mean=192.4109073940401515 sea_water_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158342398