diff --git a/test/testinput/gen_hybrid_linear_model_coeffs.yml b/test/testinput/gen_hybrid_linear_model_coeffs.yml index 3a9e4d60..69ae5f46 100644 --- a/test/testinput/gen_hybrid_linear_model_coeffs.yml +++ b/test/testinput/gen_hybrid_linear_model_coeffs.yml @@ -24,8 +24,8 @@ hybrid linear model: begin: 2018-04-15T00:00:00Z length: PT12H calculator: - #regularization: - # base value: 10 + regularization: + base value: 10 ensemble: model: name: PseudoModel @@ -116,4 +116,3 @@ 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 diff --git a/test/testinput/letkf.yml b/test/testinput/letkf.yml index 6fa0dc1c..3c8c3892 100644 --- a/test/testinput/letkf.yml +++ b/test/testinput/letkf.yml @@ -139,3 +139,4 @@ output increment: test: reference filename: testref/letkf.test test output filename: testoutput/letkf.test + float relative tolerance: 1e-5 diff --git a/test/testinput/linearization_error.yml b/test/testinput/linearization_error.yml index df4b7d77..cf34efb2 100644 --- a/test/testinput/linearization_error.yml +++ b/test/testinput/linearization_error.yml @@ -24,9 +24,9 @@ linear model: time window: begin: 2018-04-15T00:00:00Z length: PT12H - calculator: {} - #regularization: - # base value: 0.01 #1000 + calculator: + regularization: + base value: 10 ensemble: model: name: PseudoModel diff --git a/test/testref/4dvar_htlm.test b/test/testref/4dvar_htlm.test index 7ca92769..8be0170c 100644 --- a/test/testref/4dvar_htlm.test +++ b/test/testref/4dvar_htlm.test @@ -1,17 +1,17 @@ -CostJo : Nonlinear Jo(SeaSufaceTemp) = 7.5731660125378380e+02, nobs = 90, Jo/n = 8.4146289028198193e+00, err = 3.7274007248048607e-01 +CostJo : Nonlinear Jo(SeaSufaceTemp) = 7.5731660125377857e+02, nobs = 90, Jo/n = 8.4146289028197625e+00, err = 3.7274007248048607e-01 CostJb : Nonlinear Jb = 0.0000000000000000e+00 -CostFunction: Nonlinear J = 7.5731660125378380e+02 -RPCGMinimizer: reduction in residual norm = 1.2269874777692313e-01 +CostFunction: Nonlinear J = 7.5731660125377857e+02 +RPCGMinimizer: reduction in residual norm = 7.0502977836243028e-02 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z - sea_water_salinity min=10.7210460395083924 max=40.4416591897031168 mean=34.5437862918539409 + sea_water_salinity min=10.7210460395083924 max=40.4416591897031168 mean=34.5436604795604083 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.0183786756706956 - sea_surface_height_above_geoid min=-1.9244009534418500 max=0.9547999799338502 mean=-0.2782054011933942 +sea_water_potential_temperature min=-1.8883899372702533 max=31.7004645720658580 mean=6.0180833165635894 + sea_surface_height_above_geoid min=-1.9243802319858341 max=0.9495525819023786 mean=-0.2783327657022133 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 -CostJo : Nonlinear Jo(SeaSufaceTemp) = 608.2917122363810449, nobs = 90, Jo/n = 6.7587968026264562, err = 0.3727400724804861 -CostJb : Nonlinear Jb = 37.6443326387034602 -CostFunction: Nonlinear J = 645.9360448750844625 +CostJo : Nonlinear Jo(SeaSufaceTemp) = 594.7782934004992512, nobs = 90, Jo/n = 6.6086477044499921, err = 0.3727400724804861 +CostJb : Nonlinear Jb = 52.6241435560154684 +CostFunction: Nonlinear J = 647.4024369565147481 diff --git a/test/testref/gen_hybrid_linear_model_coeffs.test b/test/testref/gen_hybrid_linear_model_coeffs.test index 7fb5b0f9..ea18d736 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 - sea_water_salinity min=-349.3229890696983375 max=9760.0293213818222284 mean=1.3439203126538488 -sea_water_potential_temperature min=-9570.3837470034377475 max=86203.0385734795127064 mean=2.8440893396605960 + sea_water_salinity min=-8.8869158331916065 max=15.2145453445140042 mean=0.9846872397480004 +sea_water_potential_temperature min=-44.6922419298289881 max=94.7181472812624747 mean=1.0113828798530660 dx at 2018-04-15T12:00:00Z: Valid time: 2018-04-15T12:00:00Z - sea_water_salinity min=-23014485.0596553012728691 max=32781675.1680965200066566 mean=548.8615479379297994 -sea_water_potential_temperature min=-315235739.0030111670494080 max=39076303.6563614234328270 mean=-12285.3691977042744838 + sea_water_salinity min=-17.1257393792535098 max=66.4529829863708272 mean=1.0128438721106847 +sea_water_potential_temperature min=-60.9538206795119066 max=184.6278578307355360 mean=1.1105083197686365 diff --git a/test/testref/linearization_error.test b/test/testref/linearization_error.test index 0f676065..4cc52d31 100644 --- a/test/testref/linearization_error.test +++ b/test/testref/linearization_error.test @@ -1,45 +1,45 @@ fd at 2018-04-15T00:00:00Z: Valid time: 2018-04-15T00:00:00Z - socn min=-2.4416591897031168 max=1.3230360133306505 mean=-0.0024271345954631 - tocn min=-2.3910221032509291 max=3.3092213597659246 mean=0.0755122321363400 - 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 - hocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 -layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 + sea_water_salinity min=-2.4416591897031168 max=1.3230360133306505 mean=-0.0024271345954631 +sea_water_potential_temperature min=-2.3910221032509291 max=3.3092213597659246 mean=0.0755122321363400 + eastward_sea_water_velocity min=-0.0156308673181528 max=0.0151426414195125 mean=-0.0000246839772978 + northward_sea_water_velocity min=-0.0120443919614510 max=0.0125571658843872 mean=0.0000088038774601 + sea_surface_height_above_geoid min=-0.3751396642347711 max=0.4474811141886338 mean=-0.0070871110169232 + sea_water_cell_thickness min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 + sea_water_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 - 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 - hocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 -layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 + sea_water_salinity min=-2.4416358677853163 max=1.1534824057034487 mean=-0.0066576331336771 +sea_water_potential_temperature min=-2.3771291528248519 max=3.2135774101401080 mean=0.0706268112865332 + eastward_sea_water_velocity min=-0.0156308673181528 max=0.0151426414195125 mean=-0.0000246839772978 + northward_sea_water_velocity min=-0.0120443919614510 max=0.0125571658843872 mean=0.0000088038774601 + sea_surface_height_above_geoid min=-0.3751396642347711 max=0.4474811141886338 mean=-0.0070871110169232 + sea_water_cell_thickness min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 + sea_water_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 - 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 - hocn min=-1049.5886753924605728 max=859.4196733818458824 mean=0.0001140251676939 -layer_depth min=-923.3373591599813608 max=1300.2270897778307699 mean=2.0504234514024393 + sea_water_salinity min=-0.6287769426164933 max=1.0218095112695806 mean=0.0046348378276148 +sea_water_potential_temperature min=-1.9081933268636009 max=2.5014114191228192 mean=-0.0027609208080969 + eastward_sea_water_velocity min=-0.3768127712514624 max=0.5726446123948353 mean=0.0002271385239813 + northward_sea_water_velocity min=-0.8348533647988179 max=0.3457301759780138 mean=-0.0001815430546837 + sea_surface_height_above_geoid min=-0.4339260897259428 max=0.2887292509849344 mean=-0.0045835768049616 + sea_water_cell_thickness min=-1049.5886754000971450 max=859.4196733784333446 mean=0.0001140251676941 + sea_water_depth min=-923.3373591595991456 max=1300.2270897745663660 mean=2.0504234514059227 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 - 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 - hocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 -layer_depth min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 + sea_water_salinity min=-2.4416123564609222 max=1.0465779738787662 mean=-0.0086045353610376 +sea_water_potential_temperature min=-3.3168640368174058 max=3.1867835301944289 mean=0.0694357865576276 + eastward_sea_water_velocity min=-0.0156308673181528 max=0.0151426414195125 mean=-0.0000246839772978 + northward_sea_water_velocity min=-0.0120443919614510 max=0.0125571658843872 mean=0.0000088038774601 + sea_surface_height_above_geoid min=-0.3751396642347711 max=0.4474811141886338 mean=-0.0070871110169232 + sea_water_cell_thickness min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 + sea_water_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 - 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 - hocn min=-1143.8905370260724794 max=877.6668696058438854 mean=0.0001279054606427 -layer_depth min=-839.7087782339563091 max=1317.3185648237511032 mean=2.2373758265750125 + sea_water_salinity min=-0.5046573440158330 max=0.4636282194660545 mean=0.0046532672262387 +sea_water_potential_temperature min=-1.5447141194653669 max=1.6602832100304346 mean=-0.0017315771190042 + eastward_sea_water_velocity min=-0.5897328942585329 max=0.5648967059435075 mean=-0.0000630794310827 + northward_sea_water_velocity min=-0.9255121645643122 max=0.5997522468680587 mean=0.0002343308665657 + sea_surface_height_above_geoid min=-0.4439592639602647 max=0.3169346481338872 mean=-0.0041463458145450 + sea_water_cell_thickness min=-1143.8905370290074188 max=877.6668696017160300 mean=0.0001279054606528 + sea_water_depth min=-839.7087782350777161 max=1317.3185648236185443 mean=2.2373758266207657