Merge remote-tracking branch 'emc/develop' into feature/wcoss2_ss

DavidHuber-NOAA · Dec 24, 2024 · 75e722a · 75e722a
2 parents e50018f + 737c6b8
commit 75e722a
Show file tree

Hide file tree

Showing 35 changed files with 2,282 additions and 235 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
@@ -18,6 +18,6 @@ load("gsi_common")
 load(pathJoin("prod_util", prod_util_ver))
 load(pathJoin("cmake", cmake_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/regression/global_enkf.sh b/regression/global_enkf.sh
@@ -90,6 +90,7 @@ export write_spread_diag=${write_spread_diag:-".false."}
 export cnvw_option=${cnvw_option:-".false."}
 export netcdf_diag=${netcdf_diag:-".true."}
 export modelspace_vloc=${modelspace_vloc:-".true."} # if true, 'vlocal_eig.dat' is needed
+export taperanalperts=${taperanalperts:-".true."}
 export IAUFHRS_ENKF=${IAUFHRS_ENKF:-'3,6,9'}
 export DO_CALC_INCREMENT=${DO_CALC_INCREMENT:-"NO"}
 export INCREMENTS_TO_ZERO="'liq_wat_inc','icmr_inc','rwmr_inc','snmr_inc','grle_inc'"

diff --git a/regression/regression_namelists.sh b/regression/regression_namelists.sh
@@ -967,7 +967,7 @@ export gsi_namelist="
   univaroz=.false.,adp_anglebc=.true.,angord=4,use_edges=.false.,emiss_bc=.true.,
   letkf_flag=${letkf_flag},nobsl_max=${nobsl_max},denkf=${denkf},getkf=${getkf}.,
   nhr_anal=${IAUFHRS_ENKF},nhr_state=${IAUFHRS_ENKF},
-  lobsdiag_forenkf=$lobsdiag_forenkf,
+  lobsdiag_forenkf=$lobsdiag_forenkf,taperanalperts=${taperanalperts},
   write_spread_diag=$write_spread_diag,
   modelspace_vloc=$modelspace_vloc,
   use_correlated_oberrs=${use_correlated_oberrs},

diff --git a/regression/regression_param.sh b/regression/regression_param.sh
@@ -109,8 +109,8 @@ case $regtest in
            topts[1]="0:05:00" ; popts[1]="40/3/" ; ropts[1]="/1"
            topts[2]="0:05:00" ; popts[2]="40/5/" ; ropts[2]="/2"
         elif [[ "$machine" = "Jet" ]]; then
-           topts[1]="0:15:00" ; popts[1]="5/4/"  ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="10/4/"  ; ropts[2]="/1"
+           topts[1]="0:15:00" ; popts[1]="40/3/"  ; ropts[1]="/1"
+           topts[2]="0:15:00" ; popts[2]="40/5/"  ; ropts[2]="/1"
         elif [[ "$machine" = "gaeac5" ]]; then
            topts[1]="0:15:00" ; popts[1]="40/3/"  ; ropts[1]="/1"
            topts[2]="0:15:00" ; popts[2]="40/5/"  ; ropts[2]="/1"

diff --git a/src/enkf/enkf_files.cmake b/src/enkf/enkf_files.cmake
@@ -61,5 +61,3 @@ list(APPEND EnKF_SRC_FV3REG
 #Unused files
 #specmod_shtns.f90 -- This is a faster alternative to specmod.f90
 #specmod_splib.f90 -- This is a copy of specmod.f90
-#observer_nmmb.f90 -- This is soft-linked to observer_reg.f90
-#observer_wrf.f90  -- This is soft-linked to observer_reg.f90
diff --git a/src/enkf/observer_nmmb.f90 b/src/enkf/observer_nmmb.f90
diff --git a/src/enkf/observer_wrf.f90 b/src/enkf/observer_wrf.f90
diff --git a/src/gsi/calc_fov_crosstrk.f90 b/src/gsi/calc_fov_crosstrk.f90
@@ -1289,6 +1289,8 @@ subroutine get_sat_height(satid, height, valid)
        height=840._r_kind
     case('n20', 'n21', 'n22', 'n23')
        height=840._r_kind
+    case('metop-sg-a1', 'metop-sg-a2', 'metop-sg-a3') 
+       height=840._r_kind
     case default
        write(6,*) 'GET_SAT_HEIGHT: ERROR, unrecognized satellite id: ', trim(satid)
        valid=.false.

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/crtm_interface.f90 b/src/gsi/crtm_interface.f90
@@ -667,6 +667,25 @@ subroutine init_crtm(init_pass,mype_diaghdr,mype,nchanl,nreal,isis,obstype,radmo
    error_status = crtm_channelinfo_subset(channelinfo(1), &
         channel_subset = nuchan(subset_start:subset_end))
 
+! TODO The CRTM spectral coefficient files have the instrument name in the beginning of the file.  The current iasi-ng coefficient
+! TODO file contains '999' instead of the instrument name.  When the final coefficient file is built, it will have 'iasi-ng'.
+! TODO  else if (channelinfo(1)%sensor_id(1:7) == 'iasi-ng' .AND. isis(1:7) == 'iasi-ng') then
+! TODO when this file exists, use the above line.
+else if (channelinfo(1)%sensor_id(1:3) == '999' .AND. isis(1:7) == 'iasi-ng') then
+! TODO and remove the above line.
+   sensorindex = 1
+   subset_start = 0
+   subset_end = 0
+   do k=1, jpch_rad
+     if (isis == nusis(k)) then
+       if (subset_start == 0) subset_start = k
+       subset_end = k
+     endif
+   end do
+
+   error_status = crtm_channelinfo_subset(channelinfo(1), &
+        channel_subset = nuchan(subset_start:subset_end))
+
 else if (channelinfo(1)%sensor_id(1:4) == 'iasi' .AND. isis(1:4) == 'iasi') then
    sensorindex = 1
    subset_start = 0

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
@@ -497,6 +498,7 @@ read_goesndr.f90
 read_gps.f90
 read_guess.F90
 read_iasi.f90
+read_iasing.f90
 read_l2bufr_mod.f90
 read_lag.f90
 read_lidar.f90

diff --git a/src/gsi/gsi_obOperTypeManager.F90 b/src/gsi/gsi_obOperTypeManager.F90
@@ -327,6 +327,7 @@ function dtype2index_(dtype) result(index_)
     case("hsb"    ); index_= iobOper_rad
         !
     case("iasi"   ); index_= iobOper_rad
+    case("iasi-ng"); index_= iobOper_rad
     case("cris"   ); index_= iobOper_rad
     case("cris-fsr"  ); index_= iobOper_rad
         !
@@ -357,6 +358,7 @@ function dtype2index_(dtype) result(index_)
         !
     case("avhrr_navy"); index_= iobOper_rad
     case("avhrr"  ); index_= iobOper_rad
+    case("metimage" ); index_= iobOper_rad
     case("viirs-m"  ); index_= iobOper_rad
 
   case("tcp"    ,"[tcpoper]"    ); index_= iobOper_tcp

diff --git a/src/gsi/gsimod.F90 b/src/gsi/gsimod.F90
@@ -94,7 +94,7 @@ module gsimod
       init_qcvars,vadfile,noiqc,c_varqc,gps_jacqc,qc_noirjaco3,qc_noirjaco3_pole,&
       buddycheck_t,buddydiag_save,njqc,vqc,nvqc,hub_norm,vadwnd_l2rw_qc, &
       pvis,pcldch,scale_cv,estvisoe,estcldchoe,vis_thres,cldch_thres,cao_check, &
-      cris_cads, iasi_cads, airs_cads
+      cris_cads, iasi_cads, iasing_cads, airs_cads
   use qcmod, only: troflg,lat_c,nrand
   use cads, only: M__Sensor,N__Num_Bands,N__GradChkInterval,N__Band_Size,N__Bands,N__Window_Width, &
       N__Window_Bounds,R__BT_Threshold,R__Grad_Threshold,R__Window_Grad_Threshold, L__Do_Quick_Exit, &
@@ -1064,9 +1064,10 @@ module gsimod
 !
 !     Flags to use the new IR cloud detection routine.  Flag must be set to true to use the new routine.  The default
 !     (no flag or .false.) will use the default.
-!     airs_cads: use the clod and aerosool detection software for the AIRS instrument
-!     cris_cads: use the cloud and aerosol detection software for CrIS instruments
-!     iasi_cads: use the cloud and aerosol detection software for IASI instruments
+!     airs_cads  : use the cloud and aerosol detection software for AIRS instrument
+!     cris_cads  : use the cloud and aerosol detection software for CrIS instruments
+!     iasi_cads  : use the cloud and aerosol detection software for IASI instruments
+!     iasing_cads: use the cloud and aerosol detection software for IASI-NG instruments
 !     
 
   namelist/obsqc/dfact,dfact1,erradar_inflate,tdrerr_inflate,oberrflg,&
@@ -1078,7 +1079,7 @@ module gsimod
        q_doe_a_136,q_doe_a_137,q_doe_b_136,q_doe_b_137, &
        t_doe_a_136,t_doe_a_137,t_doe_b_136,t_doe_b_137, &
        uv_doe_a_236,uv_doe_a_237,uv_doe_a_213,uv_doe_b_236,uv_doe_b_237,uv_doe_b_213, &
-       vad_near_analtime,airs_cads,cris_cads,iasi_cads
+       vad_near_analtime,airs_cads,cris_cads,iasi_cads, iasing_cads
 
 ! OBS_INPUT (controls input data):
 !      dmesh(max(dthin))- thinning mesh for each group
@@ -2320,7 +2321,7 @@ subroutine gsimain_initialize
      endif
      do i=1,ndat
         write(6,401)dfile(i),dtype(i),dplat(i),dsis(i),dval(i),dthin(i),dsfcalc(i),time_window(i)
- 401    format(1x,a20,1x,a10,1x,a11,1x,a20,1x,f10.2,1x,I3,1x,I3,1x,f10.2)
+ 401    format(1x,a20,1x,a10,1x,a12,1x,a20,1x,f10.2,1x,I3,1x,I3,1x,f10.2)
      end do
      write(6,superob_radar)
      write(6,lag_data)
+126 −0		global_anavinfo.l31.txt
+32 −0		global_hybens_info.l31.txt
+6 −0		gsi_binary_files.cmake