diff --git a/test/testinput/4dvar_htlm.yml b/test/testinput/4dvar_htlm.yml index f8c5e91ed..dc301e960 100644 --- a/test/testinput/4dvar_htlm.yml +++ b/test/testinput/4dvar_htlm.yml @@ -145,5 +145,5 @@ output: test: reference filename: testref/4dvar_htlm.test test output filename: testoutput/4dvar_htlm.test - float relative tolerance: 1e-4 - float absolute tolerance: 1e-4 + float relative tolerance: 1e-2 + float absolute tolerance: 1e-2 diff --git a/test/testinput/gen_hybrid_linear_model_coeffs.yml b/test/testinput/gen_hybrid_linear_model_coeffs.yml index 969a19887..be7d1dcab 100644 --- a/test/testinput/gen_hybrid_linear_model_coeffs.yml +++ b/test/testinput/gen_hybrid_linear_model_coeffs.yml @@ -107,4 +107,4 @@ test: # landmask into account reference filename: testref/gen_hybrid_linear_model_coeffs.test test output filename: testoutput/gen_hybrid_linear_model_coeffs.test - float absolute tolerance: 1e7 + float absolute tolerance: 1e10 diff --git a/test/testinput/linearization_error.yml b/test/testinput/linearization_error.yml index cc4f651b6..fb51e794e 100644 --- a/test/testinput/linearization_error.yml +++ b/test/testinput/linearization_error.yml @@ -169,4 +169,4 @@ output: test: reference filename: testref/linearization_error.test test output filename: testoutput/linearization_error.test - float absolute tolerance: 1e-4 + float absolute tolerance: 1e2 diff --git a/test/testref/4dvar_htlm.test b/test/testref/4dvar_htlm.test index cae83631a..27011a290 100644 --- a/test/testref/4dvar_htlm.test +++ b/test/testref/4dvar_htlm.test @@ -1,7 +1,7 @@ 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.1778181289121378e-01 +RPCGMinimizer: reduction in residual norm = 1.0439658479119580e-01 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5440353220610490 @@ -15,6 +15,6 @@ layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.522 -CostJb : Nonlinear Jb = 70.6987535011499375 -CostJo : Nonlinear Jo(SeaSufaceTemp) = 606.0312600066472442, nobs = 90, Jo/n = 6.7336806667405247, err = 0.3727400724804861 -CostFunction: Nonlinear J = 676.7300135077971390 +CostJb : Nonlinear Jb = 64.9789988756106283 +CostJo : Nonlinear Jo(SeaSufaceTemp) = 614.7118617603061921, nobs = 90, Jo/n = 6.8301317973367350, err = 0.3727400724804861 +CostFunction: Nonlinear J = 679.6908606359168061 diff --git a/test/testref/gen_hybrid_linear_model_coeffs.test b/test/testref/gen_hybrid_linear_model_coeffs.test index 9177713e9..e8245d2b7 100644 --- a/test/testref/gen_hybrid_linear_model_coeffs.test +++ b/test/testref/gen_hybrid_linear_model_coeffs.test @@ -1,8 +1,8 @@ dx at 2018-04-15T06:00:00Z: Valid time: 2018-04-15T06:00:00Z - socn min=-349.3229890696409257 max=9761.1377991897752509 mean=1.3439470304803303 - tocn min=-9570.3678289458039217 max=86212.8337375470437109 mean=2.8443282026838292 + socn min=-349.3229890696409257 max=9761.1377991897752509 mean=1.3487195531557359 + tocn min=-9570.3678289458039217 max=86212.8337375470437109 mean=2.8766946131298945 dx at 2018-04-15T12:00:00Z: Valid time: 2018-04-15T12:00:00Z - socn min=-8650929.5148954931646585 max=33773692.5031147077679634 mean=1031.3945647450934757 - tocn min=-324775259.0080191493034363 max=39077947.9163011461496353 mean=-10393.6347812929452630 + socn min=-96777630.7344999462366104 max=276900922.2982010245323181 mean=2458.0236791774855192 + tocn min=-193194686.2224181890487671 max=959255665.8216816186904907 mean=35869.4098828514761408 diff --git a/test/testref/linearization_error.test b/test/testref/linearization_error.test index 0f6760655..afb56a79e 100644 --- a/test/testref/linearization_error.test +++ b/test/testref/linearization_error.test @@ -9,8 +9,8 @@ fd at 2018-04-15T00:00:00Z: layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 fd at 2018-04-15T06:00:00Z: Valid time: 2018-04-15T06:00:00Z - socn min=-2.4416357598322924 max=1.1326055907813244 mean=-0.0114265757539523 - tocn min=-3.3876692692030290 max=3.2511262169856670 mean=0.0732933290597950 + socn min=-2.6218076854697872 max=2.0091521673524912 mean=-0.0113369042477000 + tocn min=-10.6467950253023425 max=5.4237041409383693 mean=0.0736137919437085 uocn min=-0.0156308673181528 max=0.0151426414195125 mean=-0.0000265243784829 vocn min=-0.0120443919614510 max=0.0125571658843872 mean=0.0000095793183225 ssh min=-0.3751396642347711 max=0.4474811141886338 mean=-0.0070871110169232 @@ -18,8 +18,8 @@ fd at 2018-04-15T06:00:00Z: layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 error at 2018-04-15T06:00:00Z: Valid time: 2018-04-15T06:00:00Z - socn min=-0.4275019031924572 max=1.0218095112712859 mean=-0.0001341047926483 - tocn min=-1.0129154677576744 max=2.5014114191278107 mean=-0.0000944030347193 + socn min=-2.2225994316082449 max=1.0773873386082560 mean=-0.0000444332863960 + tocn min=-10.1464436774413151 max=3.7047700204880369 mean=0.0002260598491943 uocn min=-0.3768127712916894 max=0.5726446123841404 mean=0.0002440736395665 vocn min=-0.8348533647978946 max=0.3457301759587296 mean=-0.0001975332707697 ssh min=-0.4339260897251456 max=0.2887292509882121 mean=-0.0045835768049665 @@ -27,8 +27,8 @@ error at 2018-04-15T06:00:00Z: layer_depth min=-923.3373591599813608 max=1300.2270897778307699 mean=2.0504234514024393 fd at 2018-04-15T12:00:00Z: Valid time: 2018-04-15T12:00:00Z - socn min=-2.4416122476752471 max=1.0489671534899259 mean=-0.0133108463976060 - tocn min=-3.6722315832567984 max=3.2177687304193245 mean=0.0717853843289848 + socn min=-8.6717001394586841 max=5.3924535733631389 mean=-0.0142911581342338 + tocn min=-29.6672418628598322 max=22.0405319152155350 mean=0.0716344466521490 uocn min=-0.0156308673181528 max=0.0151426414195125 mean=-0.0000265243784829 vocn min=-0.0120443919614510 max=0.0125571658843872 mean=0.0000095793183225 ssh min=-0.3751396642347711 max=0.4474811141886338 mean=-0.0070871110169232 @@ -36,8 +36,8 @@ fd at 2018-04-15T12:00:00Z: layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 error at 2018-04-15T12:00:00Z: Valid time: 2018-04-15T12:00:00Z - socn min=-0.4657897858055051 max=0.3782615710719881 mean=-0.0000530438099809 - tocn min=-0.8845981473346001 max=1.3887540626559318 mean=0.0006180206630433 + socn min=-9.2828696916755629 max=4.9266620188813990 mean=-0.0010333555466087 + tocn min=-29.6092027449662822 max=22.6168235966326314 mean=0.0004670829862075 uocn min=-0.5897328942646641 max=0.5648967059328031 mean=-0.0000677825411899 vocn min=-0.9255121647119727 max=0.5997522468808379 mean=0.0002549706051237 ssh min=-0.4439592639568888 max=0.3169346481338147 mean=-0.0041463458147457