gsibec updates (#451)

* update to gsibec tag 1.1.2 * add read keyword to static and hybrid gsibec yamls
NOAA-EMC · Apr 28, 2023 · a1785d8 · a1785d8
1 parent a61a824
commit a1785d8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,7 +67,7 @@ if(BUILD_GDASBUNDLE)
 # Build GSI-B
   option(BUILD_GSIBEC "Build GSI-B" OFF)
   if(BUILD_GSIBEC)
-    ecbuild_bundle( PROJECT gsibec GIT "https://github.com/GEOS-ESM/GSIbec.git" TAG 1.0.7 )
+    ecbuild_bundle( PROJECT gsibec GIT "https://github.com/GEOS-ESM/GSIbec.git" TAG 1.1.2 )
   endif()
 
 # Core JEDI repositories

diff --git a/parm/atm/berror/hybvar_gsibec.yaml b/parm/atm/berror/hybvar_gsibec.yaml
@@ -4,21 +4,16 @@ components:
     covariance model: SABER
     saber central block:
       saber block name: gsi covariance
-      input variables: &control_vars [eastward_wind,northward_wind,air_temperature,surface_pressure,
-                                      specific_humidity,cloud_liquid_ice,cloud_liquid_water,
-                                      mole_fraction_of_ozone_in_air]
-      output variables: *control_vars
-      gsi akbk: &akbk $(DATA)/fv3jedi/akbk.nc4
-      gsi error covariance file: &gsiberr $(DATA)/berror/gsi-coeffs-gfs-global.nc4
-#     gsi error covariance file: &gsiberr $(DATA)/berror/global_berror.f77
-      gsi berror namelist file: &gsibnml $(DATA)/berror/gfs_gsi_global.nml
-      processor layout x direction: &layout_gsib_x 3
-      processor layout y direction: &layout_gsib_y 2
-      debugging mode: false
+      read:
+        gsi akbk: &akbk $(DATA)/fv3jedi/akbk.nc4
+        gsi error covariance file: &gsiberr $(DATA)/berror/gsi-coeffs-gfs-global.nc4
+#       gsi error covariance file: &gsiberr $(DATA)/berror/global_berror.f77
+        gsi berror namelist file: &gsibnml $(DATA)/berror/gfs_gsi_global.nml
+        processor layout x direction: &layout_gsib_x 3
+        processor layout y direction: &layout_gsib_y 2
+        debugging mode: false
     saber outer blocks:
     - saber block name: gsi interpolation to model grid
-      input variables: *control_vars
-      output variables: *control_vars
       gsi akbk: *akbk
       gsi error covariance file: *gsiberr
       gsi berror namelist file: *gsibnml
@@ -27,7 +22,9 @@ components:
       debugging mode: false
     linear variable change:
       linear variable change name: Control2Analysis
-      input variables: *control_vars
+      input variables: &control_vars [eastward_wind,northward_wind,air_temperature,surface_pressure,
+                                      specific_humidity,cloud_liquid_ice,cloud_liquid_water,
+                                      mole_fraction_of_ozone_in_air]
       output variables: &3dvars_anal [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
   weight:
     value: 0.125

diff --git a/parm/atm/berror/staticb_gsibec.yaml b/parm/atm/berror/staticb_gsibec.yaml
@@ -2,21 +2,16 @@ covariance model: SABER
 full inverse: true
 saber central block:
   saber block name: gsi covariance
-  input variables: &control_vars [eastward_wind,northward_wind,air_temperature,surface_pressure,
-                           specific_humidity,cloud_liquid_ice,cloud_liquid_water,
-                           mole_fraction_of_ozone_in_air]
-  output variables: *control_vars
-  gsi akbk: &akbk $(DATA)/fv3jedi/akbk.nc4
-  gsi error covariance file: &gsiberr $(DATA)/berror/gsi-coeffs-gfs-global.nc4
-# gsi error covariance file: &gsiberr $(DATA)/berror/global_berror.f77
-  gsi berror namelist file: &gsibnml $(DATA)/berror/gfs_gsi_global.nml
-  processor layout x direction: &layout_gsib_x 3
-  processor layout y direction: &layout_gsib_y 2
-  debugging mode: false
+  read:
+    gsi akbk: &akbk $(DATA)/fv3jedi/akbk.nc4
+    gsi error covariance file: &gsiberr $(DATA)/berror/gsi-coeffs-gfs-global.nc4
+#   gsi error covariance file: &gsiberr $(DATA)/berror/global_berror.f77
+    gsi berror namelist file: &gsibnml $(DATA)/berror/gfs_gsi_global.nml
+    processor layout x direction: &layout_gsib_x 3
+    processor layout y direction: &layout_gsib_y 2
+    debugging mode: false
 saber outer blocks:
 - saber block name: gsi interpolation to model grid
-  input variables: *control_vars
-  output variables: *control_vars
   gsi akbk: *akbk
   gsi error covariance file: *gsiberr
   gsi berror namelist file: *gsibnml
@@ -25,5 +20,7 @@ saber outer blocks:
   debugging mode: false
 linear variable change:
   linear variable change name: Control2Analysis
-  input variables: *control_vars
+  input variables: &control_vars [eastward_wind,northward_wind,air_temperature,surface_pressure,
+                           specific_humidity,cloud_liquid_ice,cloud_liquid_water,
+                           mole_fraction_of_ozone_in_air]
   output variables: &3dvars_anal [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]