From aa08628661c1e0d4c4bc0a2077b60cc9374b6814 Mon Sep 17 00:00:00 2001
From: Gang Zhao <gang.zhao@noaa.gov>
Date: Thu, 21 Sep 2023 14:31:31 +0000
Subject: [PATCH] minor modifications for analysis of significant wave height
 based on code review.

---
 src/gsi/gsi_rfv3io_mod.f90     | 19 +++++++++----------
 src/gsi/gsimain.f90            |  1 -
 src/gsi/m_berror_stats_reg.f90 |  1 -
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/gsi/gsi_rfv3io_mod.f90 b/src/gsi/gsi_rfv3io_mod.f90
index f2c50cde66..c1b3eebdf0 100644
--- a/src/gsi/gsi_rfv3io_mod.f90
+++ b/src/gsi/gsi_rfv3io_mod.f90
@@ -1824,6 +1824,7 @@ subroutine gsi_fv3ncdf2d_read(fv3filenamegin,it,ges_z,ges_t2m,ges_q2m,ges_howv)
 !$$$  end documentation block
     use kinds, only: r_kind,i_kind
     use mpimod, only: ierror,mpi_comm_world,npe,mpi_rtype,mype,mpi_itype
+    use mpeu_util, only: die
     use guess_grids, only: fact10,soil_type,veg_frac,veg_type,sfc_rough, &
          sfct,sno,soil_temp,soil_moi,isli
     use gridmod, only: lat2,lon2,itotsub,ijn_s
@@ -1858,7 +1859,7 @@ subroutine gsi_fv3ncdf2d_read(fv3filenamegin,it,ges_z,ges_t2m,ges_q2m,ges_howv)
       character(len=:),allocatable :: sfcdata   !='fv3_sfcdata'
       character(len=:),allocatable :: dynvars   !='fv3_dynvars'
 ! for checking the existence of howv in firstguess file
-    integer(i_kind) id_howv, iret_howv
+    integer(i_kind) id_howv
     integer(i_kind) iret_bcast
 
 ! for io_layout > 1
@@ -1910,19 +1911,17 @@ subroutine gsi_fv3ncdf2d_read(fv3filenamegin,it,ges_z,ges_t2m,ges_q2m,ges_howv)
 !      if howv is set in anavinfo (as i_howv_3dda=1), then check its existence in firstguess,
 !      but if it is not found in firstguess, then stop GSI run and set i_howv_3dda = 0.
        if ( i_howv_3dda == 1 ) then
-         iret_howv = nf90_inq_varid(gfile_loc,'howv',id_howv)
-         if ( iret_howv /= nf90_noerr ) then
-           iret_howv = nf90_inq_varid(gfile_loc,'HOWV',id_howv) ! double check with name in uppercase
+         iret = nf90_inq_varid(gfile_loc,'howv',id_howv)
+         if ( iret /= nf90_noerr ) then
+           iret = nf90_inq_varid(gfile_loc,'HOWV',id_howv) ! double check with name in uppercase
          end if
-         if ( iret_howv /= nf90_noerr ) then
+         if ( iret /= nf90_noerr ) then
            i_howv_3dda = 0                ! howv does not exist in firstguess, then stop GSI run.
-           write(6,'(1x,A,1x,A,1x,A,1x,I4,1x,A,1x,I4.4,A)') 'subroutine gsi_fv3ncdf2d_read:: howv is NOT found in firstguess ', &
-             trim(sfcdata), ', iret = ',iret_howv, ' (on pe: ', mype,'). Stop running GSI!!!!'
-           call stop2(345)
+           call die('gsi_fv3ncdf2d_read','Warning: CANNOT find howv in firstguess, aborting..., iret = ', iret)
          else
            i_howv_3dda = 1                ! howv does exist in firstguess, running analysis with howv 
-           write(6,'(1x,A,1x,A,1x,A,1x,I4,1x,I4,1x,A,1x,I4.4,A)') 'subroutine gsi_fv3ncdf2d_read:: Found howv in firstguess ',  &
-             trim(sfcdata), ', iret, varid = ',iret_howv, id_howv,' (on pe: ', mype,').'
+           write(6,'(1x,A,1x,A,1x,A,1x,I4,1x,I4,1x,A,1x,I4.4,A)') 'gsi_fv3ncdf2d_read:: Found howv in firstguess ',  &
+             trim(sfcdata), ', iret, varid = ',iret, id_howv,' (on pe: ', mype,').'
          end if
        end if
 
diff --git a/src/gsi/gsimain.f90 b/src/gsi/gsimain.f90
index 7be4e3a646..5eaa38286a 100644
--- a/src/gsi/gsimain.f90
+++ b/src/gsi/gsimain.f90
@@ -530,7 +530,6 @@ program gsi
 !          = 342 - setuplight: failure to allocate obsdiags
 !          = 343 - setuplight: failure to allocate obsdiags
 !          = 344 - setuplight: index error
-!          = 345 - gsi_fv3ncdf2d_read: problem in reading variable in 2D firstguess of FV3-LAM
 !          = 899 - foto no longer available
 !
 !
diff --git a/src/gsi/m_berror_stats_reg.f90 b/src/gsi/m_berror_stats_reg.f90
index 5c7ff4ed45..601339e1ac 100644
--- a/src/gsi/m_berror_stats_reg.f90
+++ b/src/gsi/m_berror_stats_reg.f90
@@ -313,7 +313,6 @@ subroutine berror_read_wgt_reg(msig,mlat,corz,corp,hwll,hwllp,vz,rlsig,varq,qopt
       use mpeu_util,only: getindex
       use radiance_mod, only: icloud_cv,n_clouds_fwd,cloud_names_fwd
       use chemmod, only: berror_fv3_cmaq_regional
-      use hybrid_ensemble_parameters, only: l_hyb_ens
 
       implicit none