From fc69718d3bee9fc463ec6d93e79dbf9d967e139a Mon Sep 17 00:00:00 2001 From: "Hyun-Chul.Lee" Date: Mon, 26 Jun 2023 19:58:29 +0000 Subject: [PATCH 1/2] a fix dvdz --- src/soca/Utils/soca_utils.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/soca/Utils/soca_utils.F90 b/src/soca/Utils/soca_utils.F90 index e886da3c5..19633d3b0 100644 --- a/src/soca/Utils/soca_utils.F90 +++ b/src/soca/Utils/soca_utils.F90 @@ -103,7 +103,7 @@ subroutine soca_diff(dvdz,v,h) k = size(v,1) do ik = 2, k-1 - dvdz(ik) = (v(ik+1)-v(ik-1))/(h(ik)+0.5*h(ik+1)+h(ik-1)) + dvdz(ik) = (v(ik+1)-v(ik-1))/(h(ik)+0.5*(h(ik+1)+h(ik-1))) end do dvdz(1) = dvdz(2) dvdz(k) = dvdz(k-1) From cc9e43c4f60d8d819890d1ab98e549da612cc407 Mon Sep 17 00:00:00 2001 From: kbhargava Date: Fri, 30 Jun 2023 12:43:50 -0400 Subject: [PATCH 2/2] Updating test references --- test/testref/3dhyb.test | 26 ++++---- test/testref/3dhybfgat.test | 26 ++++---- test/testref/3dvar_godas.test | 50 ++++++++-------- test/testref/3dvarbump.test | 32 +++++----- test/testref/3dvarfgat.test | 46 +++++++-------- test/testref/3dvarlowres_soca.test | 34 +++++------ test/testref/addincrement.test | 8 +-- test/testref/checkpointmodel.test | 8 +-- test/testref/convertincrement.test | 12 ++-- test/testref/dirac_soca_cov.test | 8 +-- test/testref/dirac_socahyb_cov.test | 16 ++--- test/testref/enspert.test | 70 +++++++++++----------- test/testref/parametric_stddev.test | 2 +- test/testref/sqrtvertloc.test | 92 ++++++++++++++--------------- 14 files changed, 215 insertions(+), 215 deletions(-) diff --git a/test/testref/3dhyb.test b/test/testref/3dhyb.test index 86379072d..2cb821609 100644 --- a/test/testref/3dhyb.test +++ b/test/testref/3dhyb.test @@ -1,17 +1,17 @@ CostJb : Nonlinear Jb = 0.0000000000000000e+00 -CostJo : Nonlinear Jo(ADT) = 2.0458137413924788e+02, nobs = 99, Jo/n = 2.0664785266590697e+00, err = 1.0000000149011612e-01 -CostFunction: Nonlinear J = 2.0458137413924788e+02 -RPCGMinimizer: reduction in residual norm = 2.0799916147215207e-02 +CostJo : Nonlinear Jo(ADT) = 2.0458137413924777e+02, nobs = 99, Jo/n = 2.0664785266590684e+00, err = 1.0000000149011613e-01 +CostFunction: Nonlinear J = 2.0458137413924777e+02 +RPCGMinimizer: reduction in residual norm = 2.0804496849039553e-02 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z - cicen min=-0.0040587640772214 max=1.0000648171411777 mean=0.1175079648519036 - hicen min=-0.1695062409273280 max=4.0326695831062072 mean=0.4670400834782142 + cicen min=-0.0040593081880349 max=1.0000647950655037 mean=0.1175080423133622 + hicen min=-0.1694837858544874 max=4.0326695826027077 mean=0.4670393369306883 hsnon min=0.0000000000000000 max=1.2712833951042413 mean=0.0886865877527975 - socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5744014203464261 - tocn min=-1.8947909199238167 max=31.7004646997533541 mean=6.0146866159992252 - uocn min=-0.8581811434703924 max=0.7001471559887942 mean=-0.0002552194939666 - vocn min=-0.7656658596944719 max=1.4377766409421606 mean=0.0021996588789184 - ssh min=-2.1622588504742026 max=0.8977780480451659 mean=-0.2938509447417898 + socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5744047862924830 + tocn min=-1.8947940137300057 max=31.7004646995896131 mean=6.0146891626655883 + uocn min=-0.8581809322810460 max=0.7001463582118039 mean=-0.0002552185891037 + vocn min=-0.7656658341969602 max=1.4377766409421606 mean=0.0021996576877204 + ssh min=-2.1622959317614252 max=0.8974154324210799 mean=-0.2938633000727268 hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017 sw min=-225.0977630615234375 max=-0.0000000000000000 mean=-71.7393205198725354 lhf min=-38.1373977661132812 max=256.5976562500000000 mean=42.0100402226406899 @@ -23,6 +23,6 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522 -CostJb : Nonlinear Jb = 6.1214769596423713 -CostJo : Nonlinear Jo(ADT) = 114.8805170210432181, nobs = 99, Jo/n = 1.1604092628388203, err = 0.1000000014901161 -CostFunction: Nonlinear J = 121.0019939806855831 +CostJb : Nonlinear Jb = 6.2208024967284885 +CostJo : Nonlinear Jo(ADT) = 114.6405248894628244, nobs = 99, Jo/n = 1.1579850998935639, err = 0.1000000014901161 +CostFunction: Nonlinear J = 120.8613273861913058 diff --git a/test/testref/3dhybfgat.test b/test/testref/3dhybfgat.test index fd87c313a..3ef4a059e 100644 --- a/test/testref/3dhybfgat.test +++ b/test/testref/3dhybfgat.test @@ -1,16 +1,16 @@ CostJb : Nonlinear Jb = 0.0000000000000000e+00 -CostJo : Nonlinear Jo(ADT) = 8.7370280580244312e+01, nobs = 31, Jo/n = 2.8183961477498167e+00, err = 1.0000000149011612e-01 -CostFunction: Nonlinear J = 8.7370280580244312e+01 -RPCGMinimizer: reduction in residual norm = 2.8879006360054962e-03 +CostJo : Nonlinear Jo(ADT) = 8.7370280580244113e+01, nobs = 31, Jo/n = 2.8183961477498101e+00, err = 1.0000000149011612e-01 +CostFunction: Nonlinear J = 8.7370280580244113e+01 +RPCGMinimizer: reduction in residual norm = 2.9185061797211485e-03 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z - cicen min=-0.0033930120836110 max=1.0000001204317763 mean=0.1174834218192429 - hicen min=-0.0900746262843310 max=4.0326673084246947 mean=0.4695551166024028 - socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5585013016301659 - uocn min=-0.8581693992488438 max=0.7001590290390129 mean=-0.0002537828716458 - vocn min=-0.7661101230340505 max=1.4377766409421606 mean=0.0021979175689238 - tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0145631838893507 - ssh min=-1.9241647037810099 max=0.8907404278998029 mean=-0.2876886553318843 + cicen min=-0.0033958872442029 max=1.0000001203835267 mean=0.1174835206793045 + hicen min=-0.0900934576976787 max=4.0326673084246947 mean=0.4695574918336070 + socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5585138714596098 + uocn min=-0.8581693992488438 max=0.7001579347565605 mean=-0.0002537807257102 + vocn min=-0.7661101230279923 max=1.4377766409421606 mean=0.0021979176021416 + tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0145093596929469 + ssh min=-1.9241669151494767 max=0.8902346892941313 mean=-0.2877140108914097 hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017 sw min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 lhf min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 @@ -22,6 +22,6 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522 -CostJb : Nonlinear Jb = 2.3910852056267453 -CostJo : Nonlinear Jo(ADT) = 76.9254966085777170, nobs = 31, Jo/n = 2.4814676325347649, err = 0.1000000014901161 -CostFunction: Nonlinear J = 79.3165818142044685 +CostJb : Nonlinear Jb = 2.4428367123211485 +CostJo : Nonlinear Jo(ADT) = 76.8979710680983288, nobs = 31, Jo/n = 2.4805797118741397, err = 0.1000000014901161 +CostFunction: Nonlinear J = 79.3408077804194818 diff --git a/test/testref/3dvar_godas.test b/test/testref/3dvar_godas.test index fc797706b..e87d7ec9b 100644 --- a/test/testref/3dvar_godas.test +++ b/test/testref/3dvar_godas.test @@ -1,27 +1,27 @@ CostJb : Nonlinear Jb = 0.0000000000000000e+00 CostJo : Nonlinear Jo(CoolSkin) = 1.6731214283333800e+04, nobs = 200, Jo/n = 8.3656071416669008e+01, err = 3.6419991997020579e-01 -CostJo : Nonlinear Jo(SeaSurfaceTemp) = 1.6258116856443858e+03, nobs = 174, Jo/n = 9.3437453197953211e+00, err = 3.6280357515271239e-01 -CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 5.4431675889674533e+00, nobs = 29, Jo/n = 1.8769543410232598e-01, err = 1.0000000000000000e+00 +CostJo : Nonlinear Jo(SeaSurfaceTemp) = 1.6258116856443880e+03, nobs = 174, Jo/n = 9.3437453197953335e+00, err = 3.6280357515271239e-01 +CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 5.4431675889674569e+00, nobs = 29, Jo/n = 1.8769543410232609e-01, err = 1.0000000000000000e+00 CostJo : Nonlinear Jo(ADT) = 1.0375381454781235e-02, nobs = 95, Jo/n = 1.0921454162927615e-04, err = 2.8169260935368467e+01 -CostJo : Nonlinear Jo(InsituTemperature) = 3.3944990007872309e+02, nobs = 205, Jo/n = 1.6558531711157225e+00, err = 8.9723213032395277e-01 -CostJo : Nonlinear Jo(InsituSalinity) = 3.4804589303321143e+02, nobs = 218, Jo/n = 1.5965407937303278e+00, err = 6.0819699545777528e-01 -CostJo : Nonlinear Jo(SeaIceFraction) = 5.8152359560103514e+02, nobs = 88, Jo/n = 6.6082226772844903e+00, err = 1.0000000149011612e-01 -CostFunction: Nonlinear J = 1.9631498900661576e+04 -RPCGMinimizer: reduction in residual norm = 1.4862985298039461e-01 +CostJo : Nonlinear Jo(InsituTemperature) = 3.3944990007872332e+02, nobs = 205, Jo/n = 1.6558531711157234e+00, err = 8.9723213032395277e-01 +CostJo : Nonlinear Jo(InsituSalinity) = 3.4804589303321234e+02, nobs = 218, Jo/n = 1.5965407937303318e+00, err = 6.0819699545777528e-01 +CostJo : Nonlinear Jo(SeaIceFraction) = 5.8152359560103446e+02, nobs = 88, Jo/n = 6.6082226772844823e+00, err = 1.0000000149011612e-01 +CostFunction: Nonlinear J = 1.9631498900661580e+04 +RPCGMinimizer: reduction in residual norm = 1.4890894677558011e-01 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z - cicen min=-0.0000692762619539 max=1.0003374928148037 mean=0.1175459538574530 + cicen min=-0.0000693201292598 max=1.0003376635630259 mean=0.1175458333852691 hicen min=0.0000000000000000 max=4.0326673084246947 mean=0.4712515705773916 hsnon min=0.0000000000000000 max=1.2712833951042413 mean=0.0886865877527975 - socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5443923210379893 - tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0183148649295131 - ssh min=-1.9244215595435641 max=0.9272826987293792 mean=-0.2767864244350091 + socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5443923223520315 + tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0183437899017829 + ssh min=-1.9244215280991723 max=0.9272827086645625 mean=-0.2767863997914393 hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017 - sw min=-225.0942946657453660 max=0.0000000000000000 mean=-71.7383583440961132 - lhf min=-38.1375200295195498 max=256.5954941593348053 mean=42.0097185887710580 - shf min=-58.9492911009887948 max=201.3742676087534278 mean=6.0753284159540160 - lw min=0.0000000000000000 max=88.0360936577936570 mean=31.3955346150854773 - us min=0.0043960513522736 max=0.0196673881640923 mean=0.0086875716053277 + sw min=-225.0942956823528505 max=0.0000000000000000 mean=-71.7383580540423793 + lhf min=-38.1375200582396161 max=256.5954937724312686 mean=42.0097184800355450 + shf min=-58.9492910987185894 max=201.3742675934934994 mean=6.0753284134086591 + lw min=0.0000000000000000 max=88.0360936611186276 mean=31.3955346168523803 + us min=0.0043960514439903 max=0.0196673929715284 mean=0.0086875839294735 mld min=2.2854716757984130 max=4593.1533423819937525 mean=192.4109073940401515 layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420 @@ -33,12 +33,12 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522 -CostJb : Nonlinear Jb = 0.3607257504211560 -CostJo : Nonlinear Jo(CoolSkin) = 16187.3654912514211901, nobs = 200, Jo/n = 80.9368274562571060, err = 0.3641999199702058 -CostJo : Nonlinear Jo(SeaSurfaceTemp) = 1602.0416832526752842, nobs = 174, Jo/n = 9.2071361106475589, err = 0.3628035751527124 -CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 5.4426907397108639, nobs = 29, Jo/n = 0.1876789910245125, err = 1.0000000000000000 -CostJo : Nonlinear Jo(ADT) = 0.0103757220711691, nobs = 95, Jo/n = 0.0001092181270649, err = 28.1692609353684666 -CostJo : Nonlinear Jo(InsituTemperature) = 337.9287619710107720, nobs = 205, Jo/n = 1.6484329852244428, err = 0.8972321303239528 -CostJo : Nonlinear Jo(InsituSalinity) = 346.7212333339583665, nobs = 218, Jo/n = 1.5904643730915522, err = 0.6081969954577753 -CostJo : Nonlinear Jo(SeaIceFraction) = 580.7189695656682034, nobs = 88, Jo/n = 6.5990791996098661, err = 0.1000000014901161 -CostFunction: Nonlinear J = 19060.5899315869392012 +CostJb : Nonlinear Jb = 0.3856003402344498 +CostJo : Nonlinear Jo(CoolSkin) = 16186.9643635032589373, nobs = 200, Jo/n = 80.9348218175162941, err = 0.3641999199702058 +CostJo : Nonlinear Jo(SeaSurfaceTemp) = 1596.7679360181962238, nobs = 174, Jo/n = 9.1768272184953812, err = 0.3628035751527124 +CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 5.4426904998659715, nobs = 29, Jo/n = 0.1876789827539990, err = 1.0000000000000000 +CostJo : Nonlinear Jo(ADT) = 0.0103757170152075, nobs = 95, Jo/n = 0.0001092180738443, err = 28.1692609353684666 +CostJo : Nonlinear Jo(InsituTemperature) = 337.3302597227105935, nobs = 205, Jo/n = 1.6455134620620029, err = 0.8972321303239528 +CostJo : Nonlinear Jo(InsituSalinity) = 346.7205645110620367, nobs = 218, Jo/n = 1.5904613050966148, err = 0.6081969954577753 +CostJo : Nonlinear Jo(SeaIceFraction) = 580.7185630030103312, nobs = 88, Jo/n = 6.5990745795796633, err = 0.1000000014901161 +CostFunction: Nonlinear J = 19054.3403533153577882 diff --git a/test/testref/3dvarbump.test b/test/testref/3dvarbump.test index 0365ecc87..0aadcc327 100644 --- a/test/testref/3dvarbump.test +++ b/test/testref/3dvarbump.test @@ -1,19 +1,19 @@ CostJb : Nonlinear Jb = 0.0000000000000000e+00 -CostJo : Nonlinear Jo(SeaSurfaceTemp) = 7.2761517888788660e+02, nobs = 123, Jo/n = 5.9155705600641184e+00, err = 3.7062900658774245e-01 +CostJo : Nonlinear Jo(SeaSurfaceTemp) = 7.2761520714484391e+02, nobs = 123, Jo/n = 5.9155707897954786e+00, err = 3.7062899283957257e-01 CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 5.7834714574083208e+01, nobs = 50, Jo/n = 1.1566942914816642e+00, err = 1.0000000000000000e+00 -CostJo : Nonlinear Jo(ADT) = 1.7801726582342692e+02, nobs = 91, Jo/n = 1.9562336903673287e+00, err = 1.0000000149011612e-01 -CostJo : Nonlinear Jo(InsituTemperature) = 3.4603228199330812e+02, nobs = 203, Jo/n = 1.7045925221345228e+00, err = 9.0034813002045044e-01 -CostJo : Nonlinear Jo(InsituSalinity) = 3.1204770545775682e+02, nobs = 218, Jo/n = 1.4314114929254900e+00, err = 6.0819699619437717e-01 -CostFunction: Nonlinear J = 1.6215471467364616e+03 -RPCGMinimizer: reduction in residual norm = 2.0333584772030691e-01 +CostJo : Nonlinear Jo(ADT) = 1.7801726582342690e+02, nobs = 91, Jo/n = 1.9562336903673285e+00, err = 1.0000000149011612e-01 +CostJo : Nonlinear Jo(InsituTemperature) = 3.4603234526181200e+02, nobs = 203, Jo/n = 1.7045928338020295e+00, err = 9.0034813852418905e-01 +CostJo : Nonlinear Jo(InsituSalinity) = 3.1204797269182581e+02, nobs = 218, Jo/n = 1.4314127187698431e+00, err = 6.0819699545777528e-01 +CostFunction: Nonlinear J = 1.6215475054959918e+03 +RPCGMinimizer: reduction in residual norm = 1.9585627812873155e-01 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z hocn min=0.0009999999999977 max=1345.6400000000003274 mean=132.2975966204909355 - socn min=21.6778874359345082 max=39.8774684135234310 mean=34.6285532534979836 - tocn min=-1.8883899372702533 max=33.0299466196283120 mean=6.3804420615446844 + socn min=21.6778874359345082 max=39.8774684135234310 mean=34.6292686263590355 + tocn min=-1.8883899372702533 max=33.2682523259166132 mean=6.3735018436205531 uocn min=-0.6975788196638589 max=0.4840625031242498 mean=0.0013055310445162 vocn min=-0.7661101215480253 max=0.9402890903466523 mean=0.0028998456865158 - ssh min=-2.0964116929684500 max=0.8417711551919234 mean=-0.2579245652977167 + ssh min=-2.1084939224168693 max=0.8449085686573465 mean=-0.2602635096607882 mld min=2.4370615877370523 max=4593.1523423819935488 mean=193.6208071648662212 layer_depth min=2.4370615877370523 max=5587.8978052886013757 mean=1243.8222388394297013 @@ -23,10 +23,10 @@ layer_depth min=2.4370615877370523 max=5587.8978052886013757 mean=1243.822 -CostJb : Nonlinear Jb = 59.4492415973704951 -CostJo : Nonlinear Jo(SeaSurfaceTemp) = 444.1238384078720856, nobs = 123, Jo/n = 3.6107629138851389, err = 0.3706290065877424 -CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 59.5333260200038552, nobs = 50, Jo/n = 1.1906665204000770, err = 1.0000000000000000 -CostJo : Nonlinear Jo(ADT) = 150.9104219724243023, nobs = 91, Jo/n = 1.6583562854112561, err = 0.1000000014901161 -CostJo : Nonlinear Jo(InsituTemperature) = 300.1571147651554270, nobs = 203, Jo/n = 1.4786064766756426, err = 0.9003481300204504 -CostJo : Nonlinear Jo(InsituSalinity) = 150.1629547995659095, nobs = 218, Jo/n = 0.6888208935759904, err = 0.6081969961943772 -CostFunction: Nonlinear J = 1164.3368975623920960 +CostJb : Nonlinear Jb = 53.0340911400380790 +CostJo : Nonlinear Jo(SeaSurfaceTemp) = 446.9544273941489791, nobs = 123, Jo/n = 3.6337758324727560, err = 0.3706289928395726 +CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 59.9152947100068118, nobs = 50, Jo/n = 1.1983058942001363, err = 1.0000000000000000 +CostJo : Nonlinear Jo(ADT) = 154.6934489111536095, nobs = 91, Jo/n = 1.6999280100126770, err = 0.1000000014901161 +CostJo : Nonlinear Jo(InsituTemperature) = 293.3242787162378136, nobs = 203, Jo/n = 1.4449471857942748, err = 0.9003481385241890 +CostJo : Nonlinear Jo(InsituSalinity) = 149.8578704365598355, nobs = 218, Jo/n = 0.6874214240209167, err = 0.6081969954577753 +CostFunction: Nonlinear J = 1157.7794113081451997 diff --git a/test/testref/3dvarfgat.test b/test/testref/3dvarfgat.test index c8fd9132a..72148e834 100644 --- a/test/testref/3dvarfgat.test +++ b/test/testref/3dvarfgat.test @@ -1,23 +1,23 @@ CostJb : Nonlinear Jb = 0.0000000000000000e+00 -CostJo : Nonlinear Jo(CoolSkin) = 4.9634484023024434e+03, nobs = 47, Jo/n = 1.0560528515537113e+02, err = 3.8763170936361402e-01 -CostJo : Nonlinear Jo(SeaSurfaceTemp) = 3.1780648145945952e+02, nobs = 43, Jo/n = 7.3908484060339426e+00, err = 3.8581536591328441e-01 +CostJo : Nonlinear Jo(CoolSkin) = 4.9634479411817738e+03, nobs = 47, Jo/n = 1.0560527534429306e+02, err = 3.8763169345842458e-01 +CostJo : Nonlinear Jo(SeaSurfaceTemp) = 3.1780656884217410e+02, nobs = 43, Jo/n = 7.3908504381900952e+00, err = 3.8581534929661854e-01 CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 2.6167366978835638e+00, nobs = 17, Jo/n = 1.5392568811079788e-01, err = 1.0000000000000000e+00 -CostJo : Nonlinear Jo(ADT) = 8.7166288646666715e+01, nobs = 29, Jo/n = 3.0057340912643693e+00, err = 1.0000000149011612e-01 -CostJo : Nonlinear Jo(InsituTemperature) = 3.7309148937513228e+01, nobs = 31, Jo/n = 1.2035209334681687e+00, err = 9.0893990043753048e-01 -CostJo : Nonlinear Jo(InsituSalinity) = 1.6779698504915352e+01, nobs = 33, Jo/n = 5.0847571227016219e-01, err = 6.1042996877640276e-01 -CostJo : Nonlinear Jo(SeaIceFraction) = 1.9943705186059643e+02, nobs = 24, Jo/n = 8.3098771608581838e+00, err = 1.0000000149011612e-01 +CostJo : Nonlinear Jo(ADT) = 8.7166288646666516e+01, nobs = 29, Jo/n = 3.0057340912643626e+00, err = 1.0000000149011612e-01 +CostJo : Nonlinear Jo(InsituTemperature) = 3.7309178313712380e+01, nobs = 31, Jo/n = 1.2035218810874961e+00, err = 9.0893991658246809e-01 +CostJo : Nonlinear Jo(InsituSalinity) = 1.6779590930092283e+01, nobs = 33, Jo/n = 5.0847245242703887e-01, err = 6.1042996833236707e-01 +CostJo : Nonlinear Jo(SeaIceFraction) = 1.9943705186059600e+02, nobs = 24, Jo/n = 8.3098771608581661e+00, err = 1.0000000149011612e-01 CostJo : Nonlinear Jo(SurfaceU) = 4.6119926561840613e-01, nobs = 47, Jo/n = 9.8127503323065142e-03, err = 3.8763169345842458e-01 -CostFunction: Nonlinear J = 5.6250250076750963e+03 -RPCGMinimizer: reduction in residual norm = 5.2048506043922749e-01 +CostFunction: Nonlinear J = 5.6250245557385160e+03 +RPCGMinimizer: reduction in residual norm = 5.6036154349071332e-01 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z - cicen min=-0.0036461410982119 max=1.0109931640227883 mean=0.1187047480311327 + cicen min=-0.0023081640292671 max=1.0069589746383956 mean=0.1182667192938162 hicen min=0.0000000000000000 max=4.0326673084246947 mean=0.4712515705773916 - socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5450531726743222 - tocn min=-1.8883899372702533 max=35.0183755472273646 mean=6.0354516565170089 - uocn min=-0.8581740826997210 max=0.7001342412896886 mean=-0.0002590794848360 + socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5448011509061246 + tocn min=-1.8883899372702533 max=34.9467200164778191 mean=6.0306130214233562 + uocn min=-0.8581723640018309 max=0.7001199981293115 mean=-0.0002591153419329 vocn min=-0.7661101215480253 max=1.4377766409421606 mean=0.0021972630399530 - ssh min=-1.9226513153496561 max=0.9252938884592239 mean=-0.2768077098202168 + ssh min=-1.9233241368623117 max=0.9260032295261909 mean=-0.2767309144919679 hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017 sw min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 lhf min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 @@ -36,13 +36,13 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522 -CostJb : Nonlinear Jb = 495.8764189052791380 -CostJo : Nonlinear Jo(CoolSkin) = 3241.5673056968789751, nobs = 47, Jo/n = 68.9695171424867937, err = 0.3876317093636140 -CostJo : Nonlinear Jo(SeaSurfaceTemp) = 995.4286033827154370, nobs = 43, Jo/n = 23.1495024042491977, err = 0.3858153659132844 -CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 2.6093767205769982, nobs = 17, Jo/n = 0.1534927482692352, err = 1.0000000000000000 -CostJo : Nonlinear Jo(ADT) = 87.1276729159087751, nobs = 29, Jo/n = 3.0044025143416819, err = 0.1000000014901161 -CostJo : Nonlinear Jo(InsituTemperature) = 35.9880657312897370, nobs = 31, Jo/n = 1.1609053461706367, err = 0.9089399004375305 -CostJo : Nonlinear Jo(InsituSalinity) = 16.4009625219917794, nobs = 33, Jo/n = 0.4969988643027812, err = 0.6104299687764028 -CostJo : Nonlinear Jo(SeaIceFraction) = 185.7140989927694932, nobs = 24, Jo/n = 7.7380874580320622, err = 0.1000000014901161 -CostJo : Nonlinear Jo(SurfaceU) = 0.4659371855637282, nobs = 47, Jo/n = 0.0099135571396538, err = 0.3876316934584246 -CostFunction: Nonlinear J = 5061.1784420529738782 +CostJb : Nonlinear Jb = 279.9394197974504550 +CostJo : Nonlinear Jo(CoolSkin) = 3440.4450658851174012, nobs = 47, Jo/n = 73.2009588486195213, err = 0.3876316934584246 +CostJo : Nonlinear Jo(SeaSurfaceTemp) = 974.5843784850217162, nobs = 43, Jo/n = 22.6647529880237606, err = 0.3858153492966185 +CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 2.6121336586950621, nobs = 17, Jo/n = 0.1536549210997095, err = 1.0000000000000000 +CostJo : Nonlinear Jo(ADT) = 87.2766562461966515, nobs = 29, Jo/n = 3.0095398705585050, err = 0.1000000014901161 +CostJo : Nonlinear Jo(InsituTemperature) = 36.2267410466876498, nobs = 31, Jo/n = 1.1686045498931501, err = 0.9089399165824681 +CostJo : Nonlinear Jo(InsituSalinity) = 16.5292041808890886, nobs = 33, Jo/n = 0.5008849751784572, err = 0.6104299683323671 +CostJo : Nonlinear Jo(SeaIceFraction) = 190.6732775782927263, nobs = 24, Jo/n = 7.9447198990955306, err = 0.1000000014901161 +CostJo : Nonlinear Jo(SurfaceU) = 0.4659840212169950, nobs = 47, Jo/n = 0.0099145536429148, err = 0.3876316934584246 +CostFunction: Nonlinear J = 5028.7528608995671675 diff --git a/test/testref/3dvarlowres_soca.test b/test/testref/3dvarlowres_soca.test index f0416723d..6f01c506d 100644 --- a/test/testref/3dvarlowres_soca.test +++ b/test/testref/3dvarlowres_soca.test @@ -1,16 +1,16 @@ CostJb : Nonlinear Jb = 0.0000000000000000e+00 -CostJo : Nonlinear Jo(SeaSurfaceTemp) = 7.8349292492913401e+02, nobs = 148, Jo/n = 5.2938711143860404e+00, err = 3.6139744797888412e-01 -CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 4.9679661574589510e+01, nobs = 51, Jo/n = 9.7411101126646094e-01, err = 1.0000000000000000e+00 -CostJo : Nonlinear Jo(ADT) = 1.2846395537995437e+02, nobs = 87, Jo/n = 1.4765971882753377e+00, err = 1.0000000149011612e-01 -CostJo : Nonlinear Jo(InsituTemperature) = 3.4357428588263724e+02, nobs = 206, Jo/n = 1.6678363392361031e+00, err = 8.9914415084947397e-01 -CostJo : Nonlinear Jo(InsituSalinity) = 3.4655706446545878e+02, nobs = 218, Jo/n = 1.5897113048874256e+00, err = 6.0819699619437717e-01 -CostFunction: Nonlinear J = 1.6517678922317739e+03 -RPCGMinimizer: reduction in residual norm = 9.7423095545183969e-02 +CostJo : Nonlinear Jo(SeaSurfaceTemp) = 7.8349275156178805e+02, nobs = 148, Jo/n = 5.2938699429850544e+00, err = 3.6139743385133083e-01 +CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 4.9679661574589502e+01, nobs = 51, Jo/n = 9.7411101126646082e-01, err = 1.0000000000000000e+00 +CostJo : Nonlinear Jo(ADT) = 1.2846395537995426e+02, nobs = 87, Jo/n = 1.4765971882753364e+00, err = 1.0000000149011612e-01 +CostJo : Nonlinear Jo(InsituTemperature) = 3.4357440141216813e+02, nobs = 206, Jo/n = 1.6678369000590685e+00, err = 8.9914415723945484e-01 +CostJo : Nonlinear Jo(InsituSalinity) = 3.4655673420278879e+02, nobs = 218, Jo/n = 1.5897097899210495e+00, err = 6.0819699545777528e-01 +CostFunction: Nonlinear J = 1.6517675041312887e+03 +RPCGMinimizer: reduction in residual norm = 1.0577708381511183e-01 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z - socn min=10.7211454688298637 max=40.4416975635020464 mean=34.5451924330062425 - tocn min=-2.0250616941373800 max=31.9809449259507943 mean=6.0270858665869822 - ssh min=-2.0101584831178037 max=0.9059493873601913 mean=-0.2796082501025529 + socn min=10.7211321702112450 max=40.4416937318713892 mean=34.5452612159349073 + tocn min=-1.9924644486895162 max=32.0033142104850512 mean=6.0270311615198819 + ssh min=-2.0047075305248567 max=0.9082175452289394 mean=-0.2788411193911333 hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017 mld min=2.2854716757984130 max=4593.1533423819937525 mean=192.4109073940401515 layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420 @@ -21,10 +21,10 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522 -CostJb : Nonlinear Jb = 247.2970677811429141 -CostJo : Nonlinear Jo(SeaSurfaceTemp) = 304.8949002117833516, nobs = 148, Jo/n = 2.0601006771066444, err = 0.3613974479788841 -CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 49.7228068394711613, nobs = 51, Jo/n = 0.9749569968523757, err = 1.0000000000000000 -CostJo : Nonlinear Jo(ADT) = 87.5069625402823306, nobs = 87, Jo/n = 1.0058271556354290, err = 0.1000000014901161 -CostJo : Nonlinear Jo(InsituTemperature) = 147.3995389675887111, nobs = 206, Jo/n = 0.7155317425611103, err = 0.8991441508494740 -CostJo : Nonlinear Jo(InsituSalinity) = 291.6384933375049968, nobs = 218, Jo/n = 1.3377912538417660, err = 0.6081969961943772 -CostFunction: Nonlinear J = 1128.4597696777734654 +CostJb : Nonlinear Jb = 275.0276207267167479 +CostJo : Nonlinear Jo(SeaSurfaceTemp) = 299.7316436365123877, nobs = 148, Jo/n = 2.0252138083548132, err = 0.3613974338513308 +CostJo : Nonlinear Jo(SeaSurfaceSalinity) = 49.7183085773384477, nobs = 51, Jo/n = 0.9748687956340872, err = 1.0000000000000000 +CostJo : Nonlinear Jo(ADT) = 90.0817750889277420, nobs = 87, Jo/n = 1.0354227021715832, err = 0.1000000014901161 +CostJo : Nonlinear Jo(InsituTemperature) = 141.6604768580295968, nobs = 206, Jo/n = 0.6876722177574253, err = 0.8991441572394548 +CostJo : Nonlinear Jo(InsituSalinity) = 291.8347806154215505, nobs = 218, Jo/n = 1.3386916541991813, err = 0.6081969954577753 +CostFunction: Nonlinear J = 1148.0546055029465151 diff --git a/test/testref/addincrement.test b/test/testref/addincrement.test index f44a146e4..0148c8b94 100644 --- a/test/testref/addincrement.test +++ b/test/testref/addincrement.test @@ -14,15 +14,15 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522 Increment: Valid time: 2018-04-15T00:00:00Z hsnon min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 - socn min=-0.0001052975794454 max=0.0036676711597962 mean=0.0000025948881890 - tocn min=-0.0937701759334219 max=0.0916147861820920 mean=0.0007499060728516 + socn min=-0.0001053508048706 max=0.0036695245546320 mean=0.0000025961995222 + tocn min=-0.0938132581918806 max=0.0916756132663934 mean=0.0007788315484231 State plus increment: Valid time: 2018-04-15T00:00:00Z cicen min=0.0000000000000000 max=1.0000000000000000 mean=0.1175125761012928 hicen min=0.0000000000000000 max=4.0326673084246947 mean=0.4712515705773916 hsnon min=0.0000000000000000 max=1.2712833951042413 mean=0.0886865877527975 - socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5443923210406965 - tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0183148644262134 + socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5443923223520315 + tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0183437899017829 ssh min=-1.9244847628277935 max=0.9272826517867588 mean=-0.2767903423591662 hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017 uocn min=-0.8581693992488438 max=0.7000954286848975 mean=-0.0002591771954069 diff --git a/test/testref/checkpointmodel.test b/test/testref/checkpointmodel.test index 6dd58e410..e699ccff1 100644 --- a/test/testref/checkpointmodel.test +++ b/test/testref/checkpointmodel.test @@ -7,12 +7,12 @@ input background: analysis: Valid time: 2018-04-15T00:00:00Z - socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5443923210406965 - tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0183148644262134 + socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5443923223520315 + tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0183437899017829 hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017 output background: Valid time: 2018-04-15T00:00:00Z - socn min=10.7210460395083924 max=38.0000000000000000 mean=34.5397727321684940 - tocn min=-1.8000000000000000 max=31.7004645720658580 mean=6.0184532881230473 + socn min=10.7210460395083924 max=38.0000000000000000 mean=34.5397727334798290 + tocn min=-1.8000000000000000 max=31.7004645720658580 mean=6.0184822134112945 hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017 diff --git a/test/testref/convertincrement.test b/test/testref/convertincrement.test index b199b66fe..6da2a9430 100644 --- a/test/testref/convertincrement.test +++ b/test/testref/convertincrement.test @@ -1,8 +1,8 @@ Input increment: Valid time: 2018-04-15T00:00:00Z - tocn min=-0.0937701759334219 max=0.0916147861820920 mean=0.0007499060728516 - socn min=-0.0001052975794454 max=0.0036676711597962 mean=0.0000025948881890 - ssh min=-0.0001334771319600 max=0.0005896992435650 mean=0.0000039179219967 + tocn min=-0.0938132581918806 max=0.0916756132663934 mean=0.0007788315484231 + socn min=-0.0001053508048706 max=0.0036695245546320 mean=0.0000025961995222 + ssh min=-0.0001335113919512 max=0.0005900187800294 mean=0.0000039425677270 hocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 Trajectory state: Valid time: 2018-04-15T00:00:00Z @@ -14,7 +14,7 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522 mld min=2.2854716757984130 max=4593.1533423819937525 mean=192.4109073940401515 Output increment: Valid time: 2018-04-15T00:00:00Z - tocn min=-0.0937701759334219 max=0.0916147861820920 mean=0.0007499060728516 - socn min=-0.0001052975794454 max=0.0036676711597962 mean= -nan - ssh min=-0.0005644408490946 max=0.0015921913987081 mean=0.0000259244097400 + tocn min=-0.0938132581918806 max=0.0916756132663934 mean=0.0007788315484231 + socn min=-0.0001053508048706 max=0.0036695245546320 mean= -nan + ssh min=-0.0005646980045385 max=0.0015930535209445 mean=0.0000282744256740 hocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 diff --git a/test/testref/dirac_soca_cov.test b/test/testref/dirac_soca_cov.test index e4e72100c..bc8a36669 100644 --- a/test/testref/dirac_soca_cov.test +++ b/test/testref/dirac_soca_cov.test @@ -12,13 +12,13 @@ Input Dirac increment: layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 Covariance(SocaError) * Increment: Valid time: 2018-04-15T00:00:00Z - cicen min=-0.0035609555945749 max=0.0000000000000000 mean=-0.0000247696390868 + cicen min=-0.0035609555945749 max=0.0000000000000000 mean=-0.0000247866160204 hicen min=0.0000000000000000 max=100.0000000000000000 mean=0.8687764074426576 - socn min=-0.0198881633922953 max=0.1032943622422105 mean=0.0003214400888851 - tocn min=0.0000000000000000 max=5.2687160390820811 mean=0.0228867309247497 + socn min=-0.0233861103420420 max=0.1032943622422105 mean=0.0003208834542677 + tocn min=0.0000000000000000 max=5.2687160390820811 mean=0.0230427116030840 uocn min=0.0000000000000000 max=0.0022948056889126 mean=0.0000004281518965 vocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 - ssh min=-0.0013735744357345 max=0.0505217197847119 mean=0.0008030148155541 + ssh min=-0.0013735744357345 max=0.0505217197847119 mean=0.0008502024507618 hocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 mld min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 diff --git a/test/testref/dirac_socahyb_cov.test b/test/testref/dirac_socahyb_cov.test index 958a270fa..327f3ac15 100644 --- a/test/testref/dirac_socahyb_cov.test +++ b/test/testref/dirac_socahyb_cov.test @@ -12,25 +12,25 @@ Input Dirac increment: layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 Covariance(hybrid) * Increment: Valid time: 2018-04-15T00:00:00Z - cicen min=-0.0037308136145732 max=0.0033832945797879 mean=-0.0000239410420406 + cicen min=-0.0037308136145732 max=0.0033832945797879 mean=-0.0000239489125803 hicen min=-0.0695877305207310 max=50.1073013980972064 mean=0.4362425959632968 - socn min=-0.2786405474614049 max=0.4244134146865415 mean=0.0012232201170168 - tocn min=-0.1747800608295167 max=3.5877887758283302 mean=0.0164744418900534 + socn min=-0.2786405474614049 max=0.4244134146865415 mean=0.0012228353313886 + tocn min=-0.1747800608295167 max=3.5877887758283302 mean=0.0165511115136579 uocn min=-0.0019323054461836 max=0.0022913098573106 mean=-0.0000004682690009 vocn min=-0.0009548976692089 max=0.0010971516760553 mean=0.0000002759338063 - ssh min=-0.0849196475090573 max=0.0573078943105885 mean=-0.0001788165052831 + ssh min=-0.0849196475090573 max=0.0573102079546577 mean=-0.0001552497512365 hocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 mld min=-60.6461415802428760 max=525.5278285284309732 mean=1.3267794217865554 layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 Covariance(hybrid1_SocaError) * Increment: Valid time: 2018-04-15T00:00:00Z - cicen min=-0.0035609555945749 max=0.0000000000000000 mean=-0.0000208573620667 + cicen min=-0.0035609555945749 max=0.0000000000000000 mean=-0.0000208731031462 hicen min=0.0000000000000000 max=100.0000000000000000 mean=0.8687764074426576 - socn min=-0.0198881633922953 max=0.0465023712609259 mean=0.0000029721529045 - tocn min=0.0000000000000000 max=5.2687160390820811 mean=0.0207117548014313 + socn min=-0.0233861103420420 max=0.0465023712609259 mean=0.0000022025816480 + tocn min=0.0000000000000000 max=5.2687160390820811 mean=0.0208650940486405 uocn min=0.0000000000000000 max=0.0022948056889126 mean=0.0000004281518965 vocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 - ssh min=0.0000000000000000 max=0.0505217197847119 mean=0.0007216345438814 + ssh min=0.0000000000000000 max=0.0505217197847119 mean=0.0007687680519747 hocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 mld min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 diff --git a/test/testref/enspert.test b/test/testref/enspert.test index 1c6483935..1ec095700 100644 --- a/test/testref/enspert.test +++ b/test/testref/enspert.test @@ -20,15 +20,15 @@ Initial state: layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420 Member 0 final state: Valid time: 2018-04-15T06:00:00Z - cicen min=-0.0180955754853549 max=1.0154619226063759 mean=0.1166559214269191 + cicen min=-0.0180955754853549 max=1.0154619226063759 mean=0.1166567187237659 hicen min=-1.1890165225084572 max=4.4225078395956468 mean=0.4878445368603064 hsnon min=0.0000000000000000 max=1.2712833951042413 mean=0.0886865877527975 - socn min=10.7210460395083924 max=40.4416591783023591 mean=34.5474800968760363 - tocn min=-3.0346028036973980 max=31.6933380143948185 mean=6.0890697197214561 - uocn min=-0.8618139758185666 max=0.6951997360756492 mean=-0.0002997745679692 - vocn min=-0.8095631050258628 max=1.1783094030086203 mean=0.0020623837513078 - ssh min=-1.8905565770288892 max=0.9182989726357133 mean=-0.2767814084186027 - hocn min=0.0009718942578074 max=1345.9654472455474661 mean=128.6280649553954163 + socn min=10.7210460395083924 max=40.4416591783023520 mean=34.5474804194790579 + tocn min=-3.0346028010743273 max=31.7041894810928397 mean=6.0892597845774965 + uocn min=-0.8618188262973017 max=0.6951975908706787 mean=-0.0003002399277292 + vocn min=-0.8095623037177452 max=1.1783094051530068 mean=0.0020621902808385 + ssh min=-1.8905821325072507 max=0.9171609472788409 mean=-0.2767818007884086 + hocn min=0.0009718942572445 max=1345.9655205644394300 mean=128.6280649079521936 chl min=-0.0346456156552588 max=4.6657951350551032 mean=0.1184774650131123 biop min=-0.0000000010792964 max=0.0000001881576257 mean=0.0000000065411171 sw min=-225.0977630615234375 max=-0.0000000000000000 mean=-71.7393205198725354 @@ -40,15 +40,15 @@ Member 0 final state: layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420 Member 1 final state: Valid time: 2018-04-15T06:00:00Z - cicen min=-0.0215236267512266 max=1.0125208022390715 mean=0.1167095831498252 + cicen min=-0.0215236267512266 max=1.0125208022390715 mean=0.1167107628551369 hicen min=-1.0658523758283109 max=4.6136403418154135 mean=0.5266782620691725 hsnon min=0.0000000000000000 max=1.2712833951042413 mean=0.0886865877527975 - socn min=10.7210460395083924 max=40.4416591799132448 mean=34.5062481187338932 - tocn min=-4.3527891683149589 max=32.1361477461354141 mean=5.9994391843459987 - uocn min=-0.8612374175211615 max=0.6956609710910323 mean=-0.0001698365577515 - vocn min=-0.8096975677837192 max=1.1407980629044245 mean=0.0019616600381917 - ssh min=-1.8679477741675297 max=0.9132641983009352 mean=-0.2767142711236579 - hocn min=0.0009445732112318 max=1346.2580155171262959 mean=128.6280815780080502 + socn min=10.7210460395083924 max=40.4416591799132661 mean=34.5062483129193538 + tocn min=-4.3527892363687934 max=32.1716440032313642 mean=5.9996297179408460 + uocn min=-0.8612379200915659 max=0.6956460681526615 mean=-0.0001684897472015 + vocn min=-0.8096924107049123 max=1.1407984886825635 mean=0.0019624415065930 + ssh min=-1.8679621858884223 max=0.9116899301489129 mean=-0.2767153738108127 + hocn min=0.0009445732089446 max=1346.2578679840287350 mean=128.6280814476713203 chl min=-0.0289855887820164 max=4.6514396809792586 mean=0.1185532231894127 biop min=-0.0000000013979299 max=0.0000001885820462 mean=0.0000000065387977 sw min=-225.0977630615234375 max=-0.0000000000000000 mean=-71.7393205198725354 @@ -60,15 +60,15 @@ Member 1 final state: layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420 Member 2 final state: Valid time: 2018-04-15T06:00:00Z - cicen min=-0.0217839784139593 max=1.0135664998925267 mean=0.1170039681285188 + cicen min=-0.0217839784139593 max=1.0135664998925267 mean=0.1170037453526113 hicen min=-1.0702692048053624 max=4.2897631773416807 mean=0.5197523608071601 hsnon min=0.0000000000000000 max=1.2712833951042413 mean=0.0886865877527975 - socn min=10.7210460395083924 max=40.4416591813400288 mean=34.5190440845877262 - tocn min=-3.6774466807639863 max=31.7294356663630133 mean=6.1012124914452226 - uocn min=-0.8527223118122027 max=0.6900414927065329 mean=-0.0002364431767566 - vocn min=-0.8081261810765369 max=1.2230261287991580 mean=0.0019659380504321 - ssh min=-1.8554042827180834 max=0.9107720164197515 mean=-0.2765996935937832 - hocn min=0.0009179243605655 max=1346.5441385754897965 mean=128.6280813316178921 + socn min=10.7210460395083924 max=40.4416591813400217 mean=34.5190502846994818 + tocn min=-3.6774466807639858 max=31.7294384181555564 mean=6.1017080713155725 + uocn min=-0.8527079719957523 max=0.6900307211562242 mean=-0.0002351898776744 + vocn min=-0.8081228648634390 max=1.2230267293973940 mean=0.0019664179836585 + ssh min=-1.8554279256511403 max=0.9099454891333590 mean=-0.2766017221739970 + hocn min=0.0009179243744965 max=1346.5440235208395734 mean=128.6280811165849514 chl min=-0.0242260824668528 max=4.6851634656692536 mean=0.1184642679198311 biop min=-0.0000000008814691 max=0.0000001879042331 mean=0.0000000065376670 sw min=-225.0977630615234375 max=-0.0000000000000000 mean=-71.7393205198725354 @@ -80,15 +80,15 @@ Member 2 final state: layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420 Member 3 final state: Valid time: 2018-04-15T06:00:00Z - cicen min=-0.0195801063579778 max=1.0147719967288251 mean=0.1172802563649303 + cicen min=-0.0195801063579778 max=1.0147719967288251 mean=0.1172820860076147 hicen min=-1.1341861749030553 max=4.4599301342658908 mean=0.5181641291823246 hsnon min=0.0000000000000000 max=1.2712833951042413 mean=0.0886865877527975 - socn min=10.7210460395083924 max=40.4416591824183200 mean=34.5337306490327762 - tocn min=-2.9382470958611533 max=31.7406360070615250 mean=6.0347954822615435 - uocn min=-0.8567623785227283 max=0.6984749062627711 mean=-0.0001939854672101 - vocn min=-0.8030249979662585 max=1.1972007486718934 mean=0.0020525231253366 - ssh min=-1.8496564176159751 max=0.9119582674095947 mean=-0.2765326424252088 - hocn min=0.0008920106048063 max=1346.8102165025252361 mean=128.6280862547550612 + socn min=10.7210460395083924 max=40.4416591824183271 mean=34.5337425245469660 + tocn min=-2.9382471201647431 max=31.7406441563765469 mean=6.0345483358398653 + uocn min=-0.8567487147577495 max=0.6984678539990958 mean=-0.0001943514805072 + vocn min=-0.8030068089098755 max=1.1972014559128583 mean=0.0020539511619779 + ssh min=-1.8496740327525270 max=0.9120280276442039 mean=-0.2765355089165666 + hocn min=0.0008920106029951 max=1346.8098305246508062 mean=128.6280860382935316 chl min=-0.0339131334494770 max=4.6937598186554741 mean=0.1184950507291665 biop min=-0.0000000007072830 max=0.0000001876715923 mean=0.0000000065402892 sw min=-225.0977630615234375 max=-0.0000000000000000 mean=-71.7393205198725354 @@ -100,15 +100,15 @@ Member 3 final state: layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420 Member 4 final state: Valid time: 2018-04-15T06:00:00Z - cicen min=-0.0195941719308671 max=1.0093198320940708 mean=0.1172724586998884 + cicen min=-0.0195941332888099 max=1.0093198320940708 mean=0.1172744442785538 hicen min=-1.1019240276229816 max=4.7377629969768993 mean=0.5021357777554611 hsnon min=0.0000000000000000 max=1.2712833951042413 mean=0.0886865877527975 - socn min=10.7210460395083924 max=40.4416591834511223 mean=34.5387766834671481 - tocn min=-4.7688220057000423 max=31.7683785851487244 mean=5.9956156360936328 - uocn min=-0.8553119852520545 max=0.6981334674570244 mean=-0.0002480517899170 - vocn min=-0.8098523972285095 max=1.1497696742608834 mean=0.0019859013225117 - ssh min=-1.8514464984139818 max=0.9113585577103474 mean=-0.2764807136712832 - hocn min=0.0008668131157740 max=1347.1259810092037696 mean=128.6280847930392781 + socn min=10.7210460395083924 max=40.4416591834512715 mean=34.5387781877921114 + tocn min=-4.7688220842238351 max=31.7683597112020806 mean=5.9949463806419976 + uocn min=-0.8553135755927049 max=0.6981189192611161 mean=-0.0002481375767763 + vocn min=-0.8098578415481051 max=1.1497701384094767 mean=0.0019866245418100 + ssh min=-1.8514675434009882 max=0.9119375302769742 mean=-0.2764841693985222 + hocn min=0.0008668131064307 max=1347.1257737543392068 mean=128.6280845260949377 chl min=-0.0343124993979519 max=4.6755082537003148 mean=0.1185660150722009 biop min=-0.0000000008706793 max=0.0000001882726144 mean=0.0000000065375605 sw min=-225.0977630615234375 max=-0.0000000000000000 mean=-71.7393205198725354 diff --git a/test/testref/parametric_stddev.test b/test/testref/parametric_stddev.test index b854c7d03..da727f8de 100644 --- a/test/testref/parametric_stddev.test +++ b/test/testref/parametric_stddev.test @@ -14,7 +14,7 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522 mld min=2.2854716757984130 max=4593.1533423819937525 mean=192.4109073940401515 Output increment: Valid time: 2018-04-15T00:00:00Z - tocn min=0.0000000000000000 max=1.9980023041130581 mean=0.2357097861035301 + tocn min=0.0000000000000000 max=1.9980025067738878 mean=0.2497532902132127 socn min=0.0000000000000000 max=0.2497504462405218 mean=0.0698390961069666 ssh min=0.0000000000000000 max=0.1000000000000000 mean=0.0736431992302128 hocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 diff --git a/test/testref/sqrtvertloc.test b/test/testref/sqrtvertloc.test index 89ef60f01..2cb01029d 100644 --- a/test/testref/sqrtvertloc.test +++ b/test/testref/sqrtvertloc.test @@ -18,52 +18,52 @@ Background: us min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 mld min=2.2854716757984130 max=4593.1533423819937525 mean=192.4109073940401515 layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420 -Variance Explained=0.1095978449215628 -0.1986592260009322 -0.2574090477201059 -0.3108162986295729 -0.3601499072261007 -0.4060801234095580 -0.4491171282177204 -0.4894988359524899 -0.5274377250826384 -0.5630943305473515 -0.5966755864693503 -0.6282520848909933 -0.6580002386412093 -0.6860000279354885 -0.7123557700879926 -0.7371165035364045 -0.7603372048338458 -0.7821493791595265 -0.8025616340708006 -0.8216919253415884 -0.8395787079837431 -0.8562794025724449 -0.8718653851392147 -0.8863759098620672 -0.8998527605516653 -0.9123248504865656 -0.9238234180839183 -0.9343903126284964 -0.9440830076861835 -0.9529291331731384 -0.9609904875415970 -0.9682821492078266 -0.9748527882516130 -0.9806987975624316 -0.9858736410559197 -0.9903946694313854 -0.9942676381885840 -0.9974858388401647 -0.9999999999999998 -0.9999999999999998 +Variance Explained=0.1095722884945554 +0.1986109674104811 +0.2573592042007319 +0.3107695230030913 +0.3601075805191439 +0.4060398927639458 +0.4490768975279861 +0.4894581680876475 +0.5273973968507524 +0.5630587213523036 +0.5966424448666294 +0.6282216452762419 +0.6579728189097667 +0.6859749507249951 +0.7123308347212612 +0.7370952702038832 +0.7603168555409263 +0.7821305787902608 +0.8025463220344943 +0.8216780361675287 +0.8395667952566088 +0.8562695558486649 +0.8718566481716684 +0.8863678411892866 +0.8998452895820127 +0.9123174374716791 +0.9238167088149134 +0.9343854753848837 +0.9440792712286040 +0.9529261630955466 +0.9609874344601098 +0.9682787831872223 +0.9748495121496636 +0.9806953477270097 +0.9858702442359948 +0.9903924688279335 +0.9942661331040944 +0.9974850871367730 +0.9999999999999999 +0.9999999999999999 Number of retained columns=10 -Retained fraction of the variance=0.5630943305473517 +Retained fraction of the variance=0.5630587213523036 Variance for truncated correlation matrix Valid time: 2018-04-15T00:00:00Z - ssh min=0.0000000000000000 max=0.9956583252574223 mean=0.7868533366982100 - tocn min=0.0000000000000000 max=0.9963486197333468 mean=0.5422753384117960 - socn min=0.0000000000000000 max=0.9968707119658533 mean=0.5489472608917214 - uocn min=0.0398330297502443 max=0.8805075454121231 mean=0.4712369205001221 - vocn min=0.0000000000000000 max=0.8421089543341873 mean=0.4718526420894420 + ssh min=0.0000000000000000 max=0.9956521414877253 mean=0.7859481295984008 + tocn min=0.0000000000000000 max=0.9963486197333468 mean=0.5422186134486107 + socn min=0.0000000000000000 max=0.9968726530867191 mean=0.5488641651294098 + uocn min=0.0379204542449227 max=0.8805075454121231 mean=0.4712705638193914 + vocn min=0.0000000000000000 max=0.8431094636696504 mean=0.4718656179177272