Merge branch 'NOAA-EMC:develop' into IASI-NG_BUFR_change

NOAA-EMC · Dec 16, 2024 · 57d3e98 · 57d3e98
2 parents e44665c + 0921251
commit 57d3e98
Show file tree

Hide file tree

Showing 19 changed files with 1,227 additions and 192 deletions.
diff --git a/fix b/fix
diff --git a/modulefiles/gsi_acorn.intel.lua b/modulefiles/gsi_acorn.intel.lua
@@ -49,6 +49,6 @@ load(pathJoin("ncdiag",ncdiag_ver))
 append_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/modulefiles/compiler/intel/19.1.3.304")
 load(pathJoin("crtm", crtm_ver))
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20241022")
 
 whatis("Description: GSI environment on WCOSS2 Acorn")
diff --git a/modulefiles/gsi_gaeac5.intel.lua b/modulefiles/gsi_gaeac5.intel.lua
@@ -17,7 +17,7 @@ load(pathJoin("cmake", cmake_ver))
 load("gsi_common")
 load(pathJoin("prod_util", prod_util_ver))
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/gpfs/f5/ufs-ard/world-shared/GSI_data/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/gpfs/f5/ufs-ard/world-shared/GSI_data/fix/gsi/20241022")
 
 setenv("CC","cc")
 setenv("FC","ftn")

diff --git a/modulefiles/gsi_gaeac6.intel.lua b/modulefiles/gsi_gaeac6.intel.lua
@@ -18,7 +18,7 @@ load(pathJoin("cmake", cmake_ver))
 load("gsi_common")
 load(pathJoin("prod_util", prod_util_ver))
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/gpfs/f6/bil-fire8/world-shared/GSI_data/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/gpfs/f6/bil-fire8/world-shared/GSI_data/fix/gsi/20241022")
 
 setenv("CC","cc")
 setenv("FC","ftn")

diff --git a/modulefiles/gsi_hera.gnu.lua b/modulefiles/gsi_hera.gnu.lua
@@ -22,6 +22,6 @@ load("gsi_common")
 load(pathJoin("prod_util", prod_util_ver))
 load(pathJoin("openblas", openblas_ver))
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20241022")
 
 whatis("Description: GSI environment on Hera with GNU Compilers")
diff --git a/modulefiles/gsi_hera.intel.lua b/modulefiles/gsi_hera.intel.lua
@@ -20,6 +20,6 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20241022")
 
 whatis("Description: GSI environment on Hera with Intel Compilers")
diff --git a/modulefiles/gsi_hercules.intel.lua b/modulefiles/gsi_hercules.intel.lua
@@ -21,6 +21,6 @@ load("intel-oneapi-mkl/2022.2.1")
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20241022")
 
 whatis("Description: GSI environment on Hercules with Intel Compilers")
diff --git a/modulefiles/gsi_jet.intel.lua b/modulefiles/gsi_jet.intel.lua
@@ -20,6 +20,6 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-axSSE4.2,AVX,CORE-AVX2")
 pushenv("FFLAGS", "-axSSE4.2,AVX,CORE-AVX2")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/lfs5/HFIP/hfv3gfs/glopara/FIX/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/lfs5/HFIP/hfv3gfs/glopara/FIX/fix/gsi/20241022")
 
 whatis("Description: GSI environment on Jet with Intel Compilers")
diff --git a/modulefiles/gsi_noaacloud.intel.lua b/modulefiles/gsi_noaacloud.intel.lua
@@ -20,6 +20,6 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/contrib/Wei.Huang/data/hack-orion/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/contrib/Wei.Huang/data/hack-orion/fix/gsi/20241022")
 
 whatis("Description: GSI environment on NOAA Cloud with Intel Compilers")
diff --git a/modulefiles/gsi_orion.intel.lua b/modulefiles/gsi_orion.intel.lua
@@ -21,6 +21,6 @@ load("intel-oneapi-mkl/2022.2.1")
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20241022")
 
 whatis("Description: GSI environment on Orion with Intel Compilers")
diff --git a/modulefiles/gsi_s4.intel.lua b/modulefiles/gsi_s4.intel.lua
@@ -20,6 +20,6 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-march=ivybridge")
 pushenv("FFLAGS", "-march=ivybridge")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/data/prod/glopara/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/data/prod/glopara/fix/gsi/20241022")
 
 whatis("Description: GSI environment on S4 with Intel Compilers")
diff --git a/modulefiles/gsi_wcoss2.intel.lua b/modulefiles/gsi_wcoss2.intel.lua
@@ -46,6 +46,6 @@ load(pathJoin("ncio", ncio_ver))
 load(pathJoin("crtm", crtm_ver))
 load(pathJoin("ncdiag",ncdiag_ver))
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20240208")
+pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20241022")
 
 whatis("Description: GSI environment on WCOSS2")
diff --git a/src/gsi/clw_mod.f90 b/src/gsi/clw_mod.f90
@@ -1961,6 +1961,7 @@ subroutine ret_amsua(tb_obs,nchanl,tsavg5,zasat,clwp_amsua,ierrret,scat)
 ! Declare local variables 
   real(r_kind) :: d0, d1, d2, coszat
 ! real(r_kind) :: c0, c1, c2
+  real(r_kind) :: tb890 = zero
 
 
   coszat=cos(zasat)
@@ -1979,9 +1980,18 @@ subroutine ret_amsua(tb_obs,nchanl,tsavg5,zasat,clwp_amsua,ierrret,scat)
   endif
 
   if (present(scat)) then
-      scat=-113.2_r_kind+(2.41_r_kind-0.0049_r_kind*tb_obs(1))*tb_obs(1)  &
-           +0.454_r_kind*tb_obs(2)-tb_obs(15)
-      scat=max(zero,scat)
+     if (nchanl == 15) then
+!       AMSU-A
+        tb890 = tb_obs(15)
+     else if (nchanl == 22) then
+!       ATMS
+        tb890 = tb_obs(16)
+     endif
+     if (tb890 > zero) then
+        scat=-113.2_r_kind+(2.41_r_kind-0.0049_r_kind*tb_obs(1))*tb_obs(1)  &
+             +0.454_r_kind*tb_obs(2)-tb890
+     endif
+     scat=max(zero,scat)
   end if
 
 end subroutine ret_amsua

diff --git a/src/gsi/glbsoi.f90 b/src/gsi/glbsoi.f90
@@ -161,7 +161,6 @@ subroutine glbsoi
   use m_prad, only: prad_updatePredx    ! was -- prad_bias()
   use m_obsdiags, only: obsdiags_write
   use gsi_io,only: verbose
-  use m_berror_stats,only: inquire_berror
 
   implicit none
 
@@ -257,8 +256,6 @@ subroutine glbsoi
         end if
      end if
   else
-     lunit=22
-     call inquire_berror(lunit,mype)
      call create_balance_vars
      if(anisotropic) then
         call create_anberror_vars(mype)

diff --git a/src/gsi/gsi_files.cmake b/src/gsi/gsi_files.cmake
@@ -357,6 +357,7 @@ m_lightNode.F90
 m_lwcpNode.F90
 m_mitmNode.F90
 m_mxtmNode.F90
+m_nc_berror.f90
 m_o3lNode.F90
 m_obsLList.F90
 m_obsNode.F90
+126 −0		global_anavinfo.l31.txt
+32 −0		global_hybens_info.l31.txt
+6 −0		gsi_binary_files.cmake