Marine ens. var.

parm/soca/berror/soca_ensb.yaml.j2

@@ -90,7 +90,7 @@ trajectory:
 
 output increment:
   # TODO: Revert this when fms can take more than 128 charactres file names
-  datadir: '{{ ENSPERT_RELPATH }}/enspert/'
+  datadir: '{{ ENSPERT_RELPATH }}/'
   date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
   exp: trash
   type: incr

parm/soca/berror/soca_ensrecenter.yaml

@@ -4,104 +4,48 @@ geometry:
   mom6_input_nml: mom_input.nml
   fields metadata: ./fields_metadata.yaml
 
-date: '{{ ATM_WINDOW_BEGIN }}'
+date: '{{ MARINE_WINDOW_END_ISO }}'
 
 layers variable: [hocn]
 
 # TODO(AFE) fix ice recentering in cycled da
-#increment variables: [tocn, socn, uocn, vocn, ssh, hocn, cicen, hicen, hsnon]
-increment variables: [tocn, socn, uocn, vocn, ssh, hocn]
+increment variables: [tocn, socn, uocn, vocn]
 
-set increment variables to zero: [ssh]
+set increment variables to zero: [uocn, vocn]
 
 vertical geometry:
-  date: '{{ ATM_WINDOW_BEGIN }}'
+  date: '{{ MARINE_WINDOW_BEGIN_ISO }}'
   basename: ./INPUT/
   ocn_filename: MOM.res.nc
   read_from_file: 3
 
-add recentering increment: false
+add recentering increment: true
+recentering around deterministic: true
 
 soca increments:  # Could also be states, but they are read as increments
   number of increments: {{ NMEM_ENS }}
   pattern: '%mem%'
   template:
-    date: '{{ ATM_WINDOW_BEGIN }}'
+    date: '{{ MARINE_WINDOW_END_ISO }}'
     basename: ./ens/
     ocn_filename: 'ocean.%mem%.nc'
-# TODO(AFE) fix ice recentering in cycled da
+    # TODO(AFE) fix ice recentering in cycled da
     # ice_filename: 'ice.%mem%.nc'
     read_from_file: 3
 
-steric height:
-  linear variable changes:
-  - linear variable change name: BalanceSOCA  # Only the steric balance is applied
-
-#ensemble mean output:
-#  datadir: ./static_ens
-#  date: '{{ ATM_WINDOW_BEGIN }}'
-#  exp: ens_mean
-#  type: incr
-
-ssh output:
-  unbalanced:
-    datadir: ./
-    date: '{{ ATM_WINDOW_BEGIN }}'
-    exp: ssh_unbal_stddev
-    type: incr
-
-  steric:
-    datadir: ./
-    date: '{{ ATM_WINDOW_BEGIN }}'
-    exp: ssh_steric_stddev
-    type: incr
-
-  total:
-    datadir: ./
-    date: '{{ ATM_WINDOW_BEGIN }}'
-    exp: ssh_total_stddev
-    type: incr
-
-  explained variance:
-    datadir: ./
-    date: '{{ ATM_WINDOW_BEGIN }}'
-    exp: steric_explained_variance
-    type: incr
-
-  recentering error:
-    datadir: ./
-    date: '{{ ATM_WINDOW_BEGIN }}'
-    exp: ssh_recentering_error
-    type: incr
-
-background error output:
-  datadir: ./
-  date: '{{ ATM_WINDOW_BEGIN }}'
-  exp: bkgerr_stddev
-  type: incr
-
-#linear variable change:
-#  linear variable changes:
-#  - linear variable change name: BkgErrFILT
-#    ocean_depth_min: 500  # zero where ocean is shallower than 500m
-#    rescale_bkgerr: 1.0   # rescale perturbation
-#    efold_z: 1500.0       # Apply exponential decay
-#  - linear variable change name: BalanceSOCA
-
 trajectory:
 # TODO(AFE) fix ice recentering in cycled da
-  # state variables: [tocn, socn, uocn, vocn, ssh, hocn, layer_depth, mld, cicen, hicen, hsnon]
-  state variables: [tocn, socn, uocn, vocn, ssh, hocn, layer_depth, mld]
-  date: '{{ ATM_WINDOW_BEGIN }}'
-  basename: ./INPUT/
-  ocn_filename: MOM.res.nc
+  state variables: [tocn, socn, uocn, vocn, hocn, layer_depth, mld]
+  date: '{{ MARINE_WINDOW_END_ISO }}'
+  basename: ./bkg/
+  ocn_filename: ocean.bkg.f009.nc
 # TODO(AFE) fix ice recentering in cycled da
   #ice_filename: cice.res.nc
   read_from_file: 1
 
 output increment:
   datadir: ./
-  date: '{{ ATM_WINDOW_BEGIN }}'
+  date: '{{ MARINE_WINDOW_END_ISO }}'
   exp: trash
   type: incr
   output file: 'ocn.recenter.incr.%mem%.nc'

parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2

@@ -18,7 +18,7 @@ background error:
     calibration:
       normalization:
         method: randomization
-        iterations: 10000
+        iterations: 1000
 
       groups:
       - horizontal:
@@ -32,6 +32,7 @@ background error:
 
       - horizontal:
           as gaussian: true
-          fixed value: 50000.0
+          fixed value: 25000.0
+          mask: "interp_mask"
         write:
           filepath: ./staticb/hz_ice

parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2

@@ -24,6 +24,7 @@ background error:
       groups:
       - vertical:
           as gaussian: true
+          levels: '{{ MOM6_LEVS }}'
           model file:
             date: '{{ MARINE_WINDOW_MIDDLE | to_isotime }}'
             basename: ./

parm/soca/ensda/stage_ens_mem.yaml.j2

@@ -9,7 +9,7 @@
 # create working directories
 ######################################
 mkdir:
-- "{{ DATAenspert }}/ens"
+- "{{ DATAens }}/ens"
 
 ######################################
 # copy ensemble background files
@@ -22,6 +22,6 @@ copy:
                         '${YMD}':gPDY,
                         '${HH}':gcyc,
                         '${MEMDIR}':"mem" + '%03d' % mem} %}
-    - ["{{ COM_OCEAN_HISTORY_TMPL | replace_tmpl(tmpl_dict) }}/{{ GDUMP_ENS }}.ocean.t{{ gcyc }}z.inst.f006.nc", "{{ DATAenspert }}/ens/ocean.{{ mem }}.nc"]
-    - ["{{ COM_ICE_HISTORY_TMPL | replace_tmpl(tmpl_dict) }}/{{ GDUMP_ENS }}.ice.t{{ gcyc }}z.inst.f006.nc", "{{ DATAenspert }}/ens/ice.{{ mem }}.nc"]
+    - ["{{ COM_OCEAN_HISTORY_TMPL | replace_tmpl(tmpl_dict) }}/{{ GDUMP_ENS }}.ocean.t{{ gcyc }}z.inst.f006.nc", "{{ DATAens }}/ens/ocean.{{ mem }}.nc"]
+    - ["{{ COM_ICE_HISTORY_TMPL | replace_tmpl(tmpl_dict) }}/{{ GDUMP_ENS }}.ice.t{{ gcyc }}z.inst.f006.nc", "{{ DATAens }}/ens/ice.{{ mem }}.nc"]
 {% endfor %}

parm/soca/marine-jcb-base.yaml

@@ -31,6 +31,7 @@ analysis_variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
 # ------------
 marine_window_begin: '{{MARINE_WINDOW_BEGIN}}'
 marine_window_middle: '{{MARINE_WINDOW_MIDDLE}}'
+marine_window_end: '{{MARINE_WINDOW_END}}'
 
 # Geometry
 marine_soca_files_path: .
@@ -47,7 +48,7 @@ marine_pseudo_model_states: !INC 'bkg_list.yaml'
 # Background error model
 background_error_file: '{{berror_model}}'
 marine_number_ensemble_members: '{{nmem_ens}}'
-marine_stddev_time: '{{MARINE_WINDOW_MIDDLE}}'
+marine_stddev_time: '{{MARINE_WINDOW_MIDDLE_ISO}}'
 
 # Observations
 observations: all_observations

parm/soca/obsprep/obsprep_config.yaml

@@ -160,7 +160,7 @@ observations:
     name: sst_viirs_npp_l3u
     provider: GHRSST
     dmpdir subdir: ocean/sst
-    type: nc 
+    type: nc
     dmpdir regex: '*-L3U_GHRSST-SSTsubskin-VIIRS_NPP-ACSPO_V*.nc'
     bounds:
       units: C
@@ -230,7 +230,7 @@ observations:
       stride: 15
       min number of obs: 10
     ocean basin: RECCAP2_region_masks_all_v20221025.nc
-    
+
 # in situ: monthly
 - obs space:
     name: insitu_profile_bathy
@@ -285,7 +285,7 @@ observations:
     name: insitu_surface_trkob
     provider: GTS
     dmpdir subdir: atmos
-    type: bufr 
+    type: bufr
     dmpdir regex: 'gdas.*.trkob.*.bufr_d'
 
 # in situ: daily
@@ -316,5 +316,3 @@ observations:
     dmpdir subdir: atmos
     type: bufr
     dmpdir regex: 'gdas.*.mbuoyb.*.bufr_d'
-
-

test/gw-ci/CMakeLists.txt

@@ -66,6 +66,36 @@ endif()
 
 option(RUN_GW_CI "Enable the global-workflow CI tests" OFF)
 if (RUN_GW_CI)
+  # HYB WCDA, low-res
+  # -------------------
+  set(pslot "WCDA-HYB-C48mx500")
+  set(YAML_PATH ${HOMEgfs}/ci/cases/pr/C48mx500_hybAOWCDA.yaml)
+  set(TASK_LIST
+    "gdas_prepoceanobs"
+    "gdas_marinebmat"
+    "gdas_ocnanalecen"
+    "gdas_marineanlinit"
+    "gdas_marineanlvar"
+    "gdas_marineanlchkpt"
+    "gdas_marineanlfinal"
+    )
+  add_cycling_tests(${pslot} ${YAML_PATH} ${HOMEgfs} ${RUNTESTS} ${PROJECT_SOURCE_DIR} "${TASK_LIST}")
+
+  # HYB WCDA, low-res
+  # -------------------
+  set(pslot "WCDA-HYB-C384mx025")
+  set(YAML_PATH ${HOMEgfs}/ci/cases/gfsv17/C384mx025_hybAOWCDA.yaml)
+  set(TASK_LIST
+    "gdas_prepoceanobs"
+    "gdas_marinebmat"
+    "gdas_ocnanalecen"
+    "gdas_marineanlinit"
+    "gdas_marineanlvar"
+    "gdas_marineanlchkpt"
+    "gdas_marineanlfinal"
+    )
+  add_cycling_tests(${pslot} ${YAML_PATH} ${HOMEgfs} ${RUNTESTS} ${PROJECT_SOURCE_DIR} "${TASK_LIST}")
+
   # Aero-Land DA, C96
   # -----------------
   set(pslot "Aero-Snow-3DVAR-C96")