Skip to content

Commit

Permalink
Merge branch 'develop' into quiet-compiler-warnings-registry
Browse files Browse the repository at this point in the history
  • Loading branch information
@DWesl
DWesl authored Jan 25, 2024
2 parents 3825bb3 + 240c6f3 commit 35dfa23
Show file tree
Hide file tree
Showing 111 changed files with 18,646 additions and 5,089 deletions.
19 changes: 19 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,22 @@
configure.wrf*
*.backup
*.f90

# Out-of-source build locations
_build*
wrf_config.cmake

# Executables when not featuring .exe suffix
ndown
real
tc
ideal
wrf

# Model inputs/outputs
wrfbdy_d*
wrfinput_d*
wrfout_d*
*.nc
rsl.out.*
rsl.error.*
85 changes: 64 additions & 21 deletions Registry/Registry.EM_COMMON
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Registry/registry.chem
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ state real setvel_1 ij misc 1 - r "set
state real setvel_2 ij misc 1 - r "setvel_2" "dust gravitational settling velocity for size 2" "m/s"
state real setvel_3 ij misc 1 - r "setvel_3" "dust gravitational settling velocity for size 3" "m/s"
state real setvel_4 ij misc 1 - r "setvel_4" "dust gravitational settling velocity for size 4" "m/s"
state real setvel_5 ij misc 1 - r "setvel_5" "effective gravitational settling velocity for total" "m/s"
state real setvel_5 ij misc 1 - r "setvel_5" "dust gravitational settling velocity for size 5" "m/s"
state real dustgraset_1 ij misc 1 - r "graset_1" "Accumulated dust gravitational settling for size 1" "kg/m2"
state real dustgraset_2 ij misc 1 - r "graset_2" "Accumulated dust gravitational settling for size 2" "kg/m2"
state real dustgraset_3 ij misc 1 - r "graset_3" "Accumulated dust gravitational settling for size 3" "kg/m2"
Expand Down
18 changes: 8 additions & 10 deletions Registry/registry.var
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ rconfig logical use_amsr2obs namelist,wrfvar4 1 .false. - "use
rconfig logical use_ahiobs namelist,wrfvar4 1 .false. - "use_ahiobs" "" ""
rconfig logical use_gmiobs namelist,wrfvar4 1 .false. - "use_gmiobs" "" ""
rconfig logical use_goesimgobs namelist,wrfvar4 1 .false. - "use_goesimgobs" "" ""
rconfig logical use_goesabiobs namelist,wrfvar4 1 .false. - "use_goesabiobs" "" ""
rconfig logical use_kma1dvar namelist,wrfvar4 1 .false. - "use_kma1dvar" "" ""
rconfig logical use_filtered_rad namelist,wrfvar4 1 .false. - "use_filtered_rad" "" ""
rconfig logical use_obs_errfac namelist,wrfvar4 1 .false. - "use_obs_errfac" "" ""
Expand Down Expand Up @@ -468,6 +469,7 @@ rconfig integer varbc_nobsmin namelist,wrfvar14 1 10 - "va
rconfig integer use_clddet namelist,wrfvar14 1 2 - "use_clddet" "0: off, 1: mmr, 2: pf, 3: ecmwf" ""
rconfig logical use_clddet_zz namelist,wrfvar14 1 .false. - "use_clddet_zz" "cloud detection scheme from Zhuge X. and Zou X. JAMC, 2016." ""
rconfig integer ahi_superob_halfwidth namelist,wrfvar14 1 0 - "ahi_superob_halfwidth" "" ""
rconfig integer abi_superob_halfwidth namelist,wrfvar14 1 0 - "abi_superob_halfwidth" "" ""
rconfig logical airs_warmest_fov namelist,wrfvar14 1 .false. - "airs_warmest_fov" "" ""
rconfig logical use_satcv namelist,wrfvar14 2 .false. - "use_satcv" "" ""
rconfig logical use_blacklist_rad namelist,wrfvar14 1 .true. - "use_blacklist_rad" "" ""
Expand All @@ -477,6 +479,7 @@ rconfig character crtm_irwater_coef namelist,wrfvar14 1 "Nalli.IRwater
rconfig character crtm_mwwater_coef namelist,wrfvar14 1 "FASTEM5.MWwater.EmisCoeff.bin" - "crtm_mwwater_coef" "" ""
rconfig character crtm_irland_coef namelist,wrfvar14 1 "USGS.IRland.EmisCoeff.bin" - "crtm_irland_coef" "" ""
rconfig character crtm_visland_coef namelist,wrfvar14 1 "USGS.VISland.EmisCoeff.bin" - "crtm_visland_coef" "" ""
rconfig logical abi_use_symm_obs_err namelist,wrfvar14 1 .false. - "abi_use_symm_obs_err" "" ""
rconfig logical ahi_use_symm_obs_err namelist,wrfvar14 1 .false. - "ahi_use_symm_obs_err" "" ""
rconfig logical ahi_apply_clrsky_bias namelist,wrfvar14 1 .false. - "ahi_apply_clrsky_bias" "" ""
rconfig integer num_pseudo namelist,wrfvar15 1 0 - "num_pseudo" "" ""
Expand Down Expand Up @@ -590,11 +593,8 @@ package cammgmpscheme mp_physics==11 - moist:qv,qc
package sbu_ylinscheme mp_physics==13 - moist:qv,qc,qr,qi,qs
package wdm5scheme mp_physics==14 - moist:qv,qc,qr,qi,qs
package wdm6scheme mp_physics==16 - moist:qv,qc,qr,qi,qs,qg
package nssl_2mom mp_physics==17 - moist:qv,qc,qr,qi,qs,qg,qh
package nssl_2momccn mp_physics==18 - moist:qv,qc,qr,qi,qs,qg,qh
package nssl_1mom mp_physics==19 - moist:qv,qc,qr,qi,qs,qg,qh
package nssl_1momlfo mp_physics==21 - moist:qv,qc,qr,qi,qs,qg
package nssl_2momg mp_physics==22 - moist:qv,qc,qr,qi,qs,qg
# Note: Options 17, 19, 21, 22 are deprecated but still reserved for compatibility -- for now
package nssl_2mom mp_physics==18 - moist:qv,qc,qr,qi,qs,qg
package thompsonaero mp_physics==28 - moist:qv,qc,qr,qi,qs,qg
package p3_1category mp_physics==50 - moist:qv,qc,qr,qi
package p3_1category_nc mp_physics==51 - moist:qv,qc,qr,qi
Expand All @@ -604,6 +604,7 @@ package ntu mp_physics==56 - moist:qv,qc
package etampnew mp_physics==95 - moist:qv,qc,qr,qs
package lscondscheme mp_physics==98 - moist:qv
package mkesslerscheme mp_physics==99 - moist:qv,qc,qr

#
package mpnotset_4dvar mp_physics_4dvar==-1 - g_moist:g_qv;a_moist:a_qv
package passiveqv_4dvar mp_physics_4dvar==0 - g_moist:g_qv;a_moist:a_qv
Expand All @@ -623,11 +624,8 @@ package cammgmp_4dvar mp_physics_4dvar==11 - g_moist:g_q
package sbu_ylin_4dvar mp_physics_4dvar==13 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs
package wdm5_4dvar mp_physics_4dvar==14 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs
package wdm6_4dvar mp_physics_4dvar==16 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg
package nssl_2mom_4dvar mp_physics_4dvar==17 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg,g_qh;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg,a_qh
package nssl_2momccn_4dvar mp_physics_4dvar==18 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg,g_qh;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg,a_qh
package nssl_1mom_4dvar mp_physics_4dvar==19 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg,g_qh;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg,a_qh
package nssl_1momlfo_4dvar mp_physics_4dvar==21 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg
package nssl_2momg_4dvar mp_physics_4dvar==22 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg
# Note: Options 17, 19, 21, 22 are deprecated but still reserved for compatibility -- for now
package nssl_2mom_4dvar mp_physics_4dvar==18 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg,g_qh;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg,a_qh
package thompsonaero_4dvar mp_physics_4dvar==28 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg
package p3_1category_4dvar mp_physics_4dvar==50 - g_moist:g_qv,g_qc,g_qr,g_qi;a_moist:a_qv,a_qc,a_qr,a_qi
package p3_1category_nc_4dvar mp_physics_4dvar==51 - g_moist:g_qv,g_qc,g_qr,g_qi;a_moist:a_qv,a_qc,a_qr,a_qi
Expand Down
6 changes: 1 addition & 5 deletions Registry/registry.wrfplus
View file
Original file line number Diff line number Diff line change
Expand Up @@ -872,11 +872,7 @@ package cammgmp_plus mp_physics_plus==11 - g_moist:g_qv,
package sbu_ylin_plus mp_physics_plus==13 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs
package wdm5_plus mp_physics_plus==14 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs
package wdm6_plus mp_physics_plus==16 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg
package nssl_2mom_plus mp_physics_plus==17 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg,g_qh;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg,a_qh
package nssl_2momccn_plus mp_physics_plus==18 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg,g_qh;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg,a_qh
package nssl_1mom_plus mp_physics_plus==19 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg,g_qh;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg,a_qh
package nssl_1momlfo_plus mp_physics_plus==21 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg
package nssl_2momg_plus mp_physics_plus==22 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg
package nssl_2mom_plus mp_physics_plus==18 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg,g_qh;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg,a_qh
package thompsonaero_plus mp_physics_plus==28 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg
package p3_1category_plus mp_physics_plus==50 - g_moist:g_qv,g_qc,g_qr,g_qi;a_moist:a_qv,a_qc,a_qr,a_qi
package p3_1category_nc_plus mp_physics_plus==51 - g_moist:g_qv,g_qc,g_qr,g_qi;a_moist:a_qv,a_qc,a_qr,a_qi
Expand Down
4 changes: 2 additions & 2 deletions chem/chemics_init.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ subroutine chem_init (id,chem,emis_ant,scalar,dt,bioemdt,photdt,chemdt,stepbioe,
call wrf_error_fatal("ERROR: wet scavenging option requires chem_opt = 8 through 13 or 31 to 36 or 41 to 42 or 109 or 503 or 504 or 601 or 611 to function.")
endif
if ( config_flags%mp_physics /= 2 .and. config_flags%mp_physics /= 10 .and. config_flags%mp_physics /= 11 &
.and. config_flags%mp_physics /= 17 .and. config_flags%mp_physics /= 18 .and. config_flags%mp_physics /= 22) then
call wrf_error_fatal("ERROR: wet scavenging option requires mp_phys = 2 (Lin et al.) or 10 (Morrison) or 11 (CAMMGMP) or 17/18/22 NSSL_2mom to function.")
.and. .not. ( config_flags%mp_physics == 18 .and. config_flags%nssl_2moment_on == 1 ) ) then
call wrf_error_fatal("ERROR: wet scavenging option requires mp_phys = 2 (Lin et al.) or 10 (Morrison) or 11 (CAMMGMP) or 18 NSSL_2mom to function.")
endif
elseif( id == 1 ) then
if ( config_flags%mp_physics /= 6 .and. config_flags%mp_physics /= 8 .and. config_flags%mp_physics /= 10 .and. config_flags%mp_physics /= 17 &
Expand Down
2 changes: 1 addition & 1 deletion compile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ else
setenv BUFR 1
endif
if ( -e ${RTTOV}/lib/librttov12_main.a ) then
setenv RTTOV_LIB "-L${hdf5path}/lib -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -L${RTTOV}/lib -lrttov12_coef_io -lrttov12_emis_atlas -lrttov12_main -lrttov12_hdf"
setenv RTTOV_LIB "-L${hdf5path}/lib -lhdf5_hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -lhdf5_hl_f90cstub -lhdf5_f90cstub -lhdf5_hl_cpp -L${RTTOV}/lib -lrttov12_coef_io -lrttov12_emis_atlas -lrttov12_main -lrttov12_hdf"
else
echo "Can not find a compatible RTTOV library! Please ensure that your RTTOV build was successful,"
echo "your 'RTTOV' environment variable is set correctly, and you are using a supported version of RTTOV."
Expand Down
4 changes: 1 addition & 3 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,7 @@ if [ -n "$NETCDFPAR" ] ; then
export NETCDF4
export USENETCDFPAR
else
# Makefile assumes USENETCDFPAR is set
USENETCDFPAR="0"
export USENETCDFPAR
export USENETCDFPAR=0
fi

if test -z "$NETCDF" ; then
Expand Down
Loading

0 comments on commit 35dfa23

Please sign in to comment.