diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 58a3e7d4d..6a451e2bc 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -706,7 +706,6 @@ soca_add_test( NAME 3dhybfgat soca_add_test( NAME 4denvar EXE soca_var.x - MPI 4 TEST_DEPENDS test_soca_gridgen test_soca_forecast_mom6_ens1 test_soca_forecast_mom6_ens2 @@ -714,7 +713,6 @@ soca_add_test( NAME 4denvar soca_add_test( NAME 4dhybenvar EXE soca_var.x - MPI 4 TEST_DEPENDS test_soca_gridgen test_soca_static_socaerror_init test_soca_forecast_mom6_ens1 diff --git a/test/testinput/4denvar.yml b/test/testinput/4denvar.yml index 59217fb26..a7732ffd6 100644 --- a/test/testinput/4denvar.yml +++ b/test/testinput/4denvar.yml @@ -3,7 +3,8 @@ cost function: analysis variables: [socn, tocn, uocn, vocn, ssh] window begin: 2018-04-15T00:00:00Z window length: PT6H - subwindow: PT6H # NOTE, number of PEs has to be a multiple of num of windows! + subwindow: PT3H + parallel subwindows: false geometry: &geom geom_grid_file: data_generated/gridgen/soca_gridspec.72x35x25.nc @@ -19,6 +20,9 @@ cost function: <<: *_bkg_state ocn_filename: ocn.forecast_mom6.fc.2018-04-15T00:00:00Z.PT0S.nc date: 2018-04-15T00:00:00Z + - <<: *_bkg_state + ocn_filename: ocn.forecast_mom6.fc.2018-04-15T00:00:00Z.PT3H.nc + date: 2018-04-15T03:00:00Z - <<: *_bkg_state ocn_filename: ocn.forecast_mom6.fc.2018-04-15T00:00:00Z.PT6H.nc date: 2018-04-15T06:00:00Z @@ -42,6 +46,9 @@ cost function: << : *_bkg_err_state ocn_filename: ocn.fcst_ens%mem%.fc.2018-04-15T00:00:00Z.PT0S.nc date: 2018-04-15T00:00:00Z + - << : *_bkg_err_state + ocn_filename: ocn.fcst_ens%mem%.fc.2018-04-15T00:00:00Z.PT3H.nc + date: 2018-04-15T03:00:00Z - << : *_bkg_err_state ocn_filename: ocn.fcst_ens%mem%.fc.2018-04-15T00:00:00Z.PT6H.nc date: 2018-04-15T06:00:00Z diff --git a/test/testinput/4dhybenvar.yml b/test/testinput/4dhybenvar.yml index 87ec606e7..aed9e5ecd 100644 --- a/test/testinput/4dhybenvar.yml +++ b/test/testinput/4dhybenvar.yml @@ -3,7 +3,8 @@ cost function: analysis variables: [socn, tocn, uocn, vocn, ssh] window begin: 2018-04-15T00:00:00Z window length: PT6H - subwindow: PT6H # NOTE, number of PEs has to be a multiple of num of windows! + subwindow: PT3H + parallel subwindows: false geometry: &geom geom_grid_file: data_generated/gridgen/soca_gridspec.72x35x25.nc @@ -19,6 +20,9 @@ cost function: <<: *_bkg_state ocn_filename: ocn.forecast_mom6.fc.2018-04-15T00:00:00Z.PT0S.nc date: 2018-04-15T00:00:00Z + - <<: *_bkg_state + ocn_filename: ocn.forecast_mom6.fc.2018-04-15T00:00:00Z.PT3H.nc + date: 2018-04-15T03:00:00Z - <<: *_bkg_state ocn_filename: ocn.forecast_mom6.fc.2018-04-15T00:00:00Z.PT6H.nc date: 2018-04-15T06:00:00Z @@ -63,6 +67,9 @@ cost function: << : *_bkg_err_state ocn_filename: ocn.fcst_ens%mem%.fc.2018-04-15T00:00:00Z.PT0S.nc date: 2018-04-15T00:00:00Z + - << : *_bkg_err_state + ocn_filename: ocn.fcst_ens%mem%.fc.2018-04-15T00:00:00Z.PT3H.nc + date: 2018-04-15T03:00:00Z - << : *_bkg_err_state ocn_filename: ocn.fcst_ens%mem%.fc.2018-04-15T00:00:00Z.PT6H.nc date: 2018-04-15T06:00:00Z diff --git a/test/testref/4denvar.test b/test/testref/4denvar.test index a9f222e12..08ae0c7c0 100644 --- a/test/testref/4denvar.test +++ b/test/testref/4denvar.test @@ -1,19 +1,27 @@ CostJb : Nonlinear Jb = 0.0000000000000000e+00 -CostJo : Nonlinear Jo(SeaSufaceTemp) = 3.4621019934654396e+02, nobs = 47, Jo/n = 7.3661744541817864e+00, err = 3.8763169345842458e-01 -CostFunction: Nonlinear J = 3.4621019934654396e+02 -DRIPCGMinimizer: reduction in residual norm = 4.6850747823020768e-02 +CostJo : Nonlinear Jo(SeaSufaceTemp) = 3.4633305116094050e+02, nobs = 47, Jo/n = 7.3687883225732023e+00, err = 3.8763169345842458e-01 +CostFunction: Nonlinear J = 3.4633305116094050e+02 +DRIPCGMinimizer: reduction in residual norm = 4.7202666285926932e-02 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5443897261524953 - tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0172881894242254 + tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0172879509458523 uocn min=-0.8581693992488438 max=0.7000954286848975 mean=-0.0002591771954069 vocn min=-0.7661101215480253 max=1.4377766409421606 mean=0.0021972630399530 ssh min=-1.9244847628277935 max=0.9272826517867588 mean=-0.2767903423591662 hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017 layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420 + Valid time: 2018-04-15T03:00:00Z + socn min=10.7210460395083924 max=40.4416591681037119 mean=34.5459713920834233 + tocn min=-1.8879950757380115 max=31.6932489128285653 mean=6.0153956660849053 + uocn min=-0.8496117748396494 max=0.6890666856088563 mean=0.0000321916028576 + vocn min=-0.9321576238931384 max=0.9467331169326910 mean=0.0016143192702768 + ssh min=-1.9092725357352314 max=0.9091665415750726 mean=-0.2765781634769230 + hocn min=0.0009178261947465 max=1346.5803472041777695 mean=128.6280879778919370 +layer_depth min=2.2774359470406269 max=5658.2958090376268956 mean=1200.5228825300762310 Valid time: 2018-04-15T06:00:00Z socn min=10.7210460395083924 max=40.4416591598428923 mean=34.5467399790273930 - tocn min=-1.8874921066163295 max=31.6858695414581994 mean=6.0149053913019692 + tocn min=-1.8874921066163295 max=31.6858695414581994 mean=6.0149051391146102 uocn min=-0.8416820355059554 max=0.6786386084306094 mean=0.0002717176669510 vocn min=-1.1593584500375382 max=0.9487438635750088 mean=0.0003618099374769 ssh min=-1.9078432544437094 max=0.9075559090823697 mean=-0.2765830659083295 @@ -22,6 +30,6 @@ layer_depth min=2.2683307266867532 max=5658.3141547773811908 mean=1200.522 -CostJb : Nonlinear Jb = 6.2310830111054884e+01 -CostJo : Nonlinear Jo(SeaSufaceTemp) = 8.4052947271121468e+01, nobs = 47, Jo/n = 1.7883605802366269e+00, err = 3.8763169345842458e-01 -CostFunction: Nonlinear J = 1.4636377738217635e+02 +CostJb : Nonlinear Jb = 62.2625395356855904 +CostJo : Nonlinear Jo(SeaSufaceTemp) = 83.9599573855422818, nobs = 47, Jo/n = 1.7863820720328145, err = 0.3876316934584246 +CostFunction: Nonlinear J = 146.2224969212278722 diff --git a/test/testref/4dhybenvar.test b/test/testref/4dhybenvar.test index 183b2a561..ad24d4bfb 100644 --- a/test/testref/4dhybenvar.test +++ b/test/testref/4dhybenvar.test @@ -1,19 +1,27 @@ CostJb : Nonlinear Jb = 0.0000000000000000e+00 -CostJo : Nonlinear Jo(SeaSufaceTemp) = 3.4621019934654396e+02, nobs = 47, Jo/n = 7.3661744541817864e+00, err = 3.8763169345842458e-01 -CostFunction: Nonlinear J = 3.4621019934654396e+02 -DRIPCGMinimizer: reduction in residual norm = 4.6138071800182569e-02 +CostJo : Nonlinear Jo(SeaSufaceTemp) = 3.4633305116094050e+02, nobs = 47, Jo/n = 7.3687883225732023e+00, err = 3.8763169345842458e-01 +CostFunction: Nonlinear J = 3.4633305116094050e+02 +DRIPCGMinimizer: reduction in residual norm = 2.9632106891275146e-02 CostFunction::addIncrement: Analysis: Valid time: 2018-04-15T00:00:00Z socn min=10.7210460395083924 max=40.4416591897031168 mean=34.5443897261524953 - tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0161911336028018 + tocn min=-1.8883899372702533 max=31.7004645720658580 mean=6.0168364222730339 uocn min=-0.8581693992488438 max=0.7000954286848975 mean=-0.0002591771954069 vocn min=-0.7661101215480253 max=1.4377766409421606 mean=0.0021972630399530 ssh min=-1.9244847628277935 max=0.9272826517867588 mean=-0.2767903423591662 hocn min=0.0009999999999977 max=1345.6400000000003274 mean=128.6280642065023017 layer_depth min=2.2854716757984130 max=5658.3057467114012979 mean=1200.5229536158392420 + Valid time: 2018-04-15T03:00:00Z + socn min=10.7210460395083924 max=40.4416591681037119 mean=34.5459713920834233 + tocn min=-1.8879950757380115 max=31.6932489128285653 mean=6.0155385828677899 + uocn min=-0.8496117748396494 max=0.6890666856088563 mean=0.0000321916028576 + vocn min=-0.9321576238931384 max=0.9467331169326910 mean=0.0016143192702768 + ssh min=-1.9092725357352314 max=0.9091665415750726 mean=-0.2765781634769230 + hocn min=0.0009178261947465 max=1346.5803472041777695 mean=128.6280879778919370 +layer_depth min=2.2774359470406269 max=5658.2958090376268956 mean=1200.5228825300762310 Valid time: 2018-04-15T06:00:00Z socn min=10.7210460395083924 max=40.4416591598428923 mean=34.5467399790273930 - tocn min=-1.8874900461092519 max=31.6858695414267117 mean=6.0148527540566219 + tocn min=-1.8874921066163295 max=31.6858695414581994 mean=6.0150480550095162 uocn min=-0.8416820355059554 max=0.6786386084306094 mean=0.0002717176669510 vocn min=-1.1593584500375382 max=0.9487438635750088 mean=0.0003618099374769 ssh min=-1.9078432544437094 max=0.9075559090823697 mean=-0.2765830659083295 @@ -22,6 +30,6 @@ layer_depth min=2.2683307266867532 max=5658.3141547773811908 mean=1200.522 -CostJb : Nonlinear Jb = 2.5594172233367694e+01 -CostJo : Nonlinear Jo(SeaSufaceTemp) = 1.4331413876395970e+01, nobs = 47, Jo/n = 3.0492369949778658e-01, err = 3.8763169345842458e-01 -CostFunction: Nonlinear J = 3.9925586109763664e+01 +CostJb : Nonlinear Jb = 47.1914017175648013 +CostJo : Nonlinear Jo(SeaSufaceTemp) = 125.2151202248368094, nobs = 47, Jo/n = 2.6641514941454640, err = 0.3876316934584246 +CostFunction: Nonlinear J = 172.4065219424016107