Merge branch 'NOAA-EMC:develop' into develop

ADCollard · May 7, 2024 · 88aaa63 · 88aaa63
2 parents b401c47 + 38bdb95
commit 88aaa63
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 8 deletions.
diff --git a/fix b/fix
diff --git a/modulefiles/gsi_jet.intel.lua b/modulefiles/gsi_jet.intel.lua
@@ -1,7 +1,7 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
 
 local python_ver=os.getenv("python_ver") or "3.11.6"
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"

diff --git a/modulefiles/gsi_noaacloud.intel.lua b/modulefiles/gsi_noaacloud.intel.lua
@@ -0,0 +1,25 @@
+help([[
+]])
+
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+
+local python_ver=os.getenv("python_ver") or "3.10.13"
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
+
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("python", python_ver))
+load(pathJoin("cmake", cmake_ver))
+
+load("gsi_common")
+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")
+
+whatis("Description: GSI environment on NOAA Cloud with Intel Compilers")
diff --git a/regression/global_4denvar.sh b/regression/global_4denvar.sh
@@ -128,6 +128,8 @@ errtable=$fixgsi/prepobs_errtable.global
 aeroinfo=$fixgsi/global_aeroinfo.txt
 atmsbeaminfo=$fixgsi/atms_beamwidth.txt
 cloudyinfo=$fixgsi/cloudy_radiance_info.txt
+cris_clddet=$fixgsi/CRIS_CLDDET.NL
+iasi_clddet=$fixgsi/IASI_CLDDET.NL
 
 emiscoef_IRwater=$fixcrtm/Nalli.IRwater.EmisCoeff.bin
 emiscoef_IRice=$fixcrtm/NPOESS.IRice.EmisCoeff.bin
@@ -169,6 +171,8 @@ $ncp $errtable ./errtable
 $ncp $aeroinfo ./aeroinfo
 $ncp $atmsbeaminfo ./atms_beamwidth.txt
 $ncp $cloudyinfo ./cloudy_radiance_info.txt
+$ncp $cris_clddet ./CRIS_CLDDET.NL
+$ncp $iasi_clddet ./IASI_CLDDET.NL
 
 $ncp $bufrtable ./prepobs_prep.bufrtable
 $ncp $bftab_sst ./bftab_sstphr

diff --git a/regression/regression_namelists.sh b/regression/regression_namelists.sh
@@ -68,7 +68,7 @@ export gsi_namelist="
  dfact=0.75,dfact1=3.0,noiqc=.true.,oberrflg=.false.,c_varqc=0.04,
  use_poq7=.true.,qc_noirjaco3_pole=.true.,vqc=.false.,nvqc=.true.,hub_norm=.true.,
  aircraft_t_bc=.true.,biaspredt=1.0e5,upd_aircraft=.true.,cleanup_tail=.true.,
- tcp_width=70.0,tcp_ermax=7.35,
+ tcp_width=70.0,tcp_ermax=7.35,cris_cads=.true.,iasi_cads=.true.,
  $OBSQC
  /
  &OBS_INPUT

diff --git a/src/gsi/correlated_obsmod.F90 b/src/gsi/correlated_obsmod.F90
@@ -961,14 +961,18 @@ subroutine upd_varch_
  enddo
  nchanl1=jc
 
- if(nchanl1==0) call die(myname_,' improperly set GSI_BundleErrorCov')
  if(.not.amiset_(GSI_BundleErrorCov(itbl))) then 
- if (iamroot_) write(6,*) 'WARNING: Error Covariance not set for ',trim(idnames(itbl))
+ if (iamroot_) write(6,*) trim(myname_), ' WARNING: Error Covariance not set for ',trim(idnames(itbl))
  cycle read_tab
  endif
 
  nch_active=GSI_BundleErrorCov(itbl)%nch_active
- if(nch_active<0) return
+ if(nch_active<0) then
+ if (iamroot_) write(6,*) trim(myname_), ' WARNING: No active channels for ',trim(idnames(itbl))
+ return
+ endif
+
+ if(nchanl1==0) call die(myname_,' improperly set GSI_BundleErrorCov') 
 
  if(GMAO_ObsErrorCov)then
  do jj=1,nch_active

diff --git a/src/gsi/read_radar.f90 b/src/gsi/read_radar.f90
@@ -907,6 +907,7 @@ subroutine read_radar(nread,ndata,nodata,infile,lunout,obstype,twind,sis,hgtl_fu
  end do superobs
 
  close(lnbufr) ! A simple unformatted fortran file should not be mixed with a bufr I/O
+ nread=nsuper2_kept
 
  LEVEL_TWO_READ_2: if(loop==0 .and. sis=='l2rw') then 
  write(6,*)'READ_RADAR: ',trim(outmessage),' reached eof on 2/2.5/3 superob radar file'
@@ -2176,7 +2177,6 @@ subroutine read_radar(nread,ndata,nodata,infile,lunout,obstype,twind,sis,hgtl_fu
  ibadstaheight=0
  notgood=0
  notgood0=0
- nread=0
  ntdrvr_in=0
  ntdrvr_kept=0
  ntdrvr_thin1=0
@@ -2522,7 +2522,7 @@ subroutine read_radar(nread,ndata,nodata,infile,lunout,obstype,twind,sis,hgtl_fu
  end do ! end of loop, reading TDR so data files
  close(lnbufr)
 
- else
+ else if (trim(infile) == 'tldplrbufr' ) then
 
  nswptype=0
  nmrecs=0

diff --git a/ush/module-setup.sh b/ush/module-setup.sh
@@ -75,6 +75,10 @@ elif [[ $MACHINE_ID = discover* ]]; then
  export PATH=$PATH:$SPACK_ROOT/bin
  . $SPACK_ROOT/share/spack/setup-env.sh
 
+elif [[ $MACHINE_ID = noaacloud* ]]; then
+ # We are on NOAA Cloud
+ module purge
+
 else
  echo WARNING: UNKNOWN PLATFORM 1>&2
 fi