time window configuration

MetOffice · Nov 8, 2023 · fad342b · fad342b
1 parent f5666e5
commit fad342b
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 28 deletions.
diff --git a/examples/hofx3d_nc_orca1_checker_ice_mpi.yaml b/examples/hofx3d_nc_orca1_checker_ice_mpi.yaml
@@ -1,5 +1,6 @@
-window begin: 2021-06-28T12:00:00Z
-window length: P2D
+time window:
+  begin: 2021-06-28T12:00:00Z
+  length: P2D
 geometry:
   nemo variables:
     - name: ice_area_fraction

diff --git a/examples/hofx3d_odb_prof_example.yaml b/examples/hofx3d_odb_prof_example.yaml
@@ -17,8 +17,9 @@ state :
   state variables: [ sea_water_temperature, sea_water_temperature_background_error, depth ]
   nemo field file: /data/users/tsearle/maera/test/eorca12_20210630.nc
   variance field file: /data/users/tsearle/maera/test/eorca12_err_20210630.nc
-window begin: 2021-08-20T00:00:00Z
-window length: P2D
+time window:
+  begin: 2021-08-20T00:00:00Z
+  length: P2D
 observations:
   observers:
   - obs space:

diff --git a/examples/hofx3d_profile_gomsaver.yaml b/examples/hofx3d_profile_gomsaver.yaml
@@ -17,8 +17,9 @@ state :
   state variables: [ sea_water_temperature, sea_water_temperature_background_error, depth]
   nemo field file: /data/users/tsearle/builds_xl/jopa-bundle-next/ops.bg_ocean.nc
   variance field file: /data/users/tsearle/builds_xl/jopa-bundle-next/bgerr_all_orca12ext.nc
-window begin: 2021-08-20T00:00:00Z
-window length: P2D
+time window:
+  begin: 2021-08-20T00:00:00Z
+  length: P2D
 observations:
   observers:
   - obs space:

diff --git a/examples/hofx_nc_ice_mpi.yaml b/examples/hofx_nc_ice_mpi.yaml
@@ -1,6 +1,7 @@
 forecast length : P3D
-window begin: 2021-06-28T23:00:00Z
-window length: P2D
+time window:
+  begin: 2021-06-28T23:00:00Z
+  length: P2D
 geometry:
   nemo variables:
     - name: ice_area_fraction

diff --git a/src/tests/testinput/basic.yaml b/src/tests/testinput/basic.yaml
@@ -18,8 +18,9 @@ model :
     - date: '2018-04-15T00:00:00Z'
       fcstime: 1
       nemo field file: /scratch/tsearle/orca2_seaice_dummy.nc
-window begin: 2018-04-14T21:00:00Z
-window length: P1D
+time window:
+  begin: 2018-04-14T21:00:00Z
+  length: P1D
 observations:
   observers:
   - obs operator:

diff --git a/src/tests/testinput/hofx3d_nc_potm.yaml b/src/tests/testinput/hofx3d_nc_potm.yaml
@@ -17,8 +17,9 @@ state :
   state variables: [ sea_water_potential_temperature, sea_water_potential_temperature_background_error, depth ]
   nemo field file: Data/orca2_t_nemo.nc
   variance field file: Data/orca2_t_bkg_var.nc
-window begin: 2021-06-29T12:00:00Z
-window length: P1D
+time window:
+  begin: 2021-06-29T12:00:00Z
+  length: P1D
 observations:
   observers:
   - obs space:

diff --git a/src/tests/testinput/hofx3d_nc_prof_2vars.yaml b/src/tests/testinput/hofx3d_nc_prof_2vars.yaml
@@ -29,8 +29,9 @@ state :
   - salinity_background_error
   nemo field file: Data/orca2_t_nemo.nc
   variance field file: Data/orca2_t_bkg_var.nc
-window begin: 2021-06-29T12:00:00Z
-window length: P1D
+time window:
+  begin: 2021-06-29T12:00:00Z
+  length: P1D
 observations:
   observers:
   - obs space:

diff --git a/src/tests/testinput/hofx3d_nc_sst.yaml b/src/tests/testinput/hofx3d_nc_sst.yaml
@@ -21,8 +21,9 @@ state :
   state variables: [ sea_surface_temperature, sea_surface_temperature_background_error ]
   nemo field file: Data/orca2_t_nemo.nc
   variance field file: Data/orca2_t_bkg_var.nc
-window begin: 2021-06-29T12:00:00Z
-window length: P1D
+time window:
+  begin: 2021-06-29T12:00:00Z
+  length: P1D
 observations:
   observers:
   - obs space:

diff --git a/src/tests/testinput/hofx_nc_ice.yaml b/src/tests/testinput/hofx_nc_ice.yaml
@@ -1,6 +1,7 @@
 forecast length : P2D
-window begin: 2021-06-28T23:00:00Z
-window length: P2D
+time window:
+  begin: 2021-06-28T23:00:00Z
+  length: P2D
 geometry:
   nemo variables:
     - name: ice_area_fraction

diff --git a/src/tests/testinput/hofx_nc_ssh.yaml b/src/tests/testinput/hofx_nc_ssh.yaml
@@ -1,6 +1,7 @@
 forecast length : P2D
-window begin: 2021-06-28T23:00:00Z
-window length: P2D
+time window:
+  begin: 2021-06-28T23:00:00Z
+  length: P2D
 geometry :
   nemo variables:
     - name: sea_surface_height_anomaly

diff --git a/src/tests/testinput/hofx_nc_sst.yaml b/src/tests/testinput/hofx_nc_sst.yaml
@@ -1,6 +1,7 @@
 forecast length : P2D
-window begin: 2021-06-28T23:00:00Z
-window length: P2D
+time window:
+  begin: 2021-06-28T23:00:00Z
+  length: P2D
 geometry :
   nemo variables:
     - name: ice_area_fraction

diff --git a/src/tests/testinput/hofx_odb_ice.yaml b/src/tests/testinput/hofx_odb_ice.yaml
@@ -1,6 +1,7 @@
 forecast length : P3D
-window begin: 2021-06-28T23:00:00Z
-window length: P2D
+time window:
+  begin: 2021-06-28T23:00:00Z
+  length: P2D
 geometry:
   nemo variables:
     - name: ice_area_fraction

diff --git a/src/tests/testinput/ostia_seaice_obs.yaml b/src/tests/testinput/ostia_seaice_obs.yaml
@@ -29,8 +29,9 @@ model :
       nemo field file: /data/users/tsearle/jopa_ostia_start_data/ops_bg_full.nc
       variance field file: /data/users/tsearle/jopa_ostia_start_data/ops_bgerr_ostia_orca12ext.nc
       state variables: [ ice_area_fraction ]
-window begin: 2021-06-29T21:00:00Z
-window length: P1D
+time window:
+  begin: 2021-06-29T21:00:00Z
+  length: P1D
 observations:
 - obs space:
     name: Sea Ice

diff --git a/src/tests/testinput/ostia_seaice_obs_hofx3d.yaml b/src/tests/testinput/ostia_seaice_obs_hofx3d.yaml
@@ -20,8 +20,9 @@ state :
   state variables: [ ice_area_fraction, ice_area_fraction_background_error ]
   nemo field file: Data/orca2_t_nemo.nc
   variance field file: Data/orca2_t_bkg_var.nc
-window begin: 2021-06-29T12:00:00Z
-window length: P1D
+time window:
+  begin: 2021-06-29T12:00:00Z
+  length: P1D
 observations:
   observers:
   - obs space: