Companion for GW refactoring of marine ensemble recentering

parm/soca/soca_bmat_finalize.yaml.j2

@@ -0,0 +1,37 @@
+copy:
+# soca grid
+- ['{{ DATA }}/soca_gridspec.nc', '{{ COMOUT_OCEAN_BMATRIX }}']
+# Copy the diffusion coefficient files to the ROTDIR
+{% for diff_type in ['hz', 'vt'] %}
+- ['{{ DATAstaticb }}/{{ diff_type }}_ocean.nc', '{{ COMOUT_OCEAN_BMATRIX }}/{{ APREFIX }}{{ diff_type }}_ocean.nc']
+{% endfor %}
+# diag B
+- ['{{ DATAstaticb }}/ocn.bkgerr_stddev.nc', '{{ COMOUT_OCEAN_BMATRIX }}/{{ APREFIX }}ocean.bkgerr_ens_stddev.nc']
+- ['{{ DATAstaticb }}/ice.bkgerr_stddev.nc', '{{ COMOUT_ICE_BMATRIX }}/{{ APREFIX }}ice.bkgerr_ens_stddev.nc']
+{% if DOHYBVAR_OCN == "YES" or NMEM_ENS >= 2 %}
+- ['{{ DATAstaticb }}/ocn.ssh_recentering_error.incr.{{ MARINE_WINDOW_BEGIN_ISO }}.nc', '{{ COMOUT_OCEAN_BMATRIX }}/{{ APREFIX }}ocean.recentering_error.nc']
+- ['{{ DATAstaticb }}/ice.ssh_recentering_error.incr.{{ MARINE_WINDOW_BEGIN_ISO }}.nc', '{{ COMOUT_ICE_BMATRIX }}/{{ APREFIX }}ice.recentering_error.nc']
+{% endif %}
+# ensemble perturbation diagnostics
+{% if DOHYBVAR_OCN == "YES" or NMEM_ENS >= 2 %}
+- ['{{ DATA }}/ocn.ens_weights.incr.{{ MARINE_WINDOW_MIDDLE_ISO }}.nc', '{{ COMOUT_OCEAN_BMATRIX }}/{{ APREFIX }}ocean.ens_weights.nc']
+- ['{{ DATA }}/ice.ens_weights.incr.{{ MARINE_WINDOW_MIDDLE_ISO }}.nc', '{{ COMOUT_ICE_BMATRIX }}/{{ APREFIX }}ice.ens_weights.nc']
+# ssh diagnostics
+{% for string in ['ssh_steric_stddev', 'ssh_unbal_stddev', 'ssh_total_stddev', 'steric_explained_variance'] %}
+- ['{{ DATA }}/staticb/ocn.{{ string }}.incr.{{ MARINE_WINDOW_BEGIN_ISO }}.nc', '{{ COMOUT_OCEAN_BMATRIX }}/{{ APREFIX }}ocean.{{ string }}.nc']
+{% endfor %}
+{% endif %}
+# yaml files
+- ['{{ DATA }}/fields_metadata.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}bmat_fields_metadata.yaml']
+- ['{{ DATA }}/gridgen.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}gridgen.yaml']
+- ['{{ DATA }}/obsop_name_map.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}obsop_name_map.yaml']
+- ['{{ DATA }}/soca_chgres.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}soca_chgres.yaml']
+- ['{{ DATA }}/soca_diagb.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}soca_diagb.yaml']
+- ['{{ DATA }}/soca_parameters_diffusion_hz.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}soca_parameters_diffusion_hz.yaml']
+- ['{{ DATA }}/soca_parameters_diffusion_vt.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}soca_parameters_diffusion_vt.yaml']
+- ['{{ DATA }}/soca_setcorscales.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}soca_setcorscales.yaml']
+- ['{{ DATA }}/soca_vtscales.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}soca_vtscales.yaml']
+{% if DOHYBVAR_OCN == "YES" or NMEM_ENS >= 2 %}
+- ['{{ DATA }}/soca_ensb.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}soca_ensb.yaml']
+- ['{{ DATA }}/soca_ensweights.yaml', '{{ COMOUT_CONF }}/{{ APREFIX }}soca_ensweights.yaml']
+{% endif %}

parm/soca/soca_ecen_finalize.yaml.j2

@@ -0,0 +1,36 @@
+mkdir:
+{% set tmpl_dict = ({ '${ROTDIR}': ROTDIR,
+                      '${RUN}': RUN,
+                      '${YMD}': current_cycle | to_YMD,
+                      '${HH}': current_cycle | strftime('%H'),
+                      '${MEMDIR}': 'ensstat' }) %}
+- '{{ COM_OCEAN_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}'
+- '{{ COM_ICE_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}'
+{% for imem in range(1,NMEM_ENS+1) %}
+    {% set memchar = 'mem%03d' | format(imem) %}
+    {% set tmpl_dict = ({ '${ROTDIR}': ROTDIR,
+                          '${RUN}': RUN,
+                          '${YMD}': current_cycle | to_YMD,
+                          '${HH}': current_cycle | strftime('%H'),
+                          '${MEMDIR}': memchar }) %}
+- '{{ COM_OCEAN_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}'
+- '{{ COM_ICE_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}'
+{% endfor %}
+copy:
+{% for imem in range(1,NMEM_ENS+1) %}
+    {% set memchar = 'mem%03d' | format(imem) %}
+    {% set tmpl_dict = ({ '${ROTDIR}': ROTDIR,
+                          '${RUN}': RUN,
+                          '${YMD}': current_cycle | to_YMD,
+                          '${HH}': current_cycle | strftime('%H'),
+                          '${MEMDIR}': memchar }) %}
+- ['{{ DATA }}/ocn.recenter.incr.{{ imem | string }}.nc', '{{ COM_OCEAN_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ RUN }}.t{{ "%02d" | format(cyc) }}z.ocninc.nc']
+- ['{{ DATA }}/ens/cice_model.res.output.{{ imem | string }}.nc', '{{ COM_ICE_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ cice_rst_date }}.cice_model_anl.res.nc']
+{% endfor %}
+{% set tmpl_dict = ({ '${ROTDIR}': ROTDIR,
+                      '${RUN}': RUN,
+                      '${YMD}': current_cycle | to_YMD,
+                      '${HH}': current_cycle | strftime('%H'),
+                      '${MEMDIR}': 'ensstat' }) %}
+- ['{{ DATA }}/ocn.ensvar.incr.{{ MARINE_WINDOW_END_ISO }}.nc', '{{ COM_OCEAN_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ RUN }}.ocean.t{{ "%02d" | format(cyc) }}z.bg_ensvar.nc']
+- ['{{ DATA }}/ice.ensvar.incr.{{ MARINE_WINDOW_END_ISO }}.nc', '{{ COM_ICE_ANALYSIS_TMPL | replace_tmpl(tmpl_dict) }}/{{ RUN }}.ice.t{{ "%02d" | format(cyc) }}z.bg_ensvar.nc']

parm/soca/soca_ecen_jedi_config.yaml.j2

@@ -0,0 +1,12 @@
+gridgen:
+  rundir: '{{ DATA }}'
+  exe_src: '{{ EXECgfs }}/gdas_soca_gridgen.x'
+  mpi_cmd: '{{ APRUN_MARINEANLECEN }}'
+  jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/jcb-base.yaml.j2'
+  jcb_algo: soca_gridgen
+ens_handler:
+  rundir: '{{ DATA }}'
+  exe_src: '{{ EXECgfs }}/gdas_soca_ens_handler.x'
+  mpi_cmd: '{{ APRUN_MARINEANLECEN }}'
+  jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/jcb-base.yaml.j2'
+  jcb_algo: soca_ens_handler

parm/soca/soca_ecen_stage.yaml.j2

@@ -0,0 +1,19 @@
+mkdir:
+- '{{ DATA }}/ens'
+link:
+{% for imem in range(1,NMEM_ENS+1) %}
+    {% for domain in ['ocean', 'ice'] %}
+- [ "{{ DATA }}/../ensdata/ens/{{ domain }}.{{ imem | string }}.nc", '{{ DATA }}/ens/' ]
+    {% endfor %}
+{% endfor %}
+copy:
+{% for imem in range(1,NMEM_ENS+1) %}
+    {% set memchar = 'mem%03d' | format(imem) %}
+    {% set tmpl_dict = ({ '${ROTDIR}': ROTDIR,
+                          '${RUN}': RUN,
+                          '${YMD}': previous_cycle | to_YMD,
+                          '${HH}': previous_cycle | strftime('%H'),
+                          '${MEMDIR}': memchar }) %}
+- ['{{ COM_ICE_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ cice_rst_date }}.cice_model.res.nc', '{{ DATA }}/ens/cice_model.res.{{ imem | string }}.nc']
+- ['{{ COM_ICE_RESTART_TMPL | replace_tmpl(tmpl_dict) }}/{{ cice_rst_date }}.cice_model.res.nc', '{{ DATA }}/ens/cice_model.res.output.{{ imem | string }}.nc']
+{% endfor %}

test/gw-ci/CMakeLists.txt

@@ -212,12 +212,12 @@ function(add_task task_name test_prefix is_full_cycle HALF_CYCLE FULL_CYCLE pslo
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_marineanlvar_${FULL_CYCLE}")
     elseif("${task_name}" STREQUAL "gdas_marineanlfinal")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_marineanlchkpt_${FULL_CYCLE}")
-    elseif("${task_name}" STREQUAL "gdas_marineanlletkf")
+    elseif("${task_name}" STREQUAL "enkfgdas_marineanlletkf")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_prepoceanobs_${FULL_CYCLE}")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_marinebmat_${FULL_CYCLE}")
-    elseif("${task_name}" STREQUAL "gdas_ocnanalecen")
+    elseif("${task_name}" STREQUAL "enkfgdas_marineanlecen")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_marineanlvar_${FULL_CYCLE}")
-      list(APPEND TEST_DEPENDS "${test_prefix}_gdas_marineanlletkf_${FULL_CYCLE}")
+      list(APPEND TEST_DEPENDS "${test_prefix}_enkfgdas_marineanlletkf_${FULL_CYCLE}")
     else()
       list(APPEND TEST_DEPENDS "${test_prefix}")
     endif()
@@ -452,10 +452,10 @@ if (WORKFLOW_TESTS)
       "gdas_prepoceanobs"
       "gdas_marinebmatinit"
       "gdas_marinebmat"
-      "gdas_marineanlletkf"
+      "enkfgdas_marineanlletkf"
       "gdas_marineanlinit"
       "gdas_marineanlvar"
-      "gdas_ocnanalecen"
+      "enkfgdas_marineanlecen"
       "gdas_marineanlchkpt"
       "gdas_marineanlfinal"
       )