From bc6ae2d64b53bc757bd76fbc3377f570415e15a6 Mon Sep 17 00:00:00 2001 From: Benjamin Menetrier Date: Wed, 8 Mar 2023 15:09:38 +0000 Subject: [PATCH 1/5] Update yamls --- test/testinput/parameters_bump_cor_nicas.yml | 117 +++++++++-------- .../parameters_bump_cor_nicas_scales.yml | 96 +++++++------- test/testinput/parameters_bump_cov.yml | 124 +++++++++--------- test/testinput/parameters_bump_loc.yml | 66 +++++----- 4 files changed, 206 insertions(+), 197 deletions(-) diff --git a/test/testinput/parameters_bump_cor_nicas.yml b/test/testinput/parameters_bump_cor_nicas.yml index 622d3411f..987ef5017 100644 --- a/test/testinput/parameters_bump_cor_nicas.yml +++ b/test/testinput/parameters_bump_cor_nicas.yml @@ -3,8 +3,6 @@ geometry: mom6_input_nml: data_static/36x17x25/input.nml fields metadata: data_static/fields_metadata.yml -input variables: [socn, tocn, uocn, vocn, ssh] - background: read_from_file: 1 date: &date 2018-04-15T00:00:00Z @@ -14,61 +12,66 @@ background: # ocn_filename: ocn.convertstate.fc.2018-04-15T00:00:00Z.PT0S.nc state variables: [hocn, socn, tocn, uocn, vocn, ssh] -bump: - io: - data directory: data_generated/parameters_bump_cor_nicas - drivers: - multivariate strategy: univariate - compute nicas: true - write local nicas: true - model: - do not cross mask boundaries: true - nicas: - resolution: 6.0 - explicit length-scales: true - horizontal length-scale: - - groups: - - socn - - tocn - - uocn - - vocn - - ssh - value: 6000.0e3 - vertical length-scale: - - groups: - - socn - - tocn - - uocn - - vocn - - ssh - value: 100 - grids: - - model: - variables: - - socn - - tocn - - uocn - - vocn - io: - files prefix: bump3d - - model: - variables: - - ssh - io: - files prefix: bump2d -output: -- parameter: cor_rh - file: - datadir: data_generated/parameters_bump_cor_nicas - date: *date - exp: parameters_bump_cor_nicas.cor_rh - type: an -- parameter: cor_rv - file: - datadir: data_generated/parameters_bump_cor_nicas - date: *date - exp: parameters_bump_cor_nicas.cor_rv - type: an +background error: + covariance model: SABER + saber central block: + saber block name: BUMP_NICAS + active variables: [socn, tocn, uocn, vocn, ssh] + bump: + io: + data directory: data_generated/parameters_bump_cor_nicas + drivers: + multivariate strategy: univariate + compute nicas: true + write local nicas: true + model: + do not cross mask boundaries: true + nicas: + resolution: 6.0 + explicit length-scales: true + horizontal length-scale: + - groups: + - socn + - tocn + - uocn + - vocn + - ssh + value: 6000.0e3 + vertical length-scale: + - groups: + - socn + - tocn + - uocn + - vocn + - ssh + value: 100 + grids: + - model: + variables: + - socn + - tocn + - uocn + - vocn + io: + files prefix: bump3d + - model: + variables: + - ssh + io: + files prefix: bump2d + output fields: + - parameter: cor_rh + file: + datadir: data_generated/parameters_bump_cor_nicas + date: *date + exp: parameters_bump_cor_nicas.cor_rh + type: an + - parameter: cor_rv + file: + datadir: data_generated/parameters_bump_cor_nicas + date: *date + exp: parameters_bump_cor_nicas.cor_rv + type: an test: reference filename: testref/parameters_bump_cor_nicas.test diff --git a/test/testinput/parameters_bump_cor_nicas_scales.yml b/test/testinput/parameters_bump_cor_nicas_scales.yml index d0ef79d8b..9fd4a36c4 100644 --- a/test/testinput/parameters_bump_cor_nicas_scales.yml +++ b/test/testinput/parameters_bump_cor_nicas_scales.yml @@ -3,8 +3,6 @@ geometry: mom6_input_nml: data_static/72x35x25/input.nml fields metadata: data_static/fields_metadata.yml -input variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] - background: read_from_file: 1 date: &date 2018-04-15T00:00:00Z @@ -13,51 +11,55 @@ background: ice_filename: cice.res.nc state variables: [socn, tocn, uocn, vocn, ssh, hocn, cicen, hicen] -bump: - io: - data directory: data_generated/parameters_bump_cor_nicas_scales - drivers: - multivariate strategy: univariate - compute nicas: true - write local nicas: true - model: - do not cross mask boundaries: true - nicas: - resolution: 6.0 - grids: - - model: - variables: - - socn - - tocn - - uocn - - vocn - io: - files prefix: bump3d - - model: - variables: - - ssh - - cicen - - hicen - io: - files prefix: bump2d - -input fields: -- parameter: rh - file: - read_from_file: 1 - date: *date - basename: data_generated/setcorscales/ - ocn_filename: ocn.cor_rh.incr.2018-04-15T00:00:00Z.nc - ice_filename: ice.cor_rh.incr.2018-04-15T00:00:00Z.nc - state variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] -- parameter: rv - file: - read_from_file: 1 - date: *date - basename: data_generated/setcorscales/ - ocn_filename: ocn.cor_rv.incr.2018-04-15T00:00:00Z.nc - ice_filename: ice.cor_rv.incr.2018-04-15T00:00:00Z.nc - state variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] +background error: + covariance model: SABER + saber central block: + saber block name: BUMP_NICAS + active variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] + bump: + io: + data directory: data_generated/parameters_bump_cor_nicas_scales + drivers: + multivariate strategy: univariate + compute nicas: true + write local nicas: true + model: + do not cross mask boundaries: true + nicas: + resolution: 6.0 + grids: + - model: + variables: + - socn + - tocn + - uocn + - vocn + io: + files prefix: bump3d + - model: + variables: + - ssh + - cicen + - hicen + io: + files prefix: bump2d + input fields: + - parameter: rh + file: + read_from_file: 1 + date: *date + basename: data_generated/setcorscales/ + ocn_filename: ocn.cor_rh.incr.2018-04-15T00:00:00Z.nc + ice_filename: ice.cor_rh.incr.2018-04-15T00:00:00Z.nc + state variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] + - parameter: rv + file: + read_from_file: 1 + date: *date + basename: data_generated/setcorscales/ + ocn_filename: ocn.cor_rv.incr.2018-04-15T00:00:00Z.nc + ice_filename: ice.cor_rv.incr.2018-04-15T00:00:00Z.nc + state variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] test: reference filename: testref/parameters_bump_cor_nicas_scales.test diff --git a/test/testinput/parameters_bump_cov.yml b/test/testinput/parameters_bump_cov.yml index 14a14cb78..1093aba04 100644 --- a/test/testinput/parameters_bump_cov.yml +++ b/test/testinput/parameters_bump_cov.yml @@ -3,73 +3,75 @@ geometry: mom6_input_nml: data_static/36x17x25/input.nml fields metadata: data_static/fields_metadata.yml -input variables: [tocn] - background: read_from_file: 1 date: &date 2018-04-15T00:00:00Z basename: data_static/36x17x25/restarts/ ocn_filename: MOM.res.nc - state variables: [socn, tocn, hocn] - -bump: - io: - data directory: data_generated/parameters_bump_cov - drivers: - compute covariance: true - compute correlation: true - multivariate strategy: univariate - compute variance: true - compute moments: true - sampling: - computation grid size: 500 - diagnostic grid size: 500 - distance classes: 15 - distance class width: 100.0e3 - reduced levels: 25 - local diagnostic: true - averaging length-scale: 1000.0e3 - diagnostics: - target ensemble size: 4 - variance: - objective filtering: true - filtering iterations: 0 - initial length-scale: - - variables: - - tocn - value: 2000.0e3 - nicas: - resolution: 8.0 -output: -- parameter: cor_rh - file: - datadir: data_generated/parameters_bump_cov - date: *date - exp: parameters_bump_cov.cor_rh - type: an -- parameter: cor_rv - file: - datadir: data_generated/parameters_bump_cov - date: *date - exp: parameters_bump_cov.cor_rv - type: an -- parameter: stddev - file: - datadir: data_generated/parameters_bump_cov - date: *date - exp: parameters_bump_cov.stddev - type: an + state variables: [tocn, hocn] -ensemble: - members from template: - template: - read_from_file: 1 - date: *date - basename: data_static/36x17x25/restarts_ens/ - ocn_filename: ocn.enspert.lowres.ens.%mem%.2018-04-15T00:00:00Z.PT6H.nc - state variables: [tocn, hocn] - pattern: '%mem%' - nmembers: 4 +background error: + covariance model: SABER + ensemble: + members from template: + template: + read_from_file: 1 + date: *date + basename: data_static/36x17x25/restarts_ens/ + ocn_filename: ocn.enspert.lowres.ens.%mem%.2018-04-15T00:00:00Z.PT6H.nc + state variables: [tocn, hocn] + pattern: '%mem%' + nmembers: 4 + saber central block: + saber block name: BUMP_NICAS + active variables: [tocn] + bump: + io: + data directory: data_generated/parameters_bump_cov + drivers: + compute covariance: true + compute correlation: true + multivariate strategy: univariate + compute variance: true + compute moments: true + sampling: + computation grid size: 500 + diagnostic grid size: 500 + distance classes: 15 + distance class width: 100.0e3 + reduced levels: 25 + local diagnostic: true + averaging length-scale: 1000.0e3 + diagnostics: + target ensemble size: 4 + variance: + objective filtering: true + filtering iterations: 0 + initial length-scale: + - variables: + - tocn + value: 2000.0e3 + nicas: + resolution: 8.0 + output fields: + - parameter: cor_rh + file: + datadir: data_generated/parameters_bump_cov + date: *date + exp: parameters_bump_cov.cor_rh + type: an + - parameter: cor_rv + file: + datadir: data_generated/parameters_bump_cov + date: *date + exp: parameters_bump_cov.cor_rv + type: an + - parameter: stddev + file: + datadir: data_generated/parameters_bump_cov + date: *date + exp: parameters_bump_cov.stddev + type: an test: reference filename: testref/parameters_bump_cov.test diff --git a/test/testinput/parameters_bump_loc.yml b/test/testinput/parameters_bump_loc.yml index b3d6732e8..bd323b064 100644 --- a/test/testinput/parameters_bump_loc.yml +++ b/test/testinput/parameters_bump_loc.yml @@ -3,45 +3,47 @@ geometry: mom6_input_nml: data_static/72x35x25/input.nml fields metadata: data_static/fields_metadata.yml -input variables: &soca_vars [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn] - background: read_from_file: 1 basename: data_static/72x35x25/restarts/ date: &date 2018-04-15T06:00:00Z ocn_filename: MOM.res.nc ice_filename: cice.res.nc - state variables: *soca_vars + state variables: &stateVariables [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn] -bump: - io: - data directory: data_generated/parameters_bump_loc - files prefix: soca_bump_loc - drivers: - multivariate strategy: duplicated - compute nicas: true - write local nicas: true - nicas: - resolution: 6.0 - explicit length-scales: true - horizontal length-scale: - - groups: - - common - value: 2500000.0 - vertical length-scale: - - groups: - - common - value: 500 - grids: - - model: - variables: - - socn - - tocn - - uocn - - vocn - - cicen - - hicen - - ssh +background error: + covariance model: SABER + saber central block: + saber block name: BUMP_NICAS + bump: + io: + data directory: data_generated/parameters_bump_loc + files prefix: soca_bump_loc + drivers: + multivariate strategy: duplicated + compute nicas: true + write local nicas: true + nicas: + resolution: 6.0 + explicit length-scales: true + horizontal length-scale: + - groups: + - common + value: 2500000.0 + vertical length-scale: + - groups: + - common + value: 500 + grids: + - model: + variables: + - socn + - tocn + - uocn + - vocn + - cicen + - hicen + - ssh test: reference filename: testref/parameters_bump_loc.test From a66cd7db63b839d62a2d4c62124d2de2b28a1598 Mon Sep 17 00:00:00 2001 From: Benjamin Menetrier Date: Thu, 13 Apr 2023 13:49:30 +0000 Subject: [PATCH 2/5] Update source and yamls --- src/soca/Covariance/soca_covariance_mod.F90 | 5 +-- test/testinput/3dhyb.yml | 2 +- test/testinput/3dhybfgat.yml | 2 +- test/testinput/3dvarbump.yml | 2 +- .../testinput/dirac_soca_cor_nicas_scales.yml | 2 +- test/testinput/dirac_socahyb_cov.yml | 2 +- test/testinput/parameters_bump_cor_nicas.yml | 31 +++++++------ .../parameters_bump_cor_nicas_scales.yml | 39 ++++++++-------- test/testinput/parameters_bump_cov.yml | 45 +++++++++---------- test/testinput/parameters_bump_loc.yml | 4 +- .../parameters_bump_cor_nicas_scales.test | 4 +- 11 files changed, 67 insertions(+), 71 deletions(-) diff --git a/src/soca/Covariance/soca_covariance_mod.F90 b/src/soca/Covariance/soca_covariance_mod.F90 index d2dc96376..036b195cc 100644 --- a/src/soca/Covariance/soca_covariance_mod.F90 +++ b/src/soca/Covariance/soca_covariance_mod.F90 @@ -267,7 +267,7 @@ subroutine soca_bump_correlation(self, horiz_convol, geom, f_conf_bump, f_conf_d real(kind=kind_real), pointer :: real_ptr(:,:) real(kind=kind_real), allocatable :: area(:) type(atlas_functionspace) :: afunctionspace - type(fieldset_type) :: afieldset, rh, rv, universe_rad + type(fieldset_type) :: afieldset, rh, rv type(atlas_field) :: afield real(kind=kind_real) :: r_base, r_mult, r_min, r_max, r_min_grid @@ -307,13 +307,12 @@ subroutine soca_bump_correlation(self, horiz_convol, geom, f_conf_bump, f_conf_d int_ptr(1,:) = pack(hmask, .true.) call afieldset%add(afield) call afield%final() - universe_rad = atlas_fieldset() ! Set verbosity horiz_convol%mpl%verbose = (geom%f_comm%rank()==0) ! Create BUMP object - call horiz_convol%create(geom%f_comm,afunctionspace,afieldset,f_conf_bump,universe_rad) + call horiz_convol%create(geom%f_comm,afunctionspace,afieldset,f_conf_bump) if (horiz_convol%nam%new_nicas) then ! get parameters for correlation lengths diff --git a/test/testinput/3dhyb.yml b/test/testinput/3dhyb.yml index 1d839a253..213739da5 100644 --- a/test/testinput/3dhyb.yml +++ b/test/testinput/3dhyb.yml @@ -106,7 +106,7 @@ cost function: saber central block: saber block name: BUMP_NICAS active variables: *soca_vars - bump: + read: io: data directory: data_generated/parameters_bump_loc files prefix: soca_bump_loc diff --git a/test/testinput/3dhybfgat.yml b/test/testinput/3dhybfgat.yml index 5e1ad537c..363efc186 100644 --- a/test/testinput/3dhybfgat.yml +++ b/test/testinput/3dhybfgat.yml @@ -120,7 +120,7 @@ cost function: saber central block: saber block name: BUMP_NICAS active variables: *soca_vars - bump: + read: io: data directory: data_generated/parameters_bump_loc files prefix: soca_bump_loc diff --git a/test/testinput/3dvarbump.yml b/test/testinput/3dvarbump.yml index 7c0deaf12..fa30d2fc6 100644 --- a/test/testinput/3dvarbump.yml +++ b/test/testinput/3dvarbump.yml @@ -27,7 +27,7 @@ cost function: covariance model: SABER saber central block: saber block name: BUMP_NICAS - bump: + read: io: data directory: data_generated/parameters_bump_cor_nicas drivers: diff --git a/test/testinput/dirac_soca_cor_nicas_scales.yml b/test/testinput/dirac_soca_cor_nicas_scales.yml index ffa4f95bf..29a734fdb 100644 --- a/test/testinput/dirac_soca_cor_nicas_scales.yml +++ b/test/testinput/dirac_soca_cor_nicas_scales.yml @@ -15,7 +15,7 @@ background error: covariance model: SABER saber central block: saber block name: BUMP_NICAS - bump: + read: io: data directory: data_generated/parameters_bump_cor_nicas_scales drivers: diff --git a/test/testinput/dirac_socahyb_cov.yml b/test/testinput/dirac_socahyb_cov.yml index 5d2e3dc31..3a2219531 100644 --- a/test/testinput/dirac_socahyb_cov.yml +++ b/test/testinput/dirac_socahyb_cov.yml @@ -102,7 +102,7 @@ background error: localization method: SABER saber central block: saber block name: BUMP_NICAS - bump: + read: io: data directory: data_generated/parameters_bump_loc files prefix: soca_bump_loc diff --git a/test/testinput/parameters_bump_cor_nicas.yml b/test/testinput/parameters_bump_cor_nicas.yml index 987ef5017..2ae19cc6a 100644 --- a/test/testinput/parameters_bump_cor_nicas.yml +++ b/test/testinput/parameters_bump_cor_nicas.yml @@ -10,14 +10,13 @@ background: ocn_filename: MOM.res.nc # basename: data_generated/convertstate/ # ocn_filename: ocn.convertstate.fc.2018-04-15T00:00:00Z.PT0S.nc - state variables: [hocn, socn, tocn, uocn, vocn, ssh] + state variables: [socn, tocn, uocn, vocn, ssh] background error: covariance model: SABER saber central block: saber block name: BUMP_NICAS - active variables: [socn, tocn, uocn, vocn, ssh] - bump: + calibration: io: data directory: data_generated/parameters_bump_cor_nicas drivers: @@ -59,19 +58,19 @@ background error: - ssh io: files prefix: bump2d - output fields: - - parameter: cor_rh - file: - datadir: data_generated/parameters_bump_cor_nicas - date: *date - exp: parameters_bump_cor_nicas.cor_rh - type: an - - parameter: cor_rv - file: - datadir: data_generated/parameters_bump_cor_nicas - date: *date - exp: parameters_bump_cor_nicas.cor_rv - type: an + output model files: + - parameter: cor_rh + file: + datadir: data_generated/parameters_bump_cor_nicas + date: *date + exp: parameters_bump_cor_nicas.cor_rh + type: an + - parameter: cor_rv + file: + datadir: data_generated/parameters_bump_cor_nicas + date: *date + exp: parameters_bump_cor_nicas.cor_rv + type: an test: reference filename: testref/parameters_bump_cor_nicas.test diff --git a/test/testinput/parameters_bump_cor_nicas_scales.yml b/test/testinput/parameters_bump_cor_nicas_scales.yml index 9fd4a36c4..646631932 100644 --- a/test/testinput/parameters_bump_cor_nicas_scales.yml +++ b/test/testinput/parameters_bump_cor_nicas_scales.yml @@ -9,14 +9,13 @@ background: basename: data_static/72x35x25/restarts/ ocn_filename: MOM.res.nc ice_filename: cice.res.nc - state variables: [socn, tocn, uocn, vocn, ssh, hocn, cicen, hicen] + state variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] background error: covariance model: SABER saber central block: saber block name: BUMP_NICAS - active variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] - bump: + calibration: io: data directory: data_generated/parameters_bump_cor_nicas_scales drivers: @@ -43,23 +42,23 @@ background error: - hicen io: files prefix: bump2d - input fields: - - parameter: rh - file: - read_from_file: 1 - date: *date - basename: data_generated/setcorscales/ - ocn_filename: ocn.cor_rh.incr.2018-04-15T00:00:00Z.nc - ice_filename: ice.cor_rh.incr.2018-04-15T00:00:00Z.nc - state variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] - - parameter: rv - file: - read_from_file: 1 - date: *date - basename: data_generated/setcorscales/ - ocn_filename: ocn.cor_rv.incr.2018-04-15T00:00:00Z.nc - ice_filename: ice.cor_rv.incr.2018-04-15T00:00:00Z.nc - state variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] + input model files: + - parameter: rh + file: + read_from_file: 1 + date: *date + basename: data_generated/setcorscales/ + ocn_filename: ocn.cor_rh.incr.2018-04-15T00:00:00Z.nc + ice_filename: ice.cor_rh.incr.2018-04-15T00:00:00Z.nc + state variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] + - parameter: rv + file: + read_from_file: 1 + date: *date + basename: data_generated/setcorscales/ + ocn_filename: ocn.cor_rv.incr.2018-04-15T00:00:00Z.nc + ice_filename: ice.cor_rv.incr.2018-04-15T00:00:00Z.nc + state variables: [socn, tocn, uocn, vocn, ssh, cicen, hicen] test: reference filename: testref/parameters_bump_cor_nicas_scales.test diff --git a/test/testinput/parameters_bump_cov.yml b/test/testinput/parameters_bump_cov.yml index 1093aba04..f7781d1b5 100644 --- a/test/testinput/parameters_bump_cov.yml +++ b/test/testinput/parameters_bump_cov.yml @@ -8,7 +8,7 @@ background: date: &date 2018-04-15T00:00:00Z basename: data_static/36x17x25/restarts/ ocn_filename: MOM.res.nc - state variables: [tocn, hocn] + state variables: [tocn] background error: covariance model: SABER @@ -19,13 +19,12 @@ background error: date: *date basename: data_static/36x17x25/restarts_ens/ ocn_filename: ocn.enspert.lowres.ens.%mem%.2018-04-15T00:00:00Z.PT6H.nc - state variables: [tocn, hocn] + state variables: [tocn] pattern: '%mem%' nmembers: 4 saber central block: saber block name: BUMP_NICAS - active variables: [tocn] - bump: + calibration: io: data directory: data_generated/parameters_bump_cov drivers: @@ -53,25 +52,25 @@ background error: value: 2000.0e3 nicas: resolution: 8.0 - output fields: - - parameter: cor_rh - file: - datadir: data_generated/parameters_bump_cov - date: *date - exp: parameters_bump_cov.cor_rh - type: an - - parameter: cor_rv - file: - datadir: data_generated/parameters_bump_cov - date: *date - exp: parameters_bump_cov.cor_rv - type: an - - parameter: stddev - file: - datadir: data_generated/parameters_bump_cov - date: *date - exp: parameters_bump_cov.stddev - type: an + output model files: + - parameter: cor_rh + file: + datadir: data_generated/parameters_bump_cov + date: *date + exp: parameters_bump_cov.cor_rh + type: an + - parameter: cor_rv + file: + datadir: data_generated/parameters_bump_cov + date: *date + exp: parameters_bump_cov.cor_rv + type: an + - parameter: stddev + file: + datadir: data_generated/parameters_bump_cov + date: *date + exp: parameters_bump_cov.stddev + type: an test: reference filename: testref/parameters_bump_cov.test diff --git a/test/testinput/parameters_bump_loc.yml b/test/testinput/parameters_bump_loc.yml index bd323b064..0f92d2a98 100644 --- a/test/testinput/parameters_bump_loc.yml +++ b/test/testinput/parameters_bump_loc.yml @@ -9,13 +9,13 @@ background: date: &date 2018-04-15T06:00:00Z ocn_filename: MOM.res.nc ice_filename: cice.res.nc - state variables: &stateVariables [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh, hocn] + state variables: &stateVariables [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh] background error: covariance model: SABER saber central block: saber block name: BUMP_NICAS - bump: + calibration: io: data directory: data_generated/parameters_bump_loc files prefix: soca_bump_loc diff --git a/test/testref/parameters_bump_cor_nicas_scales.test b/test/testref/parameters_bump_cor_nicas_scales.test index a2a4c4684..a1987f2cd 100644 --- a/test/testref/parameters_bump_cor_nicas_scales.test +++ b/test/testref/parameters_bump_cor_nicas_scales.test @@ -1,2 +1,2 @@ -Norm of input parameter rh: 4.9024310689053154e+09 -Norm of input parameter rv: 1.4415640549763996e+05 +Norm of input parameter rh - 1: 4.9024310689053154e+09 +Norm of input parameter rv - 1: 1.4415640549763996e+05 From b79b11a445e440a676e904566e42f9a4323b86af Mon Sep 17 00:00:00 2001 From: Benjamin Menetrier Date: Mon, 24 Apr 2023 06:52:10 +0000 Subject: [PATCH 3/5] Fix ref --- test/testref/dirac_soca_cor_nicas_scales.test | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/testref/dirac_soca_cor_nicas_scales.test b/test/testref/dirac_soca_cor_nicas_scales.test index d145c4ab4..5dc93104a 100644 --- a/test/testref/dirac_soca_cor_nicas_scales.test +++ b/test/testref/dirac_soca_cor_nicas_scales.test @@ -8,9 +8,9 @@ Input Dirac increment: hicen min=0.0000000000000000 max=1.0000000000000000 mean=0.0006086427267194 Covariance(SABER) * Increment: Valid time: 2018-04-15T00:00:00Z - socn min=0.0000000000000000 max=1.0000000000000002 mean=0.0293635005803741 - tocn min=0.0000000000000000 max=1.0530523404044794 mean=0.3769034423956199 + socn min=0.0000000000000000 max=1.0000000000000002 mean=0.0340141737787489 + tocn min=0.0000000000000000 max=1.0048129708997011 mean=0.3536185118881098 ssh min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 hocn min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 cicen min=0.0000000000000000 max=0.0000000000000000 mean=0.0000000000000000 - hicen min=0.0000000000000000 max=1.0000000000000002 mean=0.2640285296287257 + hicen min=0.0000000000000000 max=0.9999999999999998 mean=0.2640285296287256 From c0ab5849c4df78a3bc607f9e43482d27ef10bf6e Mon Sep 17 00:00:00 2001 From: Benjamin Menetrier Date: Fri, 28 Apr 2023 16:11:59 +0000 Subject: [PATCH 4/5] Update yamls --- test/testinput/3dvarbump.yml | 5 +---- test/testinput/dirac_soca_cor_nicas_scales.yml | 5 +---- test/testinput/parameters_bump_cor_nicas.yml | 5 +---- test/testinput/parameters_bump_cor_nicas_scales.yml | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/test/testinput/3dvarbump.yml b/test/testinput/3dvarbump.yml index fa30d2fc6..23ace31e0 100644 --- a/test/testinput/3dvarbump.yml +++ b/test/testinput/3dvarbump.yml @@ -30,6 +30,7 @@ cost function: read: io: data directory: data_generated/parameters_bump_cor_nicas + files prefix: bump drivers: multivariate strategy: univariate read local nicas: true @@ -40,13 +41,9 @@ cost function: - tocn - uocn - vocn - io: - files prefix: bump3d - model: variables: - ssh - io: - files prefix: bump2d linear variable change: input variables: *soca_vars diff --git a/test/testinput/dirac_soca_cor_nicas_scales.yml b/test/testinput/dirac_soca_cor_nicas_scales.yml index 29a734fdb..b5b611f25 100644 --- a/test/testinput/dirac_soca_cor_nicas_scales.yml +++ b/test/testinput/dirac_soca_cor_nicas_scales.yml @@ -18,6 +18,7 @@ background error: read: io: data directory: data_generated/parameters_bump_cor_nicas_scales + files prefix: bump drivers: multivariate strategy: univariate read local nicas: true @@ -26,15 +27,11 @@ background error: variables: - socn - tocn - io: - files prefix: bump3d - model: variables: - ssh - cicen - hicen - io: - files prefix: bump2d dirac: ixdir: [1, 17, 41, 31, 51, 63, 81, 14, 16, 43] diff --git a/test/testinput/parameters_bump_cor_nicas.yml b/test/testinput/parameters_bump_cor_nicas.yml index 2ae19cc6a..cd7ab8bf2 100644 --- a/test/testinput/parameters_bump_cor_nicas.yml +++ b/test/testinput/parameters_bump_cor_nicas.yml @@ -19,6 +19,7 @@ background error: calibration: io: data directory: data_generated/parameters_bump_cor_nicas + files prefix: bump drivers: multivariate strategy: univariate compute nicas: true @@ -51,13 +52,9 @@ background error: - tocn - uocn - vocn - io: - files prefix: bump3d - model: variables: - ssh - io: - files prefix: bump2d output model files: - parameter: cor_rh file: diff --git a/test/testinput/parameters_bump_cor_nicas_scales.yml b/test/testinput/parameters_bump_cor_nicas_scales.yml index 646631932..47ffd5bb1 100644 --- a/test/testinput/parameters_bump_cor_nicas_scales.yml +++ b/test/testinput/parameters_bump_cor_nicas_scales.yml @@ -18,6 +18,7 @@ background error: calibration: io: data directory: data_generated/parameters_bump_cor_nicas_scales + files prefix: bump drivers: multivariate strategy: univariate compute nicas: true @@ -33,15 +34,11 @@ background error: - tocn - uocn - vocn - io: - files prefix: bump3d - model: variables: - ssh - cicen - hicen - io: - files prefix: bump2d input model files: - parameter: rh file: From 90958f0e5d639a4ae8eabb62e838d97e6eb10bf9 Mon Sep 17 00:00:00 2001 From: Benjamin Menetrier Date: Fri, 28 Apr 2023 17:08:38 +0000 Subject: [PATCH 5/5] Trigger tests