From d39bf61570394730e17cd6508307ff7a624cd3cd Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Fri, 27 Sep 2024 17:58:09 +0000 Subject: [PATCH 1/6] Update jcb-gdas hash --- parm/jcb-gdas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/jcb-gdas b/parm/jcb-gdas index 272d6d73c..614730134 160000 --- a/parm/jcb-gdas +++ b/parm/jcb-gdas @@ -1 +1 @@ -Subproject commit 272d6d73c0ceea5332fee005f59b3270527d10c7 +Subproject commit 6147301341339a0520d73cc191ba37b767fecc82 From 1fde5628322c984f28bb962b17943b4130b7d2ad Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Mon, 7 Oct 2024 17:55:48 +0000 Subject: [PATCH 2/6] Update --- parm/atm/jcb-base.yaml.j2 | 4 ++++ parm/jcb-gdas | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/parm/atm/jcb-base.yaml.j2 b/parm/atm/jcb-base.yaml.j2 index 6387fffbb..10c461e55 100644 --- a/parm/atm/jcb-base.yaml.j2 +++ b/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" diff --git a/parm/jcb-gdas b/parm/jcb-gdas index 614730134..b72f7bd1f 160000 --- a/parm/jcb-gdas +++ b/parm/jcb-gdas @@ -1 +1 @@ -Subproject commit 6147301341339a0520d73cc191ba37b767fecc82 +Subproject commit b72f7bd1f719cbb471ef2b94db8c930b21d15ad2 From 3bf7b50f324d4073cb357d0088bd11d324038593 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Tue, 8 Oct 2024 01:12:07 +0000 Subject: [PATCH 3/6] Update JCB gdas hash --- parm/jcb-gdas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/jcb-gdas b/parm/jcb-gdas index b72f7bd1f..803c0c758 160000 --- a/parm/jcb-gdas +++ b/parm/jcb-gdas @@ -1 +1 @@ -Subproject commit b72f7bd1f719cbb471ef2b94db8c930b21d15ad2 +Subproject commit 803c0c7580faf998ff1378c1a2d343aa8bbe508a From 8a501f7905497f5b65649fd05c825f5869b2a6c8 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Tue, 8 Oct 2024 16:36:14 +0000 Subject: [PATCH 4/6] Update jjob tests for new feature --- test/atm/global-workflow/config.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/atm/global-workflow/config.yaml b/test/atm/global-workflow/config.yaml index c06019628..d8bf2e4c2 100644 --- a/test/atm/global-workflow/config.yaml +++ b/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" From 29696c82ab994e02dcfbeefc4b30953de352605b Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Wed, 9 Oct 2024 13:39:09 +0000 Subject: [PATCH 5/6] Change the way obs biases are staged --- parm/atm/jcb-base.yaml.j2 | 10 ++++++++++ parm/jcb-gdas | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/parm/atm/jcb-base.yaml.j2 b/parm/atm/jcb-base.yaml.j2 index 10c461e55..d7e1e5907 100644 --- a/parm/atm/jcb-base.yaml.j2 +++ b/parm/atm/jcb-base.yaml.j2 @@ -98,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) # ------------------------- diff --git a/parm/jcb-gdas b/parm/jcb-gdas index 803c0c758..6b0276175 160000 --- a/parm/jcb-gdas +++ b/parm/jcb-gdas @@ -1 +1 @@ -Subproject commit 803c0c7580faf998ff1378c1a2d343aa8bbe508a +Subproject commit 6b02761758d607105579a9627f54c86aab01164a From 140dc0e6a6550321b6cf1db6630f3d6ca067dc12 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Wed, 9 Oct 2024 23:56:06 +0000 Subject: [PATCH 6/6] update jcb-gdas hash --- parm/jcb-gdas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/jcb-gdas b/parm/jcb-gdas index 6b0276175..7717c0e74 160000 --- a/parm/jcb-gdas +++ b/parm/jcb-gdas @@ -1 +1 @@ -Subproject commit 6b02761758d607105579a9627f54c86aab01164a +Subproject commit 7717c0e7401e344a6bce37a4f8ecc11399256936