Edits for control experiments (sondes) and assim of 2m obs with soil …

…increments.

modulefiles/gsi_common.lua

@@ -11,10 +11,10 @@ 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.4.0"
+local crtm_ver=os.getenv("crtm_ver") or "2.3.0"
 local ncdiag_ver=os.getenv("ncdiag_ver") or "1.0.0"
 
 load(pathJoin("netcdf", netcdf_ver))

modulefiles/gsi_hera.intel.lua

@@ -3,9 +3,9 @@ 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_ver=os.getenv("hpc_ver") or "1.2.0"
+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"
@@ -23,9 +23,6 @@ load("gsi_common")
 
 load(pathJoin("prod_util", prod_util_ver))
 
-pushenv("CFLAGS", "-xHOST")
-pushenv("FFLAGS", "-xHOST")
-
 pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20221128")
 
 whatis("Description: GSI environment on Hera with Intel Compilers")

regression/regression_var.sh

@@ -4,6 +4,12 @@
 #  To run with hybrid ensemble option on, change HYBENS_GLOBAL and/or HYBENS_REGIONAL from "false" to "true".
 #  These are located at the end of this script.
 
+export ptmp="/scratch2/BMC/gsienkf/Clara.Draper/tmp/"
+export group="gsienkf"
+export accnt="gsienkf"
+
+
+
 if [ "$#" = 7 ] ; then
   export basedir=$1
   export builddir=$2
@@ -21,8 +27,8 @@ if [ "$#" = 7 ] ; then
   export ptmpName="${dir_root##*/}"
 else
   # Name of the branch being tested
-  updat="XXXXXXXX"
-  contrl="XXXXXXXX"
+  updat="mine"
+  contrl="develop"
   export cmaketest="false"
   export clean="false"
   export ptmpName=""

src/gsi/convinfo.f90

@@ -279,7 +279,8 @@ subroutine convinfo_read
                index_sub(nc)=index_sub(nc-1)+1
             endif
           endif
-       if(print_verbose .and. mype == 0)write(6,1031)ioctype(nc),ictype(nc),icsubtype(nc),icuse(nc),ctwind(nc),ncnumgrp(nc), &
+      ! if(print_verbose .and. mype == 0)
+          write(6,1031)ioctype(nc),ictype(nc),icsubtype(nc),icuse(nc),ctwind(nc),ncnumgrp(nc), &
           ncgroup(nc),ncmiter(nc),cgross(nc),cermax(nc),cermin(nc),cvar_b(nc),cvar_pg(nc), &
           ithin_conv(nc),rmesh_conv(nc),pmesh_conv(nc),idum,pmot_conv(nc),ptime_conv(nc),index_sub(nc),ibeta(nc),ikapa(nc)
 1031   format('READ_CONVINFO: ',a7,1x,i3,1x,i4,1x,i2,1x,g13.6,1x,3(I3,1x),5g13.6,i5,2g13.6,i5,2g13.6,3i5)

src/gsi/read_prepbufr.f90

@@ -264,7 +264,7 @@ subroutine read_prepbufr(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
   logical tob,qob,uvob,spdob,sstob,pwob,psob,gustob,visob,tdob,mxtmob,mitmob,pmob,howvob,cldchob
   logical metarcldobs,goesctpobs,tcamtob,lcbasob
   logical outside,driftl,convobs,inflate_error
-  logical sfctype, global_2m_land
+  logical sfctype, global_2m_land, obs_is_sonde
   logical luse,ithinp,windcorr
   logical patch_fog
   logical aircraftset,aircraftobs,aircraftobst,aircrafttype
@@ -1618,6 +1618,7 @@ subroutine read_prepbufr(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
 !          187, 181, and 183 are the screen-level obs over land
 !          note: don't need the hofx_2m_sfcfile if set usage in convinfo, and qm updated in the input file
            global_2m_land = ( (kx==187 .or. kx==181 .or. kx==183) .and. hofx_2m_sfcfile )
+           obs_is_sonde =  ( kx==120 .or. kx==132 .or. kx == 133) ! 133 is aircraft
 
 !          If temperature ob, extract information regarding virtual
 !          versus sensible temperature
@@ -1929,18 +1930,23 @@ subroutine read_prepbufr(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
                      pqm(k)=2 ! otherwise, type 183 will be discarded.
                      qm=2
                      tqm(k)=2
-                     if (kx==187) obserr(3,k)=2.2
-                     if (kx==181) obserr(3,k)=1.5
-                     if (kx==183) obserr(3,k)=2.6
+                     if (kx==187) obserr(3,k)=2.0
+                     if (kx==181) obserr(3,k)=2.0
+                     if (kx==183) obserr(3,k)=2.0
                 endif
                 if (qob .and. qm == 9 ) then 
                      qm = 2
                      ! qob err specified as fraction of qsat, multiplied by 10.
                      if (kx==187) obserr(2,k)=1.0
                      if (kx==181) obserr(2,k)=1.0
                      if (kx==183) obserr(2,k)=1.0
+                   !if (tqm(k) < lim_tqm) write (6,*) 'CSD - have q, no t'
+                endif
+              endif
+              if (obs_is_sonde .and. qob ) then 
+                if(qm < lim_qm )  then
+                   obserr(2,k)=1.0
                 endif
-
               endif
 !             Set usage variable              
               usage = zero

ush/build.sh

@@ -5,6 +5,9 @@ set -eux
 # Get the root of the cloned GSI directory
 readonly DIR_ROOT=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )/.." && pwd -P)
 
+BUILD_CLEAN="NO"
+#BUILD_TYPE="Debug"
+
 # User Options
 BUILD_TYPE=${BUILD_TYPE:-"Release"}
 CMAKE_OPTS=${CMAKE_OPTS:-}