From 59ceb4505a759a926a7c4cc84662e5c9724af11a Mon Sep 17 00:00:00 2001 From: "russ.treadon" Date: Tue, 6 Sep 2022 16:00:45 +0000 Subject: [PATCH 1/4] Update to bufr/11.7.0, add safeguard to avoid out of bounds reference in read_prepbufr.f90 (#474) --- modulefiles/gsi_common.lua | 2 +- src/gsi/read_prepbufr.f90 | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modulefiles/gsi_common.lua b/modulefiles/gsi_common.lua index cd52ff877f..a3442bf134 100644 --- a/modulefiles/gsi_common.lua +++ b/modulefiles/gsi_common.lua @@ -4,7 +4,7 @@ Load common modules to build GSI on all machines local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4" -local bufr_ver=os.getenv("bufr_ver") or "11.5.0" +local bufr_ver=os.getenv("bufr_ver") or "11.7.0" local bacio_ver=os.getenv("bacio_ver") or "2.4.1" local w3emc_ver=os.getenv("w3emc_ver") or "2.9.1" local sp_ver=os.getenv("sp_ver") or "2.3.3" diff --git a/src/gsi/read_prepbufr.f90 b/src/gsi/read_prepbufr.f90 index 7c002d2720..f992ace329 100644 --- a/src/gsi/read_prepbufr.f90 +++ b/src/gsi/read_prepbufr.f90 @@ -3057,7 +3057,11 @@ subroutine read_prepbufr(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,& do k=1,ndata ikx=nint(cdata_out(10,k)) - itype=ictype(ikx) + if (ikx>0) then + itype=ictype(ikx) + else + itype=0 + endif if( itype ==230 .or. itype ==231 .or. itype ==233) then prest=r10*exp(cdata_out(4,k)) if (prest <100.0_r_kind) cycle From c330413ebe886ad7a75fe179854d807747b7c72b Mon Sep 17 00:00:00 2001 From: "russ.treadon" Date: Tue, 6 Sep 2022 20:59:06 +0000 Subject: [PATCH 2/4] Update gsi_wcoss2.lua PrgEnv_intel, craype, cray_mpich to NCO requested versions (#474) --- modulefiles/gsi_wcoss2.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modulefiles/gsi_wcoss2.lua b/modulefiles/gsi_wcoss2.lua index 138946252c..7402d335b3 100644 --- a/modulefiles/gsi_wcoss2.lua +++ b/modulefiles/gsi_wcoss2.lua @@ -1,10 +1,10 @@ help([[ ]]) -local PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0" +local PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.2.0" local intel_ver=os.getenv("intel_ver") or "19.1.3.304" -local craype_ver=os.getenv("craype_ver") or "2.7.8" -local cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7" +local craype_ver=os.getenv("craype_ver") or "2.7.13" +local cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.12" local cmake_ver= os.getenv("cmake_ver") or "3.20.2" local python_ver=os.getenv("python_ver") or "3.8.6" local prod_util_ver=os.getenv("prod_util_ver") or "2.0.10" From 314736c34121111101324bcaa748fd4df6b5157d Mon Sep 17 00:00:00 2001 From: "russ.treadon" Date: Wed, 7 Sep 2022 10:30:54 +0000 Subject: [PATCH 3/4] Fix iargc bug in getsigensmeanp_smooth_ncep.f90 (#474) --- .../src/getsigensmeanp_smooth.fd/getsigensmeanp_smooth_ncep.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/EnKF/gfs/src/getsigensmeanp_smooth.fd/getsigensmeanp_smooth_ncep.f90 b/util/EnKF/gfs/src/getsigensmeanp_smooth.fd/getsigensmeanp_smooth_ncep.f90 index 92ac388689..e58cbd8787 100644 --- a/util/EnKF/gfs/src/getsigensmeanp_smooth.fd/getsigensmeanp_smooth_ncep.f90 +++ b/util/EnKF/gfs/src/getsigensmeanp_smooth.fd/getsigensmeanp_smooth_ncep.f90 @@ -100,7 +100,7 @@ program getsigensmeanp_smooth ! if a 5th arg present, it's a filename to write out ensemble spread ! (only used for ncio) write_spread_ncio = .false. - if (iargc() > 5) then + if (iargc() > 4) then call getarg(5,filenameoutsprd) write_spread_ncio = .true. if (mype == 0) print *,'computing ensemble spread' From 0a289712e28fb672f2b3d8398733549be9c78aa3 Mon Sep 17 00:00:00 2001 From: "russ.treadon" Date: Wed, 7 Sep 2022 19:32:59 +0000 Subject: [PATCH 4/4] Revert update to PrgEnv_intel, craype, cray_mpich versions in gsi_wcoss2.lua (#474) --- modulefiles/gsi_wcoss2.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modulefiles/gsi_wcoss2.lua b/modulefiles/gsi_wcoss2.lua index 7402d335b3..138946252c 100644 --- a/modulefiles/gsi_wcoss2.lua +++ b/modulefiles/gsi_wcoss2.lua @@ -1,10 +1,10 @@ help([[ ]]) -local PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.2.0" +local PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0" local intel_ver=os.getenv("intel_ver") or "19.1.3.304" -local craype_ver=os.getenv("craype_ver") or "2.7.13" -local cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.12" +local craype_ver=os.getenv("craype_ver") or "2.7.8" +local cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7" local cmake_ver= os.getenv("cmake_ver") or "3.20.2" local python_ver=os.getenv("python_ver") or "3.8.6" local prod_util_ver=os.getenv("prod_util_ver") or "2.0.10"