Merge pull request #651 from wrf-model/release-v4.0.1

Finalize WRFV4.0.1 by merging bug fixes from release-v4.0.1 branch onto master. See the annotation of the v4.0.1 tag for full release notes (git show v4.0.1).

Author: kkeene44

README

@@ -1,5 +1,6 @@
-WRF Model Version 4.0 (June 8, 2018)
-http://wrf-model.org/users/users.php
+WRF Model Version 4.0.1 (October 2, 2018)
+
+http://www2.mmm.ucar.edu/wrf/users/
 
 ------------------------
 WRF PUBLIC DOMAIN NOTICE
@@ -40,6 +41,12 @@ doc/README.rsl_output
 doc/README.windturbine
 doc/README_test_cases
 
+V4.0.1 Release Notes (10/2/2018):
+-------------------
+
+- For more information on the WRF V4.0.1 release, visit the WRF GitHub Release Page:
+  https://github.com/wrf-model/WRF/releases
+
 V4.0 Release Notes (6/8/2018):
 -------------------
 
@@ -299,7 +306,7 @@ WRF update history:
 How to compile and run?
 -----------------------
 
-- In WRFV3 directory, type 'configure' - this will create a configure.wrf
+- In WRF directory, type 'configure' - this will create a configure.wrf
   file that has appropriate compile options for the supported computers.
 
   Note: WRF requires netCDF library. If your netCDF library is installed in

Registry/Registry.EM_COMMON.var

@@ -303,6 +303,7 @@ state   real    tlp_strat      -       misc         -         -     i02rh     "t
 state   real    p_strat        -       misc         -         -     i02rh     "p_strat"               "BASE STATE PRESSURE AT BOTTOM OF STRATOSPHERE" "Pa"
 state   real    max_msftx      -       misc         -         -      rh       "max_mstfx"             "Max map factor in domain"  ""
 state   real    max_msfty      -       misc         -         -      rh       "max_mstfy"             "Max map factor in domain"  ""
+state logical   v4_metgrid     -       misc         -         -       -       "v4_metgrid"            "for real, T/F: identify if this is v4 metgrid data" ""
 
 state    real  RAINC            ij      misc        1         -      rhdu     "RAINC"                 "ACCUMULATED TOTAL CUMULUS PRECIPITATION"                 "mm"      
 state    real  RAINNC           ij      misc        1         -      rhdu     "RAINNC"                "ACCUMULATED TOTAL GRID SCALE PRECIPITATION"              "mm"      

compile

@@ -81,6 +81,9 @@ foreach a ( $argv )
     set prev_was_j = true
   else if ( "$prev_was_j" == "true" ) then
     set prev_was_j = false
+  else if   ( "$a" ==  "emi_conv" ) then
+    set arglist = ( $arglist $a )
+    set ZAP = ( chem/convert_emiss.exe )
   else
     echo "This option is not recognized: $a"
     exit ( 1 )

doc/README.DA

@@ -492,7 +492,7 @@ WRFDA update history:
 - V3.8.1:   Aug 12, 2016
 - V3.9:     Apr 17, 2017
 - V3.9.1:   Aug 17, 2017
-- V4.0:     Jun  7, 2018
+- V4.0:     Jun  8, 2018
 ======================================
 
 How to compile and run?

dyn_em/module_small_step_em.F

@@ -260,7 +260,7 @@ SUBROUTINE small_step_prep( u_1, u_2, v_1, v_2, w_1, w_2, &
     DO k=k_start, k_end
     DO i=i_start, i_end
       t_save(i,k,j) = t_2(i,k,j)
-      t_2(i,k,j) = (c1f(k)*muts(i,j)+c2f(k))*t_1(i,k,j)-(c1f(k)*mut(i,j)+c2f(k))*t_2(i,k,j)
+      t_2(i,k,j) = (c1h(k)*muts(i,j)+c2h(k))*t_1(i,k,j)-(c1h(k)*mut(i,j)+c2h(k))*t_2(i,k,j)
     ENDDO
     ENDDO
     ENDDO
@@ -409,7 +409,7 @@ SUBROUTINE small_step_finish( u_2, u_1, v_2, v_1, w_2, w_1,    &
     DO j = j_start, j_end
     DO k = kds, kde-1
     DO i = i_start, i_end
-      t_2(i,k,j) = (t_2(i,k,j) + t_save(i,k,j)*(c1f(k)*mut(i,j)+c2f(k)))/(c1f(k)*muts(i,j)+c2f(k))
+      t_2(i,k,j) = (t_2(i,k,j) + t_save(i,k,j)*(c1h(k)*mut(i,j)+c2h(k)))/(c1h(k)*muts(i,j)+c2h(k))
     ENDDO
     ENDDO
     ENDDO
@@ -418,8 +418,8 @@ SUBROUTINE small_step_finish( u_2, u_1, v_2, v_1, w_2, w_1,    &
     DO j = j_start, j_end
     DO k = kds, kde-1
     DO i = i_start, i_end
-      t_2(i,k,j) = (t_2(i,k,j) - dts*number_of_small_timesteps*(c1f(k)*mut(i,j)+c2f(k))*h_diabatic(i,k,j) &
-                    + t_save(i,k,j)*(c1f(k)*mut(i,j)+c2f(k)))/(c1f(k)*muts(i,j)+c2f(k))
+      t_2(i,k,j) = (t_2(i,k,j) - dts*number_of_small_timesteps*(c1h(k)*mut(i,j)+c2h(k))*h_diabatic(i,k,j) &
+                    + t_save(i,k,j)*(c1h(k)*mut(i,j)+c2h(k)))/(c1h(k)*muts(i,j)+c2h(k))
     ENDDO
     ENDDO
     ENDDO

dyn_em/start_em.F

@@ -773,13 +773,21 @@ SUBROUTINE start_domain_em ( grid, allowed_to_read &
     DO i=its,min(ite,ide-1)
 #if ( WRFPLUS == 1 )
        IF ( .NOT. config_flags%var4d_run ) THEN
-          qvf = 1.+rvovrd*moist(i,k,j,P_QV)
+          IF ( config_flags%use_theta_m == 0 ) THEN
+             qvf = 1.+rvovrd*moist(i,k,j,P_QV)
+          ELSE
+             qvf = 1
+          END IF
           grid%p(i,k,j)=p1000mb*( (r_d*(t0+grid%t_1(i,k,j))*qvf)/                     &
                      (p1000mb*(grid%al(i,k,j)+grid%alb(i,k,j))) )**cpovcv  &
                      -grid%pb(i,k,j)
        END IF
 #else
-       qvf = 1.+rvovrd*moist(i,k,j,P_QV)
+       IF ( config_flags%use_theta_m == 0 ) THEN
+          qvf = 1.+rvovrd*moist(i,k,j,P_QV)
+       ELSE
+          qvf = 1
+       END IF
        grid%p(i,k,j)=p1000mb*( (r_d*(t0+grid%t_1(i,k,j))*qvf)/                     &
                   (p1000mb*(grid%al(i,k,j)+grid%alb(i,k,j))) )**cpovcv  &
                   -grid%pb(i,k,j)

inc/version_decl

@@ -1 +1 @@
-   CHARACTER (LEN=10) :: release_version = 'V4.0      '
+   CHARACTER (LEN=10) :: release_version = 'V4.0.1    '