Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-v4.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@smileMchen
smileMchen committed Jan 15, 2021
2 parents f311cd5 + 1e93b7e commit fb60d61
Show file tree
Hide file tree
Showing 60 changed files with 1,095 additions and 568 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ all_wrfvar :
fi
if [ $(BUFR) ] ; then \
(cd var/external/bufr; \
$(MAKE) $(J) FC="$(SFC)" CC="$(SCC)" CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" FFLAGS="$(FCOPTIM) $(FORMAT_FIXED)" RANLIB="$(RANLIB)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" ) ; \
$(MAKE) $(J) FC="$(SFC)" CC="$(SCC)" CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" FFLAGS="$(FCOPTIM) $(FORMAT_FIXED) $(FCCOMPAT)" RANLIB="$(RANLIB)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" ) ; \
fi
### Use 'make' to avoid '-i -r' above:
if [ $(WAVELET) ] ; then \
Expand Down
2 changes: 1 addition & 1 deletion README
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WRF Model Version 4.2.1
WRF Model Version 4.2.2

http://www2.mmm.ucar.edu/wrf/users/

Expand Down
2 changes: 1 addition & 1 deletion Registry/Registry.EM_COMMON
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3063,7 +3063,7 @@ package icedepth_one seaice_thickness_opt==1 - state:icedept
#Time series options for text output
package notseries process_time_series==0 - -
package tseries process_time_series==1 - state:ts_hour,ts_u,ts_v,ts_q,ts_t,ts_psfc,ts_glw,ts_gsw,ts_hfx,ts_lh,ts_tsk,ts_tslb,ts_clw,ts_rainc,ts_rainnc,ts_u_profile,ts_v_profile,ts_gph_profile,ts_th_profile,ts_p_profile,ts_w_profile
package tseries_add_solar process_time_series==2 - state:ts_hour,ts_u,ts_v,ts_q,ts_t,ts_psfc,ts_glw,ts_gsw,ts_hfx,ts_lh,ts_tsk,ts_tslb,ts_clw,ts_rainc,ts_rainnc,ts_u_profile,ts_v_profile,ts_gph_profile,ts_th_profile,ts_cldfrac2d,ts_wvp,ts_lwp,ts_iwp,ts_swp,ts_lwp_tot,ts_iwp_tot,ts_swp_tot,ts_re_qc,ts_re_qi,ts_re_qs,ts_re_qc_tot,ts_re_qi_tot,ts_re_qs_tot,ts_tau_qc,ts_tau_qi,ts_tau_qs,ts_tau_qc_tot,ts_tau_qi_tot,ts_tau_qs_tot,ts_cbaseht,ts_ctopht,ts_cbaseht_tot,ts_ctopht_tot,ts_clrnidx,ts_p_profile,ts_w_profile
package tseries_add_solar process_time_series==2 - state:ts_hour,ts_u,ts_v,ts_q,ts_t,ts_psfc,ts_glw,ts_gsw,ts_hfx,ts_lh,ts_tsk,ts_tslb,ts_clw,ts_rainc,ts_rainnc,ts_u_profile,ts_v_profile,ts_gph_profile,ts_th_profile,ts_cldfrac2d,ts_wvp,ts_lwp,ts_iwp,ts_swp,ts_lwp_tot,ts_iwp_tot,ts_swp_tot,ts_re_qc,ts_re_qi,ts_re_qs,ts_re_qc_tot,ts_re_qi_tot,ts_re_qs_tot,ts_tau_qc,ts_tau_qi,ts_tau_qs,ts_tau_qc_tot,ts_tau_qi_tot,ts_tau_qs_tot,ts_cbaseht,ts_ctopht,ts_cbaseht_tot,ts_ctopht_tot,ts_clrnidx,ts_p_profile,ts_w_profile,ts_swdown,ts_swddni,ts_swddif,ts_swdownc,ts_swddnic,ts_swdown2,ts_swddni2,ts_swddif2,ts_swdownc2,ts_swddnic2

# WRF-HAILCAST
state real HAILCAST_DHAIL1 ij misc 1 - r "HAILCAST_DHAIL1" "WRF-HAILCAST Hail Diameter, 1st rank order" "mm"
Expand Down
10 changes: 10 additions & 0 deletions Registry/registry.solar_fields
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@ state real ts_cbaseht_tot ?! misc - - - "TS_C
state real ts_ctopht_tot ?! misc - - - "TS_CTOPHT_TOT" "CLOUD TOP HEIGHT RES + UNRES"
state real ts_clrnidx ?! misc - - - "TS_CLRNIDX" "CLEARNESS INDEX"
state real ts_sza ?! misc - - - "TS_SZA" "SOLAR ZENITH ANGLE"
state real ts_swdown ?! misc - - - "TS_SWDOWN" "DOWNWARD SHORT WAVE FLUX AT GROUND SURFACE"
state real ts_swddni ?! misc - - - "TS_SWDDNI" "SHORTWAVE SURFACE DOWNWARD DIRECT NORMAL IRRADIANCE"
state real ts_swddif ?! misc - - - "TS_SWDDIF" "SHORTWAVE SURFACE DOWNWARD DIFFUSE IRRADIANCE"
state real ts_swdownc ?! misc - - - "TS_SWDOWNC" "DOWNWARD CLEAR-SKY SHORTWAVE FLUX AT GROUND SURFACE"
state real ts_swddnic ?! misc - - - "TS_SWDDNIC" "CLEAR-SKY SHORTWAVE SURFACE DOWNWARD DIRECT NORMAL IRRADIANCE"
state real ts_swdown2 ?! misc - - - "TS_SWDOWN2" "DOWNWARD SHORT WAVE FLUX AT GROUND SURFACE FROM FARMS"
state real ts_swddni2 ?! misc - - - "TS_SWDDNI2" "SHORTWAVE SURFACE DOWNWARD DIRECT NORMAL IRRADIANCE FROM FARMS"
state real ts_swddif2 ?! misc - - - "TS_SWDDIF2" "SHORTWAVE SURFACE DOWNWARD DIFFUSE IRRADIANCE FROM FARMS"
state real ts_swdownc2 ?! misc - - - "TS_SWDOWNC2" "DOWNWARD CLEAR-SKY SHORTWAVE FLUX AT GROUND SURFACE FROM FARMS"
state real ts_swddnic2 ?! misc - - - "TS_SWDDNIC2" "CLEAR-SKY SHORTWAVE SURFACE DOWNWARD DIRECT NORMAL IRRADIANCE FROM FARMS"

# Package declarations

Expand Down
24 changes: 15 additions & 9 deletions arch/configure.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RLFLAGS =
CC_TOOLS = cc

###########################################################
#ARCH Linux i486 i586 i686, gfortran compiler with gcc #serial smpar dmpar dm+sm
#ARCH Linux i486 i586 i686 armv7l aarch64, gfortran compiler with gcc #serial smpar dmpar dm+sm
#
DESCRIPTION = GNU ($SFC/$SCC)
DMPARALLEL = # 1
Expand Down Expand Up @@ -73,8 +73,9 @@ FCDEBUG = # -g $(FCNOOPT) # -fbacktrace -ggdb -fcheck=bounds,do,m
FORMAT_FIXED = -ffixed-form
FORMAT_FREE = -ffree-form -ffree-line-length-none
FCSUFFIX =
FCCOMPAT =
BYTESWAPIO = -fconvert=big-endian -frecord-marker=4
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO)
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(FCCOMPAT)
FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG)
MODULE_SRCH_FLAG =
TRADFLAG = CONFIGURE_TRADFLAG
Expand Down Expand Up @@ -785,8 +786,9 @@ FCDEBUG = # -g $(FCNOOPT) # -ggdb -fbacktrace -fcheck=bounds,do,me
FORMAT_FIXED = -ffixed-form
FORMAT_FREE = -ffree-form -ffree-line-length-none
FCSUFFIX =
FCCOMPAT =
BYTESWAPIO = -fconvert=big-endian -frecord-marker=4
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO)
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(FCCOMPAT)
FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG)
MODULE_SRCH_FLAG =
TRADFLAG = CONFIGURE_TRADFLAG
Expand Down Expand Up @@ -1006,8 +1008,9 @@ FCDEBUG = # -g $(FCNOOPT) # -fbacktrace -ggdb -fcheck=bounds,do,me
FORMAT_FIXED = -ffixed-form
FORMAT_FREE = -ffree-form -ffree-line-length-none
FCSUFFIX =
FCCOMPAT =
BYTESWAPIO = -fconvert=big-endian -frecord-marker=4
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO)
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(FCCOMPAT)
FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG)
MODULE_SRCH_FLAG =
TRADFLAG = CONFIGURE_TRADFLAG
Expand Down Expand Up @@ -1049,8 +1052,9 @@ FCDEBUG = # -g $(FCNOOPT) # -fbacktrace -ggdb -fcheck=bounds,do,me
FORMAT_FIXED = -ffixed-form
FORMAT_FREE = -ffree-form -ffree-line-length-none
FCSUFFIX =
FCCOMPAT =
BYTESWAPIO = -fconvert=big-endian -frecord-marker=4
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO)
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(FCCOMPAT)
FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG)
MODULE_SRCH_FLAG =
TRADFLAG = CONFIGURE_TRADFLAG
Expand Down Expand Up @@ -1772,8 +1776,9 @@ FCDEBUG = # -g $(FCNOOPT) # -fbacktrace -ggdb -fcheck=bounds,do,me
FORMAT_FIXED = -ffixed-form
FORMAT_FREE = -ffree-form -ffree-line-length-none
FCSUFFIX =
FCCOMPAT =
BYTESWAPIO = -fconvert=big-endian -frecord-marker=4
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO)
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(FCCOMPAT)
FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG)
MODULE_SRCH_FLAG =
TRADFLAG = CONFIGURE_TRADFLAG
Expand Down Expand Up @@ -1829,7 +1834,7 @@ RLFLAGS =
CC_TOOLS = $(SCC)

###########################################################
#ARCH Linux x86_64 ppc64le i486 i586 i686 #serial smpar dmpar dm+sm
#ARCH Linux x86_64 ppc64le i486 i586 i686, ifort compiler with icc #serial smpar dmpar dm+sm
#
DESCRIPTION = INTEL ($SFC/$SCC): HSW/BDW
DMPARALLEL = # 1
Expand Down Expand Up @@ -1873,7 +1878,7 @@ RLFLAGS =
CC_TOOLS = $(SCC)

###########################################################
#ARCH Linux KNL x86_64 ppc64le i486 i586 i686 #serial smpar dmpar dm+sm
#ARCH Linux KNL x86_64 ppc64le i486 i586 i686, ifort compiler with icc #serial smpar dmpar dm+sm
#
DESCRIPTION = INTEL ($SFC/$SCC): KNL MIC
DMPARALLEL = # 1
Expand Down Expand Up @@ -1946,8 +1951,9 @@ FCDEBUG = # -g $(FCNOOPT) # -ggdb -fbacktrace
FORMAT_FIXED = -ffixed-form
FORMAT_FREE = -ffree-form -ffree-line-length-none
FCSUFFIX =
FCCOMPAT =
BYTESWAPIO = -fconvert=big-endian -frecord-marker=4
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO)
FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) $(FCCOMPAT)
FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG)
MODULE_SRCH_FLAG =
TRADFLAG = -traditional
Expand Down
6 changes: 5 additions & 1 deletion chem/chemics_init.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1944,7 +1944,11 @@ subroutine chem_init (id,chem,emis_ant,scalar,dt,bioemdt,photdt,chemdt,stepbioe,
!
drydep_select: SELECT CASE(config_flags%gas_drydep_opt)
CASE (WESELY)
CALL wrf_debug(15,'initializing dry dep (wesely)')
IF (numgas .eq. 0) THEN
CALL wrf_error_fatal("ERROR: numgas = 0, SELECTED CHEM OPT IS &
&NOT COMPATIBLE WITH WESELY DRY DEPOSITION")
ENDIF
CALL wrf_debug(15,'initializing dry dep (wesely)')
call dep_init( id, config_flags, numgas, mminlu_loc, &
its, ite, jts, jte, ide, jde )
Expand Down
2 changes: 1 addition & 1 deletion chem/module_emissions_anthropogenics.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ subroutine add_anthropogenics(id,dtstep,dz8w,config_flags,rho_phy,alt, &
if (config_flags%aircraft_emiss_opt == 1 ) then
do j=jts,jte
do k=kts,min(config_flags%kemit_aircraft,kte)
conv_rho(its:ite)=4.828e-4/rho_phy(i,k,j)*dtstep/(dz8w(i,k,j)*60.)
conv_rho(its:ite)=4.828e-4/rho_phy(its:ite,k,j)*dtstep/(dz8w(its:ite,k,j)*60.)
if( p_no >= param_first_scalar ) then
chem(its:ite,k,j,p_no) = chem(its:ite,k,j,p_no) + emis_aircraft(its:ite,k,j,p_eac_no) *conv_rho(its:ite)
endif
Expand Down
2 changes: 1 addition & 1 deletion chem/module_mosaic_addemiss.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ subroutine mosaic_addemiss( id, dtstep, u10, v10, alt, dz8w, xland, &
do i = its, ite
! compute mass biomass burning emissions [(ug/m3)*m/s] for each species
! using the apportioning fractions
aem_so4 = bburn_mosaic_f(n)*ebu(i,k,j,p_ebu_sulf)
IF ( p_ebu_sulf .gt. 1) aem_so4 = bburn_mosaic_f(n)*ebu(i,k,j,p_ebu_sulf)
aem_oc = bburn_mosaic_f(n)*ebu(i,k,j,p_ebu_oc)
aem_bc = bburn_mosaic_f(n)*ebu(i,k,j,p_ebu_bc)
! Option to calculate OIN fraction of total PM for fire emissions
Expand Down
19 changes: 19 additions & 0 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,25 @@ if [ $os = "Linux" -o $os = "Darwin" ]; then

foo=foo_$$

grep '^SFC' configure.wrf | grep -i 'gfortran' > /dev/null
if [ $? ]
then

cat > ${foo}.F << EOF
PROGRAM GFORTRAN_VERSION_CHECK
IF (__GNUC__ .GT. 9) CALL EXIT(1)
END PROGRAM
EOF

gfortran -o ${foo} ${foo}.F > /dev/null 2>&1 && ./${foo}
if [ $? -eq 1 ]
then
sed '/^FCCOMPAT/ s/$/ -fallow-argument-mismatch -fallow-invalid-boz/' configure.wrf > configure.wrf.edit
mv configure.wrf.edit configure.wrf
fi
rm ${foo} ${foo}.F 2> /dev/null
fi

cat > ${foo}.c <<EOF
int main(int argc, char ** argv)
{
Expand Down
8 changes: 4 additions & 4 deletions dyn_em/module_big_step_utilities_em.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1506,7 +1506,7 @@ SUBROUTINE rhs_ph( ph_tend, u, v, ww, &
jtf=MIN(jte,jde-1)
IF ( (config_flags%open_ys .or. specified) .and. jts == jds ) j_start = jts+1
IF ( (config_flags%open_ye .or. specified) .and. jte == jde ) jtf = jtf-2
IF ( (config_flags%open_ye .or. specified) .and. jte == jde ) jtf = jte-2
DO j = j_start, jtf
Expand Down Expand Up @@ -1539,7 +1539,7 @@ SUBROUTINE rhs_ph( ph_tend, u, v, ww, &
jtf=MIN(jte,jde-1)
IF ( (config_flags%open_xs .or. specified) .and. its == ids ) i_start = its+1
IF ( (config_flags%open_xe .or. specified) .and. ite == ide ) itf = itf-2
IF ( (config_flags%open_xe .or. specified) .and. ite == ide ) itf = ite-2
DO j = j_start, jtf
Expand Down Expand Up @@ -1574,7 +1574,7 @@ SUBROUTINE rhs_ph( ph_tend, u, v, ww, &
jtf=MIN(jte,jde-1)
IF ( (config_flags%open_ys .or. specified) .and. jts == jds ) j_start = jts+2
IF ( (config_flags%open_ye .or. specified) .and. jte == jde ) jtf = jtf-3
IF ( (config_flags%open_ye .or. specified) .and. jte == jde ) jtf = jte-3
DO j = j_start, jtf
Expand Down Expand Up @@ -1664,7 +1664,7 @@ SUBROUTINE rhs_ph( ph_tend, u, v, ww, &
jtf=MIN(jte,jde-1)
IF ( (config_flags%open_xs) .and. its == ids ) i_start = its+2
IF ( (config_flags%open_xe) .and. ite == ide ) itf = itf-3
IF ( (config_flags%open_xe) .and. ite == ide ) itf = ite-3
DO j = j_start, jtf
Expand Down
Loading

0 comments on commit fb60d61

Please sign in to comment.