JCB-based obs+bias staging (#1312)

This PR is a companion to Global-Workflow PR
[#2992](NOAA-EMC/global-workflow#2992) and
JCB-GDAS PR [#31](NOAA-EMC/jcb-gdas#31).

It adds two parameters required for the above Global-Workflow PR to the
JCB base YAML for the atmosphere.

parm/atm/jcb-base.yaml.j2

@@ -71,6 +71,8 @@ observations: all_observations
 crtm_coefficient_path: "{{ DATA }}/crtm/"
 
 # Naming conventions for observational files
+atmosphere_obsdataroot_path: "{{COM_OBS}}"
+
 atmosphere_obsdatain_path: "{{atm_obsdatain_path}}"
 atmosphere_obsdatain_prefix: "{{OPREFIX}}"
 atmosphere_obsdatain_suffix: ".tm00.nc"
@@ -80,6 +82,8 @@ atmosphere_obsdataout_prefix: diag_
 atmosphere_obsdataout_suffix: "_{{ current_cycle | to_YMDH }}.nc"
 
 # Naming conventions for bias correction files
+atmosphere_obsbiasroot_path: "{{COM_ATMOS_ANALYSIS_PREV}}"
+
 atmosphere_obsbiasin_path: "{{DATA}}/obs/"
 atmosphere_obsbiasin_prefix: "{{GPREFIX}}"
 atmosphere_obsbiasin_suffix: ".satbias.nc"
@@ -94,6 +98,16 @@ atmosphere_obsbiasout_suffix: ".satbias.nc"
 atmosphere_obsbiascovout_prefix: "{{APREFIX}}"
 atmosphere_obsbiascovout_suffix: ".satbias_cov.nc"
 
+bias_files:
+  atms_n20: rad_varbc_params.tar
+  atms_npp: rad_varbc_params.tar
+  mtiasi_metop-a: rad_varbc_params.tar
+  mtiasi_metop-b: rad_varbc_params.tar
+  amsua_n19: rad_varbc_params.tar
+  ssmis_f17: rad_varbc_params.tar
+  ssmis_f18: rad_varbc_params.tar
+  cris-fsr_n20: rad_varbc_params.tar
+  cris-fsr_npp: rad_varbc_params.tar
 
 # Local Ensemble DA (LETKF)
 # -------------------------

test/atm/global-workflow/config.yaml

@@ -10,7 +10,7 @@ base:
   PTMP: "@bindir@/test/atm/global-workflow/testrun"
 
 atmanl:
-  JCB_ALGO_YAML: "@srcdir@/test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2"
+  JCB_ALGO_YAML_VAR: "@srcdir@/test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2"
   STATICB_TYPE: "identity"
   ATMRES_ANL: "C48"
   LAYOUT_X_ATMANL: 1
@@ -19,11 +19,6 @@ atmanl:
 atmensanl:
   JCB_ALGO_YAML_LETKF: "@srcdir@/test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2"
   JCB_ALGO_YAML_OBS: "@srcdir@/test/atm/global-workflow/jcb-prototype_lgetkf_observer.yaml.j2"
+  JCB_ALGO_YAML_SOL: "@srcdir@/test/atm/global-workflow/jcb-prototype_lgetkf_solver.yaml.j2"
   LAYOUT_X_ATMENSANL: 1
   LAYOUT_Y_ATMENSANL: 1
-
-atmensanlobs:
-  JCB_ALGO_YAML: "@srcdir@/test/atm/global-workflow/jcb-prototype_lgetkf_observer.yaml.j2"
-
-atmensanlsol:
-  JCB_ALGO_YAML: "@srcdir@/test/atm/global-workflow/jcb-prototype_lgetkf_solver.yaml.j2"