Merge pull request #92 from wrf-model/release-v4.0.2

This merge finalizes the v4.0.2 release by adding fixes from the 'release-v4.0.2' branch
onto the 'master' branch.

README

@@ -1,4 +1,4 @@
-WRF Pre-Processing System Version 4.0.1 (2 October 2018)
+WRF Pre-Processing System Version 4.0.2 (9 November 2018)
 
 http://www2.mmm.ucar.edu/wrf/users/
 

arch/preamble

@@ -33,12 +33,15 @@ PERL			=	perl
 RANLIB			=	echo
 
 #
-# Look for compiled WRF code in one of several directories: WRF-4.0.1, WRF-4.0, WRF, and WRFV3.
+# Look for compiled WRF code in one of several directories: WRF-4.0.2, WRF-4.0.1, WRF-4.0, WRF, and WRFV3.
 # The need for complicated logic to do this arises from the various names that the WRF code may take
 # on, depending on whether it was obtained through a GitHub archive file, as a clone of the GitHub
 # repository, or an older WRF v3.x tar file.
 # To override the path to the compiled WRF code, just set the WRF_DIR variable after the "endif" below
 #
+ifneq ($(wildcard $(DEV_TOP)/../WRF-4.0.2), ) # Check for WRF v4.0.2 directory (probably GitHub archive)
+	WRF_DIR = ../WRF-4.0.2
+else
 ifneq ($(wildcard $(DEV_TOP)/../WRF-4.0.1), ) # Check for WRF v4.0.1 directory (probably GitHub archive)
 	WRF_DIR = ../WRF-4.0.1
 else
@@ -52,6 +55,7 @@ else                                          # Check for old WRF v3.x directory
 endif
 endif
 endif
+endif
 
 
 WRF_INCLUDE     =       -I$(WRF_DIR)/external/io_netcdf \

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.1', '0000-00-00_00:00:00', grid_type, dynopt, &
+      call output_init(which_domain, 'OUTPUT FROM GEOGRID V4.0.2', '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/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.1') /= 0) then
+         if (index(title,'GEOGRID V4.0.2') /= 0) then
+            wps_version = 4.02
+         else if (index(title,'GEOGRID V4.0.2') /= 0) then
             wps_version = 4.01
          else if (index(title,'GEOGRID V4.0') /= 0) then
             wps_version = 4.0

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.1' 
+      title = 'OUTPUT FROM METGRID V4.0.2' 
 
       ! Initialize the output module for this domain and time
       call mprintf(.true.,LOGFILE,'Initializing output module.')

ungrib/src/ngl/g2/Makefile

@@ -44,9 +44,9 @@ OBJS	=	gridtemplates.o pdstemplates.o drstemplates.o gribmod.o realloc.o intmath
 		addgrid.o addlocal.o getfield.o gb_info.o gf_getfld.o gf_free.o gf_unpack1.o  \
 		gf_unpack2.o gf_unpack3.o gf_unpack4.o gf_unpack5.o gf_unpack6.o gf_unpack7.o \
 		gettemplates.o getlocal.o getdim.o getpoly.o gribcreate.o gribend.o gribinfo.o \
-		mkieee.o rdieee.o simpack.o simunpack.o cmplxpack.o compack.o misspack.o pack_gp.o \
-		reduce.o comunpack.o specpack.o specunpack.o jpcpack.o jpcunpack.o enc_jpeg2000.o \
-		dec_jpeg2000.o pngpack.o pngunpack.o enc_png.o dec_png.o gbytesc.o skgb.o ixgb2.o \
+		mkieee.o rdieee.o simunpack.o \
+		reduce.o comunpack.o specunpack.o jpcunpack.o \
+		dec_jpeg2000.o pngunpack.o dec_png.o gbytesc.o skgb.o ixgb2.o \
 		getidx.o getg2i.o getg2ir.o getgb2s.o getgb2r.o getgb2l.o getgb2.o getgb2p.o getgb2rp.o \
 		putgb2.o g2grids.o gdt2gds.o params.o params_ecmwf.o mova2i.o
 

ungrib/src/rrpr.F

@@ -1196,8 +1196,8 @@ subroutine vntrp(plvl, maxlvl, k, k2, interp_type, name, ix, jx)
   real :: frc
   integer :: interp_type
 
-  write(*,'("Interpolating to fill in ", A, " at level ", F8.2, " hPa using levels ", F8.2," hPa and ", &
-            F8.2," hPa")') trim(name), plvl(k)/100.0,plvl(k-1)/100.0, plvl(k2)/100.0
+  write(*,'("Interpolating to fill in ", A, " at level ", F8.2, " hPa using levels ", F8.2," hPa and ",& 
+     & F8.2," hPa")') trim(name), plvl(k)/100.0,plvl(k-1)/100.0, plvl(k2)/100.0
   call mprintf(.true.,INFORM, &
     "RRPR: Interpolating to fill in %s at %i Pa using levels %i Pa and %i Pa",&
     s1=trim(name), i1=int(plvl(k)), i2=int(plvl(k-1)), i3=int(plvl(k2)))