Correct name for some of the hydrometeors (#939)

* proper names for qr/qs * Thx Fabio for reminding me of qg/qh
JCSDA · Sep 19, 2024 · 45150c7 · 45150c7
1 parent bba6f7e
commit 45150c7
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/saber/gsi/covariance/gsi_covariance_mod.f90 b/src/saber/gsi/covariance/gsi_covariance_mod.f90
@@ -650,14 +650,26 @@ subroutine get_rank2_(rank2,fields,vname,ier)
       ier=0
    endif
    if (trim(vname) == 'qr') then
-      if (.not.fields%has('cloud_liquid_rain')) return
-      afield = fields%field('cloud_liquid_rain')
+      if (.not.fields%has('rain_water')) return
+      afield = fields%field('rain_water')
       call afield%data(rank2)
       ier=0
    endif
    if (trim(vname) == 'qs') then
-      if (.not.fields%has('cloud_liquid_snow')) return
-      afield = fields%field('cloud_liquid_snow')
+      if (.not.fields%has('snow_water')) return
+      afield = fields%field('snow_water')
+      call afield%data(rank2)
+      ier=0
+   endif
+   if (trim(vname) == 'qg') then
+      if (.not.fields%has('graupel')) return
+      afield = fields%field('graupel')
+      call afield%data(rank2)
+      ier=0
+   endif
+   if (trim(vname) == 'qh') then
+      if (.not.fields%has('hail')) return
+      afield = fields%field('hail')
       call afield%data(rank2)
       ier=0
    endif