From 68469ae291cb775eb6ace7a7212672bc1fc75cf1 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 27 Jun 2024 14:17:18 +0000 Subject: [PATCH 1/5] Initial commit --- .../atmosphere_3dvar_outer_loop_1.yaml.j2 | 2 +- .../atmosphere_3dvar_outer_loop_2.yaml.j2 | 2 +- model/atmosphere/atmosphere_background.yaml.j2 | 15 +++++++-------- .../atmosphere_background_ensemble.yaml.j2 | 15 +++++++-------- ...re_background_error_hybrid_gsibec_bump.yaml.j2 | 11 ++++------- .../atmosphere_geometry_background.yaml.j2 | 2 +- 6 files changed, 21 insertions(+), 26 deletions(-) diff --git a/model/atmosphere/atmosphere_3dvar_outer_loop_1.yaml.j2 b/model/atmosphere/atmosphere_3dvar_outer_loop_1.yaml.j2 index 9c850f6..3b65a68 100644 --- a/model/atmosphere/atmosphere_3dvar_outer_loop_1.yaml.j2 +++ b/model/atmosphere/atmosphere_3dvar_outer_loop_1.yaml.j2 @@ -12,6 +12,6 @@ npx: {{atmosphere_npx_anl}} npy: {{atmosphere_npy_anl}} npz: {{atmosphere_npz_anl}} - field metadata override: {{atmosphere_fv3jedi_files_path}}/fv3jedi_fieldmetadata_restart.yaml + field metadata override: {{atmosphere_fv3jedi_files_path}}/fv3jedi_fieldmetadata_history.yaml diagnostics: departures: bkgmob diff --git a/model/atmosphere/atmosphere_3dvar_outer_loop_2.yaml.j2 b/model/atmosphere/atmosphere_3dvar_outer_loop_2.yaml.j2 index ec5dc09..5ca7f80 100644 --- a/model/atmosphere/atmosphere_3dvar_outer_loop_2.yaml.j2 +++ b/model/atmosphere/atmosphere_3dvar_outer_loop_2.yaml.j2 @@ -12,6 +12,6 @@ npx: {{atmosphere_npx_anl}} npy: {{atmosphere_npy_anl}} npz: {{atmosphere_npz_anl}} - field metadata override: {{atmosphere_fv3jedi_files_path}}/fv3jedi_fieldmetadata_restart.yaml + field metadata override: {{atmosphere_fv3jedi_files_path}}/fv3jedi_fieldmetadata_history.yaml diagnostics: departures: bkgmob1 diff --git a/model/atmosphere/atmosphere_background.yaml.j2 b/model/atmosphere/atmosphere_background.yaml.j2 index e5a8827..44d271d 100644 --- a/model/atmosphere/atmosphere_background.yaml.j2 +++ b/model/atmosphere/atmosphere_background.yaml.j2 @@ -1,12 +1,11 @@ -datapath: {{ atmosphere_background_path}} -filetype: fms restart +datapath: {{ atmosphere_background_path }} +filetype: cube sphere history +provider: ufs +ufs soil nlev: 4 +ufs fields split by level: [smc,stc] datetime: "{{ atmosphere_background_time_iso }}" filename is datetime templated: true -filename_core: "%yyyy%mm%dd.%hh%MM%ss.fv_core.res.nc" -filename_trcr: "%yyyy%mm%dd.%hh%MM%ss.fv_tracer.res.nc" -filename_sfcd: "%yyyy%mm%dd.%hh%MM%ss.sfc_data.nc" -filename_sfcw: "%yyyy%mm%dd.%hh%MM%ss.fv_srf_wnd.res.nc" -filename_cplr: "%yyyy%mm%dd.%hh%MM%ss.coupler.res" -state variables: [ua,va,t,delp,ps,sphum,ice_wat,liq_wat,o3mr,phis, +filenames: [ {{ GPREFIX }}cubed_sphere_grid_atmf006.nc, {{ GPREFIX }}cubed_sphere_grid_sfcf006.nc ] +state variables: [ua,va,t,delz,delp,ps,sphum,ice_wat,liq_wat,o3mr,surface_geopotential_height, slmsk,sheleg,tsea,vtype,stype,vfrac,stc,smc,snwdph, u_srf,v_srf,f10m] diff --git a/model/atmosphere/atmosphere_background_ensemble.yaml.j2 b/model/atmosphere/atmosphere_background_ensemble.yaml.j2 index 37640ee..03e603e 100644 --- a/model/atmosphere/atmosphere_background_ensemble.yaml.j2 +++ b/model/atmosphere/atmosphere_background_ensemble.yaml.j2 @@ -2,17 +2,16 @@ datetime: '{{ atmosphere_background_time_iso }}' members from template: template: datetime: '{{ atmosphere_background_time_iso }}' - filetype: fms restart - state variables: [ua,va,t,DZ,delp,ps,sphum,ice_wat,liq_wat,o3mr,phis, + filetype: cube sphere history + provider: ufs + ufs soil nlev: 4 + ufs fields split by level: [smc,stc] + state variables: [ua,va,t,delz,delp,ps,sphum,ice_wat,liq_wat,o3mr,surface_geopotential_height, slmsk,sheleg,tsea,vtype,stype,vfrac,stc,smc,snwdph, u_srf,v_srf,f10m] - datapath: {{ atmosphere_background_ensemble_path}} + datapath: {{ atmosphere_background_ensemble_path }} filename is datetime templated: true - filename_core: "%yyyy%mm%dd.%hh%MM%ss.fv_core.res.nc" - filename_trcr: "%yyyy%mm%dd.%hh%MM%ss.fv_tracer.res.nc" - filename_sfcd: "%yyyy%mm%dd.%hh%MM%ss.sfc_data.nc" - filename_sfcw: "%yyyy%mm%dd.%hh%MM%ss.fv_srf_wnd.res.nc" - filename_cplr: "%yyyy%mm%dd.%hh%MM%ss.coupler.res" + filenames: [ enkf{{ GPREFIX }}cubed_sphere_grid_atmf006.nc, enkf{{ GPREFIX }}cubed_sphere_grid_sfcf006.nc ] pattern: "{{ atmosphere_ensemble_pattern | default("%mem%", true) }}" nmembers: {{ atmosphere_number_ensemble_members }} zero padding: 3 diff --git a/model/atmosphere/atmosphere_background_error_hybrid_gsibec_bump.yaml.j2 b/model/atmosphere/atmosphere_background_error_hybrid_gsibec_bump.yaml.j2 index 4ba0dbe..e0d463a 100644 --- a/model/atmosphere/atmosphere_background_error_hybrid_gsibec_bump.yaml.j2 +++ b/model/atmosphere/atmosphere_background_error_hybrid_gsibec_bump.yaml.j2 @@ -32,15 +32,12 @@ components: members from template: template: datetime: "{{ atmosphere_background_time_iso }}" - filetype: fms restart + filetype: cube sphere history + provider: ufs state variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr] - datapath: {{ atmosphere_background_ensemble_path}} + datapath: {{ atmosphere_background_ensemble_path }} filename is datetime templated: true - filename_core: "%yyyy%mm%dd.%hh%MM%ss.fv_core.res.nc" - filename_trcr: "%yyyy%mm%dd.%hh%MM%ss.fv_tracer.res.nc" - filename_sfcd: "%yyyy%mm%dd.%hh%MM%ss.sfc_data.nc" - filename_sfcw: "%yyyy%mm%dd.%hh%MM%ss.fv_srf_wnd.res.nc" - filename_cplr: "%yyyy%mm%dd.%hh%MM%ss.coupler.res" + filenames: [ enkf{{ GPREFIX }}cubed_sphere_grid_atmf006.nc, enkf{{ GPREFIX }}cubed_sphere_grid_sfcf006.nc ] pattern: "{{ atmosphere_ensemble_pattern | default("%mem%", true) }}" nmembers: {{atmosphere_number_ensemble_members}} zero padding: 3 diff --git a/model/atmosphere/atmosphere_geometry_background.yaml.j2 b/model/atmosphere/atmosphere_geometry_background.yaml.j2 index 65ec71b..14ceeff 100644 --- a/model/atmosphere/atmosphere_geometry_background.yaml.j2 +++ b/model/atmosphere/atmosphere_geometry_background.yaml.j2 @@ -8,4 +8,4 @@ layout: npx: {{atmosphere_npx_ges}} npy: {{atmosphere_npy_ges}} npz: {{atmosphere_npz_ges}} -field metadata override: "{{atmosphere_fv3jedi_files_path}}/fv3jedi_fieldmetadata_restart.yaml" +field metadata override: "{{atmosphere_fv3jedi_files_path}}/fv3jedi_fieldmetadata_history.yaml" \ No newline at end of file From be20bb4cb2f64fc25e783e797d82e69e8574b603 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Fri, 28 Jun 2024 19:50:42 +0000 Subject: [PATCH 2/5] Update --- .../atmosphere/fv3jedi_fv3inc_lgetkf.yaml.j2 | 18 ++++++++---------- .../fv3jedi_fv3inc_variational.yaml.j2 | 16 +++++++--------- model/atmosphere/atmosphere_background.yaml.j2 | 3 +-- .../atmosphere_background_ensemble.yaml.j2 | 2 +- ...background_error_hybrid_gsibec_bump.yaml.j2 | 4 ++-- 5 files changed, 19 insertions(+), 24 deletions(-) diff --git a/algorithm/atmosphere/fv3jedi_fv3inc_lgetkf.yaml.j2 b/algorithm/atmosphere/fv3jedi_fv3inc_lgetkf.yaml.j2 index c7d24ca..f69bca2 100644 --- a/algorithm/atmosphere/fv3jedi_fv3inc_lgetkf.yaml.j2 +++ b/algorithm/atmosphere/fv3jedi_fv3inc_lgetkf.yaml.j2 @@ -1,6 +1,6 @@ variable change: variable change name: Model2GeoVaLs - input variables: &bkgvars [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr,phis] + input variables: &bkgvars [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr,surface_geopotential_height] output variables: &fv3incrvars [ua,va,t,sphum,ice_wat,liq_wat,o3mr,delp,hydrostatic_delz] jedi increment variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr] fv3 increment variables: *fv3incrvars @@ -15,7 +15,7 @@ background geometry: npx: {{ atmosphere_npx_ges }} npy: {{ atmosphere_npy_ges }} npz: {{ atmosphere_npz_ges }} - field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml + field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml jedi increment geometry: fms initialization: namelist filename: ./fv3jedi/fmsmpp.nml @@ -27,7 +27,7 @@ jedi increment geometry: npx: {{ atmosphere_npx_ges }} npy: {{ atmosphere_npy_ges }} npz: {{ atmosphere_npz_ges }} - field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml + field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml fv3 increment geometry: fms initialization: namelist filename: ./fv3jedi/fmsmpp.nml @@ -44,14 +44,12 @@ members from template: template: background input: datapath: ./bkg/mem%mem% - filetype: fms restart + filetype: cube sphere history + provider: ufs + ufs soil nlev: 4 + ufs fields split by level: [smc,stc] + filenames: [ {{ atmosphere_ensemble_history_prefix }}cubed_sphere_grid_atmf006.nc, {{ atmosphere_ensemble_history_prefix }}cubed_sphere_grid_sfcf006.nc ] datetime: '{{ atmosphere_background_time_iso }}' - filename is datetime templated: true - filename_core: "%yyyy%mm%dd.%hh%MM%ss.fv_core.res.nc" - filename_trcr: "%yyyy%mm%dd.%hh%MM%ss.fv_tracer.res.nc" - filename_sfcd: "%yyyy%mm%dd.%hh%MM%ss.sfc_data.nc" - filename_sfcw: "%yyyy%mm%dd.%hh%MM%ss.fv_srf_wnd.res.nc" - filename_cplr: "%yyyy%mm%dd.%hh%MM%ss.coupler.res" state variables: *bkgvars jedi increment input: filetype: cube sphere history diff --git a/algorithm/atmosphere/fv3jedi_fv3inc_variational.yaml.j2 b/algorithm/atmosphere/fv3jedi_fv3inc_variational.yaml.j2 index 63079a2..d5277f1 100644 --- a/algorithm/atmosphere/fv3jedi_fv3inc_variational.yaml.j2 +++ b/algorithm/atmosphere/fv3jedi_fv3inc_variational.yaml.j2 @@ -1,6 +1,6 @@ variable change: variable change name: Model2GeoVaLs - input variables: &bkgvars [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr,phis] + input variables: &bkgvars [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr,surface_geopotential_height] output variables: &fv3incrvars [ua,va,t,sphum,ice_wat,liq_wat,o3mr,delp,hydrostatic_delz] jedi increment variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr] fv3 increment variables: *fv3incrvars @@ -15,7 +15,7 @@ background geometry: npx: {{ atmosphere_npx_ges }} npy: {{ atmosphere_npy_ges }} npz: {{ atmosphere_npz_ges }} - field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml + field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml jedi increment geometry: fms initialization: namelist filename: ./fv3jedi/fmsmpp.nml @@ -43,14 +43,12 @@ fv3 increment geometry: members: - background input: datapath: ./bkg - filetype: fms restart + filetype: cube sphere history + provider: ufs + ufs soil nlev: 4 + ufs fields split by level: [smc,stc] datetime: "{{ atmosphere_background_time_iso }}" - filename is datetime templated: true - filename_core: "%yyyy%mm%dd.%hh%MM%ss.fv_core.res.nc" - filename_trcr: "%yyyy%mm%dd.%hh%MM%ss.fv_tracer.res.nc" - filename_sfcd: "%yyyy%mm%dd.%hh%MM%ss.sfc_data.nc" - filename_sfcw: "%yyyy%mm%dd.%hh%MM%ss.fv_srf_wnd.res.nc" - filename_cplr: "%yyyy%mm%dd.%hh%MM%ss.coupler.res" + filenames: [ {{ atmosphere_variational_history_prefix }}cubed_sphere_grid_atmf006.nc, {{ atmosphere_variational_history_prefix }}cubed_sphere_grid_sfcf006.nc ] state variables: *bkgvars jedi increment input: filetype: cube sphere history diff --git a/model/atmosphere/atmosphere_background.yaml.j2 b/model/atmosphere/atmosphere_background.yaml.j2 index 44d271d..9b12185 100644 --- a/model/atmosphere/atmosphere_background.yaml.j2 +++ b/model/atmosphere/atmosphere_background.yaml.j2 @@ -4,8 +4,7 @@ provider: ufs ufs soil nlev: 4 ufs fields split by level: [smc,stc] datetime: "{{ atmosphere_background_time_iso }}" -filename is datetime templated: true -filenames: [ {{ GPREFIX }}cubed_sphere_grid_atmf006.nc, {{ GPREFIX }}cubed_sphere_grid_sfcf006.nc ] +filenames: [ {{ atmosphere_variational_history_prefix }}cubed_sphere_grid_atmf006.nc, {{ atmosphere_variational_history_prefix }}cubed_sphere_grid_sfcf006.nc ] state variables: [ua,va,t,delz,delp,ps,sphum,ice_wat,liq_wat,o3mr,surface_geopotential_height, slmsk,sheleg,tsea,vtype,stype,vfrac,stc,smc,snwdph, u_srf,v_srf,f10m] diff --git a/model/atmosphere/atmosphere_background_ensemble.yaml.j2 b/model/atmosphere/atmosphere_background_ensemble.yaml.j2 index 03e603e..a6ff8dd 100644 --- a/model/atmosphere/atmosphere_background_ensemble.yaml.j2 +++ b/model/atmosphere/atmosphere_background_ensemble.yaml.j2 @@ -11,7 +11,7 @@ members from template: u_srf,v_srf,f10m] datapath: {{ atmosphere_background_ensemble_path }} filename is datetime templated: true - filenames: [ enkf{{ GPREFIX }}cubed_sphere_grid_atmf006.nc, enkf{{ GPREFIX }}cubed_sphere_grid_sfcf006.nc ] + filenames: [ {{ atmosphere_ensemble_history_prefix }}cubed_sphere_grid_atmf006.nc, {{ atmosphere_ensemble_history_prefix }}cubed_sphere_grid_sfcf006.nc ] pattern: "{{ atmosphere_ensemble_pattern | default("%mem%", true) }}" nmembers: {{ atmosphere_number_ensemble_members }} zero padding: 3 diff --git a/model/atmosphere/atmosphere_background_error_hybrid_gsibec_bump.yaml.j2 b/model/atmosphere/atmosphere_background_error_hybrid_gsibec_bump.yaml.j2 index e0d463a..e5b06aa 100644 --- a/model/atmosphere/atmosphere_background_error_hybrid_gsibec_bump.yaml.j2 +++ b/model/atmosphere/atmosphere_background_error_hybrid_gsibec_bump.yaml.j2 @@ -33,11 +33,11 @@ components: template: datetime: "{{ atmosphere_background_time_iso }}" filetype: cube sphere history - provider: ufs + provider: ufs state variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr] datapath: {{ atmosphere_background_ensemble_path }} filename is datetime templated: true - filenames: [ enkf{{ GPREFIX }}cubed_sphere_grid_atmf006.nc, enkf{{ GPREFIX }}cubed_sphere_grid_sfcf006.nc ] + filenames: [ {{ atmosphere_ensemble_history_prefix }}cubed_sphere_grid_atmf006.nc, {{ atmosphere_ensemble_history_prefix }}cubed_sphere_grid_sfcf006.nc ] pattern: "{{ atmosphere_ensemble_pattern | default("%mem%", true) }}" nmembers: {{atmosphere_number_ensemble_members}} zero padding: 3 From 3f1b88bc63a1101a0cc19f77e475069203725513 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 18 Jul 2024 12:31:17 +0000 Subject: [PATCH 3/5] Update --- model/atmosphere/atmosphere_background.yaml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/atmosphere/atmosphere_background.yaml.j2 b/model/atmosphere/atmosphere_background.yaml.j2 index 9b12185..580fc68 100644 --- a/model/atmosphere/atmosphere_background.yaml.j2 +++ b/model/atmosphere/atmosphere_background.yaml.j2 @@ -5,6 +5,6 @@ ufs soil nlev: 4 ufs fields split by level: [smc,stc] datetime: "{{ atmosphere_background_time_iso }}" filenames: [ {{ atmosphere_variational_history_prefix }}cubed_sphere_grid_atmf006.nc, {{ atmosphere_variational_history_prefix }}cubed_sphere_grid_sfcf006.nc ] -state variables: [ua,va,t,delz,delp,ps,sphum,ice_wat,liq_wat,o3mr,surface_geopotential_height, - slmsk,sheleg,tsea,vtype,stype,vfrac,stc,smc,snwdph, +state variables: [ua,va,t,delp,ps,sphum,ice_wat,liq_wat,o3mr,surface_geopotential_height, + slmsk,sheleg,tsea,vtype,stype,vfrac,stc,smc,snwdphMeters, u_srf,v_srf,f10m] From b18f16a6ebad5f0471e017b34422f0c1582c894c Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 25 Jul 2024 12:24:26 +0000 Subject: [PATCH 4/5] Update ensemble background template --- model/atmosphere/atmosphere_background_ensemble.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/atmosphere/atmosphere_background_ensemble.yaml.j2 b/model/atmosphere/atmosphere_background_ensemble.yaml.j2 index a6ff8dd..16b980e 100644 --- a/model/atmosphere/atmosphere_background_ensemble.yaml.j2 +++ b/model/atmosphere/atmosphere_background_ensemble.yaml.j2 @@ -7,7 +7,7 @@ members from template: ufs soil nlev: 4 ufs fields split by level: [smc,stc] state variables: [ua,va,t,delz,delp,ps,sphum,ice_wat,liq_wat,o3mr,surface_geopotential_height, - slmsk,sheleg,tsea,vtype,stype,vfrac,stc,smc,snwdph, + slmsk,sheleg,tsea,vtype,stype,vfrac,stc,smc,snwdphMeters, u_srf,v_srf,f10m] datapath: {{ atmosphere_background_ensemble_path }} filename is datetime templated: true From 685b37d19a0d246053cfd248ef55e54f83e3e013 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA <134300700+DavidNew-NOAA@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:59:27 -0400 Subject: [PATCH 5/5] Update atmosphere_geometry_background.yaml.j2 --- model/atmosphere/atmosphere_geometry_background.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/atmosphere/atmosphere_geometry_background.yaml.j2 b/model/atmosphere/atmosphere_geometry_background.yaml.j2 index 14ceeff..8e0f501 100644 --- a/model/atmosphere/atmosphere_geometry_background.yaml.j2 +++ b/model/atmosphere/atmosphere_geometry_background.yaml.j2 @@ -8,4 +8,4 @@ layout: npx: {{atmosphere_npx_ges}} npy: {{atmosphere_npy_ges}} npz: {{atmosphere_npz_ges}} -field metadata override: "{{atmosphere_fv3jedi_files_path}}/fv3jedi_fieldmetadata_history.yaml" \ No newline at end of file +field metadata override: "{{atmosphere_fv3jedi_files_path}}/fv3jedi_fieldmetadata_history.yaml"