updates for intel2022 compiler (NOAA-EMC#447)

RussTreadon-NOAA · Feb 16, 2023 · 3840fda · 3840fda
1 parent 8857995
commit 3840fda
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/modulefiles/gsi_common.lua b/modulefiles/gsi_common.lua
@@ -11,7 +11,7 @@ local sp_ver=os.getenv("sp_ver") or "2.3.3"
 local ip_ver=os.getenv("ip_ver") or "3.3.3"
 local sigio_ver=os.getenv("sigio_ver") or "2.3.2"
 local sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
-local nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
+local nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
 local wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
 local ncio_ver=os.getenv("ncio_ver") or "1.1.2"
 local crtm_ver=os.getenv("crtm_ver") or "2.3.0"

diff --git a/modulefiles/gsi_hera.intel.lua b/modulefiles/gsi_hera.intel.lua
@@ -4,8 +4,8 @@ help([[
 prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
 
 local hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.5.274"
-local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.0.4"
+local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2"
+local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
 local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
 local anaconda_ver=os.getenv("anaconda_ver") or "2.3.0"
 local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"

diff --git a/modulefiles/gsi_orion.lua b/modulefiles/gsi_orion.lua
@@ -4,8 +4,8 @@ help([[
 prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
 
 local hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2018.4"
-local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.4"
+local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2"
+local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2022.1.2"
 local cmake_ver=os.getenv("cmake_ver") or "3.22.1"
 local python_ver=os.getenv("python_ver") or "3.7.5"
 local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"

diff --git a/src/gsi/setuprad.f90 b/src/gsi/setuprad.f90
@@ -551,10 +551,12 @@ subroutine setuprad(obsLL,odiagLL,lunin,mype,aivals,stats,nchanl,nreal,nobs,&
         end if
 
 !       Load channel numbers into local array based on satellite type
+        if (iuse_rad(j)==4) then
+           predx(:,j)=zero
+        endif
 
         ich(jc)=j
         do i=1,npred
-           if (iuse_rad(j)==4) predx(i,j)=zero
            predchan(i,jc)=predx(i,j)
         end do
 !