Merge branch 'release-v4.1'

This merge finalizes the v4.1 release by adding changes from the 'release-v4.1'
branch onto the 'master' branch.

* release-v4.1:
  Remove "(PRE-RELEASE)" from the version number in the README file
  Add 'modis_15s_lake' option for LANDUSEF data in GEOGRID.TBL.ARW
  eliminate the output=no option to the QNC (cloud drop number concentration) variable
  Update grib tables to add new HRRR fields. Ammend one varaible name.
  Leave old code in g2 library's intmath.f code with comment
  Fix string comparison
  Add configuration stanza for POWER running Linux with XL compilers
  Fix mismatch integer kind in IAND intrinsic calls in g2 library
  Update comments in Vtable.GFS. Add history of important GFS changes.
  Adjust pressure-level RH from GEFS as is done for GFS, CDAS, and ECMWF.
  Add LOGSFP entry to METGRID.TBL.ARW
  Update version number to 4.1
  Change Vtable.GFS so the default sea level pressure is MSLET

README

@@ -1,4 +1,4 @@
-WRF Pre-Processing System Version 4.0.3
+WRF Pre-Processing System Version 4.1
 
 http://www2.mmm.ucar.edu/wrf/users/
 

arch/configure.defaults

@@ -1,3 +1,25 @@
+########################################################################################################################
+#ARCH   Linux ppc64le POWER Linux, XL compiler # serial serial_NO_GRIB2 dmpar dmpar_NO_GRIB2
+#
+COMPRESSION_LIBS    = CONFIGURE_COMP_L
+COMPRESSION_INC     = CONFIGURE_COMP_I
+FDEFS               = CONFIGURE_FDEFS
+NCARG_LIBS          =
+NCARG_LIBS2         =
+FC                  = mpifort
+SFC                 = xlf2003_r
+CC                  = mpicc
+SCC                 = xlc_r
+LD                  = $(FC)
+FFLAGS              = -qfree=f90
+F77FLAGS            = -qfixed
+FNGFLAGS            = $(FFLAGS)
+LDFLAGS             =
+CFLAGS              =
+CPP                 = cpp -P -traditional
+CPPFLAGS            = -Uvector -DBYTESWAP -DLINUX -DIO_NETCDF -DIO_BINARY -DIO_GRIB1 -DBIT32 CONFIGURE_MPI
+ARFLAGS             =
+
 ########################################################################################################################
 #ARCH   Linux ppc64 BG bglxf compiler with blxlc  # dmpar
 #

compile

@@ -112,7 +112,7 @@ endif
 # Print out WPS version, system info, and compiler/version
 echo "============================================================================================== "
   echo " "
-  echo Version 4.0.3
+  echo Version 4.1
   echo " "
   uname -a
   echo " "

configure

@@ -180,7 +180,7 @@ else
    wrf_dir=$WRF_DIR
 fi
 
-if [ $wrf_dir == "none" ]; then
+if [ $wrf_dir = "none" ]; then
    echo ""
    echo "Error: No compiled WRF code found. Please check that the WRF model has been compiled"
    echo "       one directory level up (i.e., ../) in a directory named 'WRF', 'WRF-4.0.3', 'WRF-4.0.2', etc.,"

geogrid/GEOGRID.TBL.ARW

@@ -31,8 +31,9 @@ name=LANDUSEF
         landmask_water =    nlcd2011_9s:17         # Calculate a landmask from this field
         landmask_water =       nlcd2006:17         # Calculate a landmask from this field
         landmask_water =       ssib_10m:16         # Calculate a landmask from this field
-        landmask_water  =       ssib_5m:16         # Calculate a landmask from this field
+        landmask_water =        ssib_5m:16         # Calculate a landmask from this field
         landmask_water =      modis_15s:17         # Calculate a landmask from this field
+        landmask_water = modis_15s_lake:17         # Calculate a landmask from this field
         landmask_water =      modis_30s:17         # Calculate a landmask from this field
         landmask_water = modis_30s_lake:17,21      # Calculate a landmask from this field
         landmask_water =       usgs_30s:16         # Calculate a landmask from this field
@@ -50,6 +51,7 @@ name=LANDUSEF
         interp_option =       ssib_10m:four_pt
         interp_option =        ssib_5m:four_pt
         interp_option =      modis_15s:nearest_neighbor
+        interp_option = modis_15s_lake:nearest_neighbor
         interp_option =      modis_30s:nearest_neighbor
         interp_option = modis_30s_lake:nearest_neighbor
         interp_option =       usgs_30s:nearest_neighbor
@@ -67,6 +69,7 @@ name=LANDUSEF
         rel_path =       ssib_10m:ssib_landuse_10m/
         rel_path =        ssib_5m:ssib_landuse_5m/
         rel_path =      modis_15s:modis_landuse_20class_15s/
+        rel_path = modis_15s_lake:modis_landuse_20class_15s_with_lakes/
         rel_path =      modis_30s:modis_landuse_20class_30s/
         rel_path = modis_30s_lake:modis_landuse_20class_30s_with_lakes/
         rel_path =       usgs_30s:landuse_30s/

geogrid/src/process_tile_module.F

@@ -300,7 +300,7 @@ subroutine process_tile(which_domain, grid_type, dynopt,        &
       end if
 
       ! Initialize the output module now that we have the corner point lats/lons
-      call output_init(which_domain, 'OUTPUT FROM GEOGRID V4.0.3', '0000-00-00_00:00:00', grid_type, dynopt, &
+      call output_init(which_domain, 'OUTPUT FROM GEOGRID V4.1', '0000-00-00_00:00:00', grid_type, dynopt, &
                        corner_lats, corner_lons, &
                        start_dom_i,   end_dom_i,   start_dom_j,   end_dom_j, &
                        start_patch_i, end_patch_i, start_patch_j, end_patch_j, &

metgrid/METGRID.TBL.ARW

@@ -689,7 +689,6 @@ mpas_name=ni
         flag_in_output=FLAG_QNI
 ========================================
 name=QNC
-        output=no
         interp_option=four_pt+average_4pt
         fill_missing=0.
         fill_lev=200100:const(0.)
@@ -1034,3 +1033,9 @@ mpas_name=tslb
         masked=water
         fill_missing=1.
 ========================================
+# Typically from ECMWF model-level data and used by calc_ecmwf_p.exe
+# Not needed by WRF
+name=LOGSFP
+        output=no
+        interp_option=four_pt
+========================================

metgrid/src/input_module.F

@@ -427,7 +427,9 @@ subroutine read_global_attrs(title, start_date, grid_type, dyn_opt,
 #endif
 
          call ext_get_dom_ti_char          ('TITLE', title)
-         if (index(title,'GEOGRID V4.0.3') /= 0) then
+         if (index(title,'GEOGRID V4.1') /= 0) then
+            wps_version = 4.1
+         else if (index(title,'GEOGRID V4.0.3') /= 0) then
             wps_version = 4.03
          else if (index(title,'GEOGRID V4.0.2') /= 0) then
             wps_version = 4.02

metgrid/src/process_domain_module.F

@@ -876,7 +876,7 @@ subroutine process_single_met_time(do_const_processing, &
       !   now we simply output every field from the storage module.
       !
 
-      title = 'OUTPUT FROM METGRID V4.0.3' 
+      title = 'OUTPUT FROM METGRID V4.1' 
 
       ! Initialize the output module for this domain and time
       call mprintf(.true.,LOGFILE,'Initializing output module.')

ungrib/Variable_Tables/Vtable.GFS

@@ -11,7 +11,7 @@ Param| Type |Level1|Level2| Name     | Units   | Description
   33 | 105  |  10  |      | UU       | m s-1   | U                 at 10 m               |  0  |  2  |  2  | 103 |
   34 | 105  |  10  |      | VV       | m s-1   | V                 at 10 m               |  0  |  2  |  3  | 103 |
    1 |   1  |   0  |      | PSFC     | Pa      | Surface Pressure                        |  0  |  3  |  0  |   1 |
-   2 | 102  |   0  |      | PMSL     | Pa      | Sea-level Pressure                      |  0  |  3  |  1  | 101 |
+ 130 | 102  |   0  |      | PMSL     | Pa      | Sea-level Pressure                      |  0  |  3  | 192 | 101 |
  144 | 112  |   0  |  10  | SM000010 | fraction| Soil Moist 0-10 cm below grn layer (Up) |  2  |  0  | 192 | 106 |
  144 | 112  |  10  |  40  | SM010040 | fraction| Soil Moist 10-40 cm below grn layer     |  2  |  0  | 192 | 106 |
  144 | 112  |  40  | 100  | SM040100 | fraction| Soil Moist 40-100 cm below grn layer    |  2  |  0  | 192 | 106 |
@@ -68,3 +68,27 @@ Param| Type |Level1|Level2| Name     | Units   | Description
 #
 #  As of mid-2017 the GFS provides two land mask fields in the pressure-level output. WPS uses LANDN if available
 #  and renames it LANDSEA.
+#
+#  As of WPS V4.1 (April 2019) the default PMSL is changed to MSLET. MSLET is an unsmoothed sea level pressure.
+#  NCEP included MSLET in their GFS files beginning 12z on 10 May 2011 and in their GDAS files at 12z 14 January 2015.
+#  The smoother PRMSL is in all GFS/GDAS pressure files.
+#  For GFS files prior to those dates use PRMSL as shown in the following line:
+#  2 | 102  |   0  |      | PMSL     | Pa      | Sea-level Pressure                      |  0  |  3  |  1  | 101 |
+#
+#
+#   Abbreviated history of GFS changes (all starting at 12 UTC)
+#
+# Sometime 2019     - Update to FV3 (requires WPS V4.0 or later)
+# 19 July 2017      - Change to land mask and other terrestrial variables (requires WPS V3.9.1.1)
+#                   - Change missing value, removal of grid 211 (80km conus). Flag value of .468 in soil moisture.
+# 11 May 2016       - Assimilate AMSU-A radiances, AVHRR winds, CRTMv2.2.1, 4d hybrid das.
+#                   - Add 5 stratospheric levels to ouput. UPP V7.0. Land surface and GWD upates.
+# 14 January 2015   - Add MSLET to GDAS. Change from T574 (27km) to T1534 (13km). Fcst length to 240 h.
+#                   - semi-lagrangian, uses rtgsst, Z0 dependent on vegetation type, CRTMv2.1.3, 0.25 deg output
+# 10 May 2011       - Add MSLET to output. New thermal roughness length. Elevation of buoys to 10m.
+#                   - Improved GSI, update CRTM. Recomputed BE.
+# 27 July 2010      - T382 (35km) to T574 (27km). new pbl, gravity wave drag, updated deep convective scheme
+# 13 May 2008       - RRTM radiation, aerosol, cloud overlap, windsat sfc winds, flow dependent bev.
+# 25 September 2007 - Implement UPP.
+# 31 May 2005       - T254L64 to T382L64. Change in soil output to 3 levels.
+# 29 October 2002   - Change from T170L42  to T254L64. Model top changed from 2 hPA to .2 hPa

ungrib/src/ngl/g2/intmath.f

@@ -169,7 +169,9 @@ function ilog2_2(i_in)
       ilog2_2=0
       i=i_in
       if(i<=0) return
-      if(iand(i,i-1)/=0) then
+! WPS modification for the XL compiler
+!      if(iand(i,i-1)/=0) then
+      if(iand(i,i-1_2)/=0) then
          !write(0,*) 'iand i-1'
          ilog2_2=1
       endif
@@ -204,7 +206,9 @@ function ilog2_1(i_in)
       ilog2_1=0
       i=i_in
       if(i<=0) return
-      if(iand(i,i-1)/=0) then
+! WPS modification for the XL compiler
+!      if(iand(i,i-1)/=0) then
+      if(iand(i,i-1_1)/=0) then
          !write(0,*) 'iand i-1'
          ilog2_1=1
       endif

ungrib/src/ngl/g2/params.f

@@ -40,7 +40,7 @@ module params
 !
 !$$$
 
-      integer,parameter :: MAXPARAM=791
+      integer,parameter :: MAXPARAM=801
 
       type gribparam
           integer :: g1tblver
@@ -185,7 +185,7 @@ module params
 !  Added 8/07/2003
 !
       data paramlist(128) /gribparam(2,229,0,0,192,'SNOHF')/
-      data paramlist(129) /gribparam(2,153,0,1,22,'CLWMR')/
+      data paramlist(129) /gribparam(2,153,0,1,22,'CLMR')/
       data paramlist(130) /gribparam(2,140,0,1,192,'CRAIN')/
       data paramlist(131) /gribparam(2,141,0,1,193,'CFRZR')/
       data paramlist(132) /gribparam(2,142,0,1,194,'CICEP')/
@@ -667,7 +667,7 @@ module params
        data paramlist(604) /gribparam(131,150,2,0,211,'SSTOR')/
        data paramlist(605) /gribparam(131,151,2,0,212,'LSOIL')/
        data paramlist(606) /gribparam(131,152,2,0,213,'EWATR')/
-       data paramlist(607) /gribparam(131,153,0,1,22,'CLWMR')/
+       data paramlist(607) /gribparam(131,153,0,1,22,'CLMR')/
        data paramlist(608) /gribparam(131,155,2,0,193,'GFLUX')/
        data paramlist(609) /gribparam(131,156,0,7,7,'CIN')/
        data paramlist(610) /gribparam(131,157,0,7,6,'CAPE')/
@@ -856,6 +856,18 @@ module params
        data paramlist(789) /gribparam(2,143,0,1,36,'CSNOW')/
        data paramlist(790) /gribparam(2,238,0,1,42,'SNOWC')/
        data paramlist(791) /gribparam(2,204,0,4,7,'DSWRF')/
+! Added 04/6/19 for HRRR fields.
+! table version, grib1 value, grib2 desc, grib2 category, grib2num, abbreviation
+       data paramlist(792) /gribparam(2,255,0,1,31,'HAIL')/
+       data paramlist(793) /gribparam(2,255,0,1,82,'CIMIXR')/
+       data paramlist(794) /gribparam(2,253,0,2,30,'FRICV')/
+       data paramlist(795) /gribparam(2,211,0,4,8,'USWRF')/
+       data paramlist(796) /gribparam(2,205,0,5,3,'DLWRF')/
+       data paramlist(797) /gribparam(2,255,0,7,200,'MNUPHL')/
+       data paramlist(798) /gribparam(2,223,2,0,13,'CNWAT')/
+       data paramlist(799) /gribparam(2,155,2,0,10,'GFLUX')/
+       data paramlist(800) /gribparam(2,235,1,0,6,'SSRUN')/
+       data paramlist(801) /gribparam(2,234,1,0,5,'BGRUN')/
 
       contains
 

ungrib/src/rrpr.F

@@ -588,6 +588,7 @@ subroutine rrpr(hstart, ntimes, interval, nlvl, maxlvl, plvl, &
 
 ! Repair GFS and ECMWF pressure-level RH
         if (index(map%source,'NCEP GFS') .ne. 0 .or.  &
+            index(map%source,'NCEP GEFS') .ne. 0 .or. &
             index(map%source,'NCEP CDAS CFSV2') .ne. 0 .or.  &
             index(map%source,'ECMWF') .ne. 0 ) then
           call mprintf(.true.,DEBUG, &