Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@kkeene44
kkeene44 committed Apr 12, 2019
2 parents aa947dd + dd5c4c3 commit e883b53
Show file tree
Hide file tree
Showing 72 changed files with 22,509 additions and 26,484 deletions.
43 changes: 25 additions & 18 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,11 +556,13 @@ em_real : wrf
ln -sf ../../run/aerosol_lon.formatted . ; \
ln -sf ../../run/aerosol_plev.formatted . ; \
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
ln -sf ../../run/p3_lookup_table_1.dat-v2.8.2 . ; \
ln -sf ../../run/p3_lookup_table_2.dat-v2.8.2 . ; \
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
ln -sf ../../run/ishmael-qi-qc.bin . ; \
ln -sf ../../run/ishmael-qi-qr.bin . ; \
ln -sf ../../run/p3_lookup_table_1.dat-v4.1 . ; \
ln -sf ../../run/p3_lookup_table_2.dat-v4.1 . ; \
ln -sf ../../run/HLC.TBL . ; \
ln -sf ../../run/wind-turbine-1.tbl . ; \
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
ln -sf ../../run/ishmael-qi-qc.bin . ; \
ln -sf ../../run/ishmael-qi-qr.bin . ; \
ln -sf ../../run/BROADBAND_CLOUD_GODDARD.bin . ; \
if [ $(RWORDSIZE) -eq 8 ] ; then \
ln -sf ../../run/ETAMPNEW_DATA_DBL ETAMPNEW_DATA ; \
Expand Down Expand Up @@ -614,20 +616,25 @@ em_real : wrf
ln -sf ../../run/aerosol_lat.formatted . ; \
ln -sf ../../run/aerosol_lon.formatted . ; \
ln -sf ../../run/aerosol_plev.formatted . ; \
ln -sf ../../run/capacity.asc . ; \
ln -sf ../../run/coeff_p.asc . ; \
ln -sf ../../run/coeff_q.asc . ; \
ln -sf ../../run/constants.asc . ; \
ln -sf ../../run/masses.asc . ; \
ln -sf ../../run/termvels.asc . ; \
ln -sf ../../run/capacity.asc . ; \
ln -sf ../../run/coeff_p.asc . ; \
ln -sf ../../run/coeff_q.asc . ; \
ln -sf ../../run/constants.asc . ; \
ln -sf ../../run/masses.asc . ; \
ln -sf ../../run/termvels.asc . ; \
ln -sf ../../run/kernels.asc_s_0_03_0_9 . ; \
ln -sf ../../run/kernels_z.asc . ; \
ln -sf ../../run/bulkdens.asc_s_0_03_0_9 . ; \
ln -sf ../../run/bulkradii.asc_s_0_03_0_9 . ; \
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
ln -sf ../../run/p3_lookup_table_1.dat-v2.8.2 . ; \
ln -sf ../../run/p3_lookup_table_2.dat-v2.8.2 . ; \
ln -sf ../../run/BROADBAND_CLOUD_GODDARD.bin . ; \
ln -sf ../../run/kernels_z.asc . ; \
ln -sf ../../run/bulkdens.asc_s_0_03_0_9 . ; \
ln -sf ../../run/bulkradii.asc_s_0_03_0_9 . ; \
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
ln -sf ../../run/p3_lookup_table_1.dat-v4.1 . ; \
ln -sf ../../run/p3_lookup_table_2.dat-v4.1 . ; \
ln -sf ../../run/HLC.TBL . ; \
ln -sf ../../run/wind-turbine-1.tbl . ; \
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
ln -sf ../../run/ishmael-qi-qc.bin . ; \
ln -sf ../../run/ishmael-qi-qr.bin . ; \
ln -sf ../../run/BROADBAND_CLOUD_GODDARD.bin . ; \
if [ $(RWORDSIZE) -eq 8 ] ; then \
ln -sf ../../run/ETAMPNEW_DATA_DBL ETAMPNEW_DATA ; \
ln -sf ../../run/ETAMPNEW_DATA.expanded_rain_DBL ETAMPNEW_DATA.expanded_rain ; \
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.0.3 (December 18, 2018)
WRF Model Version 4.1

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

Expand Down
43 changes: 22 additions & 21 deletions Registry/Registry.EM_COMMON
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions Registry/Registry.NMM
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1762,7 +1762,6 @@ package nssl_1momlfo mp_physics==21 - moist:qv,qc,q
package nssl_2momg mp_physics==22 - moist:qv,qc,qr,qi,qs,qg;scalar:qndrop,qnr,qni,qns,qng,qvolg;state:re_cloud,re_ice,re_snow
package wsm7scheme mp_physics==24 - moist:qv,qc,qr,qi,qs,qg,qh;state:re_cloud,re_ice,re_snow
package wdm7scheme mp_physics==26 - moist:qv,qc,qr,qi,qs,qg,qh;scalar:qnn,qnc,qnr;state:re_cloud,re_ice,re_snow
package nuwrf3icescheme mp_physics==27 - moist:qv,qc,qr,qi,qs,qg
package p3_1category mp_physics==50 - moist:qv
package p3_1category_nc mp_physics==51 - moist:qv
package p3_2category mp_physics==52 - moist:qv
Expand All @@ -1789,7 +1788,6 @@ package wdm5scheme_dfi mp_physics_dfi==14 - dfi_moist:dfi
package wdm6scheme_dfi mp_physics_dfi==16 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr;state:dfi_re_cloud,dfi_re_ice,dfi_re_snow
package wsm7scheme_dfi mp_physics_dfi==24 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg,dfi_qh;state:dfi_re_cloud,dfi_re_ice,dfi_re_snow
package wdm7scheme_dfi mp_physics_dfi==26 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg,dfi_qh;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr;state:dfi_re_cloud,dfi_re_ice,dfi_re_snow
package nuwrf3icescheme_dfi mp_physics_dfi==27 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg
package thompsonaero_dfi mp_physics_dfi==28 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qni,dfi_qnr,dfi_qnc,dfi_qnwfa,dfi_qnifa;state:dfi_re_cloud,dfi_re_ice,dfi_re_snow
package etampnew_dfi mp_physics_dfi==95 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qs
package gsfcgcescheme_dfi mp_physics_dfi==97 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg
Expand Down
6 changes: 3 additions & 3 deletions Registry/registry.afwa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ state real TORNADO_DUR ij misc 1 - r

# Package declaration for AFWA diagnostics

package afwa_diag afwa_diag_opt==1 - state:afwa_mslp,afwa_pwat,wspd10max
package afwa_ptype afwa_ptype_opt==1 - state:afwa_precip,afwa_totprecip,afwa_rain,afwa_snow,afwa_ice,afwa_fzra,afwa_snowfall
package afwa_diag afwa_diag_opt==1 - state:afwa_mslp,afwa_pwat,afwa_precip,afwa_totprecip
package afwa_ptype afwa_ptype_opt==1 - state:afwa_rain,afwa_snow,afwa_ice,afwa_fzra,afwa_snowfall
package afwa_vil afwa_vil_opt==1 - state:vil,radarvil
package afwa_radar afwa_radar_opt==1 - state:echotop,refd_com,refd
package afwa_severe afwa_severe_opt==1 - state:w_up_max,w_dn_max,tcoli_max,up_heli_max,grpl_flx_max,w_mean,afwa_hail,afwa_cape,afwa_zlfc,afwa_plfc,tornado_mask,tornado_dur,midrh_min,midrh_min_old,afwa_lidx,afwa_cin,afwa_tornado,afwa_llws
package afwa_severe afwa_severe_opt==1 - state:w_up_max,w_dn_max,tcoli_max,up_heli_max,grpl_flx_max,w_mean,afwa_hail,afwa_cape,afwa_zlfc,afwa_plfc,tornado_mask,tornado_dur,midrh_min,midrh_min_old,afwa_lidx,afwa_cin,afwa_tornado,afwa_llws,wspd10max
package afwa_icing afwa_icing_opt==1 - state:fzlev,icingtop,icingbot,qicing_lg,qicing_sm,icing_lg,icing_sm,qicing_lg_max,qicing_sm_max
package afwa_cloud afwa_cloud_opt==1 - state:afwa_cloud,afwa_cloud_ceil
package afwa_vis afwa_vis_opt==1 - state:afwa_vis,afwa_vis_dust,afwa_vis_alpha
Expand Down
2 changes: 1 addition & 1 deletion Registry/registry.dimspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dimspec nndgvar - namelist=nobs_ndg_vars c nobs_ndg_vars
dimspec [ - namelist=obs_prt_max c obs_prt_max
dimspec obsstid - constant=40 c obs station id names
dimspec & 2 namelist=lagday z lagday
dimspec seed 1 namelist=seed_dim z seed_dim
endif


Expand All @@ -51,7 +52,6 @@ endif
dimspec snly 2 namelist=num_snow_layers z snow_layers
dimspec l 2 namelist=num_soil_layers z soil_layers
dimspec snsl 2 namelist=num_snso_layers z snso_layers
dimspec ulay 2 namelist=num_urban_layers z urban_layers

dimspec umap0 2 namelist=num_urban_ndm z num_urban_ndm
dimspec umap1 2 namelist=urban_map_zrd z urban_map_zrd
Expand Down
33 changes: 17 additions & 16 deletions Registry/registry.stoch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ state real SPPT_AMP ij misc 1 - r "SPPT_AMP" "amp


# 1d arrays
state real VERTAMPT k misc 1 - r "VERTAMPT" "vert. amplitude of stoch. temperature perturb." "" ""
state real VERTAMPUV k misc 1 - r "VERTAMPUV" "vert. amplitude of stoch. u,v perturb." "" ""
state integer ISEEDARR_SPPT k misc 1 - rh "ISEEDARR_SPPT" "Array to hold seed for restart, SPPT" "" ""
state integer ISEEDARR_SKEBS k misc 1 - rh "ISEEDARR_SKEBS" "Array to hold seed for restart, SKEBS" "" ""
state integer ISEEDARR_RAND_PERT k misc 1 - rh "ISEEDARR_RAND_PERTURB" "Array to hold seed for restart, RAND_PERT" "" ""
state integer iseedarr_spp_conv k misc 1 - rh "iseedarray_spp_conv" "Array to hold seed for restart, RAND_PERT2" "" ""
state integer iseedarr_spp_pbl k misc 1 - rh "iseedarray_spp_pbl" "Array to hold seed for restart, RAND_PERT3" "" ""
state integer iseedarr_spp_lsm k misc 1 - rh "iseedarray_spp_lsm" "Array to hold seed for restart, RAND_PERT4" "" ""
state real VERTAMPT k misc 1 - r "VERTAMPT" "vert. amplitude of stoch. temperature perturb." "" ""
state real VERTAMPUV k misc 1 - r "VERTAMPUV" "vert. amplitude of stoch. u,v perturb." "" ""
state integer ISEEDARR_SPPT {seed} misc 1 Z rh "ISEEDARR_SPPT" "Array to hold seed for restart, SPPT" "" ""
state integer ISEEDARR_SKEBS {seed} misc 1 Z rh "ISEEDARR_SKEBS" "Array to hold seed for restart, SKEBS" "" ""
state integer ISEEDARR_RAND_PERT {seed} misc 1 Z rh "ISEEDARR_RAND_PERTURB" "Array to hold seed for restart, RAND_PERT" "" ""
state integer iseedarr_spp_conv {seed} misc 1 Z rh "iseedarray_spp_conv" "Array to hold seed for restart, RAND_PERT2" "" ""
state integer iseedarr_spp_pbl {seed} misc 1 Z rh "iseedarray_spp_pbl" "Array to hold seed for restart, RAND_PERT3" "" ""
state integer iseedarr_spp_lsm {seed} misc 1 Z rh "iseedarray_spp_lsm" "Array to hold seed for restart, RAND_PERT4" "" ""

# 1d arrays for FFT transpose
state real RAND_REAL_xxx i{stoclev}jx dyn_em 1 XYZ
Expand Down Expand Up @@ -121,32 +121,32 @@ rconfig real gridpt_stddev_sppt namelist,stoch max_domains
rconfig real stddev_cutoff_sppt namelist,stoch max_domains 2.0 - "cutoff tails of pdf above this threshold standard deviation"
rconfig real lengthscale_sppt namelist,stoch max_domains 150000.0 - "Correlation length scale in meters for SPPT"
rconfig real timescale_sppt namelist,stoch max_domains 21600.0 - "Decorrelation time scale in s for SPPT"
rconfig integer sppt_vertstruc namelist,stoch 1 0 - "vertical structure for sppt: 0=constant, 1=random phase"
rconfig integer sppt_vertstruc namelist,stoch 1 0 - "vertical structure for sppt: 0=constant, 1=random phase"
rconfig integer iseed_sppt namelist,stoch 1 53 - "ISEED_SPPT" "RANDOM SEED FOR SPPT " ""

# Namelist parameters for random perturbations

rconfig integer rand_perturb namelist,stoch max_domains 0 - "generate array with random perturbations: 0=off, 1=on"
rconfig real gridpt_stddev_rand_pert namelist,stoch max_domains 0.03 - "gridpoint standard deviation of random perturbations"
rconfig real gridpt_stddev_rand_pert namelist,stoch max_domains 0.03 - "gridpoint standard deviation of random perturbations"
rconfig real stddev_cutoff_rand_pert namelist,stoch max_domains 3.0 - "cutoff tails of pdf above this threshold standard deviation"
rconfig real lengthscale_rand_pert namelist,stoch max_domains 500000.0 - "Correlation length scale in meters"
rconfig real timescale_rand_pert namelist,stoch max_domains 21600.0 - "Decorrelation time scale in s"
rconfig integer rand_pert_vertstruc namelist,stoch 1 0 - "vertical structure for random perturb: 0=constant, 1=random phase"
rconfig integer rand_pert_vertstruc namelist,stoch 1 0 - "vertical structure for random perturb: 0=constant, 1=random phase"
rconfig integer iseed_rand_pert namelist,stoch 1 17 - "ISEED_RAND_PERT" "RANDOM SEED FOR RAND_PERT " ""

# Namelist parameters for stochastic perturbed parameters

rconfig integer spp namelist,stoch max_domains 0 - "generate array with random perturbations: 0=off, 1=on"
rconfig logical hrrr_cycling namelist,stoch 1 .false. - "switch to control restart in quasi-cycled hrrr-forecasts"
rconfig logical hrrr_cycling namelist,stoch 1 .true. - "switch to control restart in quasi-cycled hrrr-forecasts"

# Namelist parameters for stochastic perturbed parameters (SPP) for convective scheme

rconfig integer spp_conv namelist,stoch max_domains 0 - "generate array with random perturbations: 0=off, 1=on"
rconfig integer spp_conv namelist,stoch max_domains 0 - "generate array with random perturbations: 0=off, 1=on"
rconfig real gridpt_stddev_spp_conv namelist,stoch max_domains 0.3 - "gridpoint standard deviation of random perturbations"
rconfig real stddev_cutoff_spp_conv namelist,stoch max_domains 3.0 - "cutoff tails of pdf above this threshold standard deviation"
rconfig real lengthscale_spp_conv namelist,stoch max_domains 150000.0 - "Correlation length scale in meters"
rconfig real timescale_spp_conv namelist,stoch max_domains 21600.0 - "Decorrelation time scale in s"
rconfig integer vertstruc_spp_conv namelist,stoch 1 0 - "vertical structure for random perturb: 0=constant, 1=random phase"
rconfig integer vertstruc_spp_conv namelist,stoch 1 0 - "vertical structure for random perturb: 0=constant, 1=random phase"
rconfig integer iseed_spp_conv namelist,stoch 1 171 - "ISEED_RAND_PERT" "RANDOM SEED FOR RAND_PERT " ""

# Namelist parameters for stochastic perturbed parameters (SPP) for pbl
Expand All @@ -156,7 +156,7 @@ rconfig real gridpt_stddev_spp_pbl namelist,stoch max_domains
rconfig real stddev_cutoff_spp_pbl namelist,stoch max_domains 2.0 - "cutoff tails of pdf above this threshold standard deviation"
rconfig real lengthscale_spp_pbl namelist,stoch max_domains 700000.0 - "Correlation length scale in meters"
rconfig real timescale_spp_pbl namelist,stoch max_domains 21600.0 - "Decorrelation time scale in s"
rconfig integer vertstruc_spp_pbl namelist,stoch 1 0 - "vertical structure for random perturb: 0=constant, 1=random phase"
rconfig integer vertstruc_spp_pbl namelist,stoch 1 0 - "vertical structure for random perturb: 0=constant, 1=random phase"
rconfig integer iseed_spp_pbl namelist,stoch 1 217 - "ISEED_RAND_PERT" "RANDOM SEED FOR RAND_PERT " ""


Expand All @@ -167,7 +167,7 @@ rconfig real gridpt_stddev_spp_lsm namelist,stoch max_domains
rconfig real stddev_cutoff_spp_lsm namelist,stoch max_domains 3.0 - "cutoff tails of pdf above this threshold standard deviation"
rconfig real lengthscale_spp_lsm namelist,stoch max_domains 50000.0 - "Correlation length scale in meters"
rconfig real timescale_spp_lsm namelist,stoch max_domains 86400.0 - "Decorrelation time scale in s"
rconfig integer vertstruc_spp_lsm namelist,stoch 1 0 - "vertical structure for random perturb: 0=constant, 1=random phase"
rconfig integer vertstruc_spp_lsm namelist,stoch 1 0 - "vertical structure for random perturb: 0=constant, 1=random phase"
rconfig integer iseed_spp_lsm namelist,stoch 1 317 - "ISEED_RAND_PERT" "RANDOM SEED FOR RAND_PERT " ""

# Derived namelist parameters used in share/module_check_amundo.F
Expand All @@ -177,6 +177,7 @@ rconfig integer sppt_on derived 1 0 - "sp
rconfig integer spp_on derived 1 0 - "skebs_on" "skebs arrays are declared&filled for all domains" ""
rconfig integer rand_perturb_on derived 1 0 - "rand_perturb_on " "random perturb. array is declared&filled for all domains" ""
rconfig integer num_stoch_levels derived 1 1 - "num_stoch_levels" "number of vertical levels of random fields" ""
rconfig integer seed_dim derived 1 0 - "seed_dim" "output of CALL RANDOM_SEED(SIZE=seed_dim)" ""

# Package declarations

Expand Down
2 changes: 1 addition & 1 deletion arch/configure.defaults
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ OMP = # -homp
OMPCC = # -homp
SFC = ftn $(NOOMP)
SCC = cc
CCOMP = gcc
CCOMP = cc
DM_FC = ftn $(NOOMP)
DM_CC = cc
FC = $(DM_FC)
Expand Down
5 changes: 3 additions & 2 deletions clean
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ endif

( cd inc ; /bin/rm -f *.inc namelist.default )

find . -name \*.dSYM -exec rm -rf {} \; >& /dev/null

set echo
set arg="$1"
if ( "$arg" == '-a' || "$arg" == '-aa' ) then
if ( -d var ) then
Expand Down Expand Up @@ -64,7 +64,8 @@ if ( "$arg" == '-a' || "$arg" == '-aa' ) then
*/kernels.asc_s_0_03_0_9 */bulkradii.asc_s_0_03_0_9 */bulkdens.asc_s_0_03_0_9 \
*/constants.asc */p3_lookup_table_1.dat \
*/masses.asc */kernels_z.asc */capacity.asc */termvels.asc */coeff_p.asc */coeff_q.asc \
*/gribmap.txt */tr??t?? */co2_trans */namelist.output ) >& /dev/null
*/gribmap.txt */tr??t?? */co2_trans */namelist.output */ishmael-gamma-tab.bin \
*/ishmael-qi-qc.bin */ishmael-qi-qr.bin ) >& /dev/null
else if ( "$arg" == '-aa' ) then
/bin/rm -f configure.wrf.backup
/bin/rm -f Registry/Registry.backup
Expand Down

0 comments on commit e883b53

Please sign in to comment.