Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v4.7.0 #2172

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b7f31dc
2024 Updates and Bug Fixes for the P-X LSM (#2023)
coastwx Mar 27, 2024
754f0e5
Merge branch 'master' of github.com:wrf-model/WRF into develop
islas May 9, 2024
bb791e7
fixed redistribution between GOCART dust/sea salt and MOZAIC bins (#2…
saneku Oct 10, 2024
b3eebb3
Update how fogdes identifies land use type (#2110)
WQadam Oct 14, 2024
75a6ff2
Merge remote-tracking branch 'origin/master' into develop
islas Oct 16, 2024
5dd2c19
CMake confcheck switch to try_* functions (#2090)
islas Dec 20, 2024
f096921
Fix typo in cmake find netCDF causing failure on blank responses (#2135)
islas Dec 20, 2024
c2e121f
CMake sanitize leading define flag (#2130)
islas Dec 20, 2024
f204246
CMake Add documentation to custom defined properties (#2131)
islas Dec 20, 2024
0ccba14
Call `project()` before before `enable_language()` in CmakeLists.txt …
Quba1 Dec 20, 2024
4889c3c
CMake Correctly set generated property on autogen source code (#2132)
islas Dec 20, 2024
b6542b0
CMake set release flags properly (#2138)
islas Dec 20, 2024
695f455
CMake WRFPLUS (#2089)
islas Jan 2, 2025
7195dc2
Add manage externals to access MMM-physics repo (#2126)
weiwangncar Jan 9, 2025
5b09725
CMake Fix split command flags to be correctly populated (#2108)
islas Jan 10, 2025
7042598
Consistent double precision definitions (#2099)
islas Jan 11, 2025
6d1db68
hydro: reservoir, reach lakes, style guide cleanup (#2146)
scrasmussen Jan 16, 2025
d96478d
Bug fix for overwriting of LCZ urban cells in LU_INDEX with default U…
lpilz Jan 17, 2025
de213c9
Add RCON Microphysics (#2144)
rconrick Jan 23, 2025
30a16a1
fixed defs for adap time step namelist vars in README.namelist (#2158)
kkeene44 Jan 23, 2025
b26e645
CMake Chem and Chem+KPP Build (#2018)
islas Jan 24, 2025
fd079bf
Update Noah-MP tag for v4.7 with bug fixes (#2160)
cenlinhe Jan 29, 2025
3834765
Implementation of MYNN-EDMF submodule (#2148)
joeolson42 Jan 29, 2025
70855a7
Correction of stability functions for the tke-epsilon-tpe PBL schem…
andreazonato Jan 29, 2025
6741f01
Add incremental analysis update capability (#2151)
weiwangncar Jan 29, 2025
a0144bd
CMake Fix RCON Microphysics (#2162)
islas Jan 29, 2025
94aa27a
Fix memory leaks identified by a PGI compiler (#2139)
likeuclinux Feb 4, 2025
33ce70c
Fix access violation crash (#2137)
likeuclinux Feb 5, 2025
af81014
Determine MPI Data Types in col_on_comm() & dst_on_comm() to preven…
benkirk Feb 5, 2025
61d1c84
When write_hist_at_0h_rst=.true., will now apply to user-def streams …
jhruppert Feb 5, 2025
5fc76c5
Adding udm microphysics as option 27 (#2147)
dudhia Feb 5, 2025
a321883
Corrections for tipping bucket and nudging in very long simulations (…
tlspero Feb 7, 2025
89ba518
Add dzstretch_u and dzbot to namelist.input in test/em_real/ (#2165)
weiwangncar Feb 7, 2025
e222560
Fix CMake build for UDM Microphysics (#2164)
islas Feb 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule ".ci/hpc-workflows"]
path = .ci/hpc-workflows
url = https://github.com/islas/hpc-workflows
[submodule "phys/MYNN-EDMF"]
path = phys/MYNN-EDMF
url = https://github.com/NCAR/MYNN-EDMF
85 changes: 69 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required( VERSION 3.20 )
cmake_policy( SET CMP0118 NEW )

project( WRF )

enable_language( C )
enable_language( CXX )
enable_language( Fortran )

project( WRF )
set( EXPORT_NAME ${PROJECT_NAME} )

if ( DEFINED CMAKE_TOOLCHAIN_FILE )
Expand All @@ -14,6 +14,11 @@ if ( DEFINED CMAKE_TOOLCHAIN_FILE )
# include( ${WRF_CONFIG} )
endif()

# Import default flags now, get rid of any imported release flag
# we will handle that ourselves with WRF_FCOPTIM/WRF_FCNOOPT
set( CMAKE_Fortran_FLAGS_RELEASE "" CACHE STRING "" FORCE )
set( CMAKE_C_FLAGS_RELEASE "" CACHE STRING "" FORCE )

# list( APPEND CMAKE_MODULE_PATH )
list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/ ${PROJECT_SOURCE_DIR}/cmake/modules )

Expand Down Expand Up @@ -213,6 +218,13 @@ set( DWORDSIZE 8 )
set( LWORDSIZE 4 )


# To limit the KPP generation to not consume copious amounts of RAM
if ( NOT DEFINED MAX_KPP_GEN_THREADS )
# 1 thread takes about 4.75 GB
set( MAX_KPP_GEN_THREADS 2 )
endif()


########################

################################################################################
Expand Down Expand Up @@ -254,6 +266,7 @@ endif()

if ( ${ENABLE_KPP} AND NOT ${ENABLE_CHEM} )
message( WARNING "ENABLE_KPP requires ENABLE_CHEM but is not set, ignoring" )
set( ENABLE_KPP OFF CACHE BOOL "Force ignore by configuration" FORCE )
endif()


Expand Down Expand Up @@ -315,6 +328,29 @@ if ( ${USE_IPO} )
endif()



################################################################################
##
## Checkout external repositories using manage_externals
##
################################################################################
message( STATUS "Checking out external repos via manage_externals" )
set( LOG_FILE ${CMAKE_CURRENT_BINARY_DIR}/checkout_externals.log )
execute_process(
COMMAND
${PROJECT_SOURCE_DIR}/tools/manage_externals/checkout_externals --externals ${PROJECT_SOURCE_DIR}/arch/Externals.cfg
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
RESULT_VARIABLE MANAGE_EXTERNALS_STATUS
OUTPUT_FILE ${LOG_FILE}
ERROR_FILE ${LOG_FILE}
)
if ( ${MANAGE_EXTERNALS_STATUS} AND NOT ${MANAGE_EXTERNALS_STATUS} EQUAL 0 )
message( FATAL_ERROR "Failed to checkout external repos via manage_externals" )
else()
message( STATUS "Finished checking out external repos via manage_externals" )
endif()


################################################################################
##
## Create our flags / defines properties and variables to carry our information
Expand Down Expand Up @@ -377,23 +413,20 @@ if ( ${USE_MPI} )
# Which may or may not get polluted by the environment
# It still technically finds MPI but the output is nonintuitive
# saying things like hdf5 or pthread
find_package( MPI REQUIRED COMPONENTS Fortran C )
list( APPEND PROJECT_COMPILE_DEFINITIONS_OPTIONS
USE_MPI=1
DM_PARALLEL
)

# Supply any language-specific flags for interrogation
if ( DEFINED WRF_MPI_Fortran_FLAGS AND NOT "${WRF_MPI_Fortran_FLAGS}" STREQUAL "" )
list( APPEND PROJECT_COMPILE_OPTIONS_OPTIONS
$<$<COMPILE_LANGUAGE:Fortran>:${WRF_MPI_Fortran_FLAGS}>
)
set( MPI_Fortran_COMPILER_FLAGS ${WRF_MPI_Fortran_FLAGS} )
endif()

if ( DEFINED WRF_MPI_C_FLAGS AND NOT "${WRF_MPI_C_FLAGS}" STREQUAL "" )
list( APPEND PROJECT_COMPILE_OPTIONS_OPTIONS
$<$<COMPILE_LANGUAGE:C>:${WRF_MPI_C_FLAGS}>
)
set( MPI_C_COMPILER_FLAGS ${WRF_MPI_C_FLAGS} )
endif()
find_package( MPI REQUIRED COMPONENTS Fortran C )
list( APPEND PROJECT_COMPILE_DEFINITIONS_OPTIONS
USE_MPI=1
DM_PARALLEL
)

# Check if MPI in all its glory has forced IPO down our throats due to hard-coding the wrapper flags
# https://www.open-mpi.org/faq/?category=mpi-apps#why-no-rpath LOL!
Expand Down Expand Up @@ -472,6 +505,19 @@ if ( ${ENABLE_CTSM} )
# find_package( CTSM REQUIRED )
endif()

if ( ${ENABLE_KPP} )
find_package( BISON REQUIRED )
find_package( FLEX REQUIRED )
if ( ${FLEX_FOUND} AND "${FLEX_LIBRARIES}" STREQUAL "FL_LIBRARY-NOTFOUND" )
message( FATAL_ERROR
"Flex executable found, but libraries were not. Please provide a searchable path for both "
"\n"
"Refer to https://cmake.org/cmake/help/latest/command/find_package.html for more info "
"on providing a suitable path"
)
endif()
endif()

# Will need our own finder
# find_package( GPFS REQUIRED )

Expand Down Expand Up @@ -678,10 +724,13 @@ list( APPEND PROJECT_COMPILE_DEFINITIONS_OPTIONS
# Only define if set, this is to use #ifdef/#ifndef preprocessors
# in code since cmake cannot handle basically any others :(
# https://gitlab.kitware.com/cmake/cmake/-/issues/17398
if ( ${USE_DOUBLE} )
list( APPEND PROJECT_COMPILE_DEFINITIONS_OPTIONS DOUBLE_PRECISION )
endif()
if ( ${ENABLE_CHEM} )
list( APPEND PROJECT_COMPILE_DEFINITIONS_OPTIONS WRF_CHEM=1 )
list( APPEND PROJECT_COMPILE_DEFINITIONS_OPTIONS WRF_CHEM )
if ( ${ENABLE_KPP} )
list( APPEND PROJECT_COMPILE_DEFINITIONS_OPTIONS WRF_KPP=1 )
list( APPEND PROJECT_COMPILE_DEFINITIONS_OPTIONS WRF_KPP )
endif()
endif()
if ( ${ENABLE_CHEM} )
Expand Down Expand Up @@ -914,14 +963,18 @@ add_subdirectory( share )
add_subdirectory( frame )
add_subdirectory( inc )

if ( ${WRF_CHEM} )
if ( ${ENABLE_CHEM} )
add_subdirectory( chem )
endif()

if ( ${ENABLE_HYDRO} )
add_subdirectory( hydro )
endif()

if ( ${WRF_CORE} STREQUAL "PLUS" )
add_subdirectory( wrftladj )
endif()

add_subdirectory( dyn_em )


Expand Down
18 changes: 16 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,20 @@ wrf : framework_only
echo "NoahMP submodule files populating WRF directories" ; \
echo "------------------------------------------------------------------------------" ; \
fi
if [ \( ! -f phys/module_bl_mynnedmf.F \) -o \
\( ! -f phys/module_bl_mynnedmf_common.F \) -o \
\( ! -f phys/module_bl_mynnedmf_common.F \) ] ; then \
echo " " ; \
echo "------------------------------------------------------------------------------" ; \
echo "Error Error Error MYNN-EDMF submodule files not populating WRF directories" ; \
echo "------------------------------------------------------------------------------" ; \
echo " " ; \
exit 31 ; \
else \
echo "------------------------------------------------------------------------------" ; \
echo "MYNN-EDMF submodule files populating WRF directories" ; \
echo "------------------------------------------------------------------------------" ; \
fi
if [ $(WRF_CHEM) -eq 1 ] ; then $(MAKE) MODULE_DIRS="$(ALL_MODULES)" chemics ; fi
if [ $(WRF_EM_CORE) -eq 1 ] ; then $(MAKE) MODULE_DIRS="$(ALL_MODULES)" em_core ; fi
if [ $(WRF_HYDRO) -eq 1 ] ; then $(MAKE) MODULE_DIRS="$(ALL_MODULES)" wrf_hydro ; fi
Expand Down Expand Up @@ -595,7 +609,7 @@ em_real : wrf
ln -sf ../../run/ishmael-qi-qr.bin . ; \
ln -sf ../../run/BROADBAND_CLOUD_GODDARD.bin . ; \
ln -sf ../../run/STOCHPERT.TBL . ; \
if [ $(RWORDSIZE) -eq 8 ] ; then \
if [ -n "$(DOUBLE_PRECISION)" ] ; then \
ln -sf ../../run/ETAMPNEW_DATA_DBL ETAMPNEW_DATA ; \
ln -sf ../../run/ETAMPNEW_DATA.expanded_rain_DBL ETAMPNEW_DATA.expanded_rain ; \
ln -sf ../../run/RRTM_DATA_DBL RRTM_DATA ; \
Expand Down Expand Up @@ -677,7 +691,7 @@ em_real : wrf
ln -sf ../../run/ishmael-qi-qr.bin . ; \
ln -sf ../../run/BROADBAND_CLOUD_GODDARD.bin . ; \
ln -sf ../../run/STOCHPERT.TBL . ; \
if [ $(RWORDSIZE) -eq 8 ] ; then \
if [ -n "$(DOUBLE_PRECISION)" ] ; then \
ln -sf ../../run/ETAMPNEW_DATA_DBL ETAMPNEW_DATA ; \
ln -sf ../../run/ETAMPNEW_DATA.expanded_rain_DBL ETAMPNEW_DATA.expanded_rain ; \
ln -sf ../../run/RRTM_DATA_DBL RRTM_DATA ; \
Expand Down
16 changes: 12 additions & 4 deletions Registry/Registry.EM_COMMON
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,6 @@ state real sub_thl3D ikj misc 1 - h "s
state real sub_sqv3D ikj misc 1 - h "sub_sqv3D" "qv subsidence tendency from EDMF" "kg kg-1 s-1"
state real det_thl3D ikj misc 1 - h "det_thl3D" "thetaL detrainment tendency from EDMF" "K s-1"
state real det_sqv3D ikj misc 1 - h "det_sqv3D" "qv detrainment tendency from EDMF" "kg kg-1 s-1"
state integer ktop_plume ij misc 1 - h "ktop_plume" "k-level of highest pentrating plume" ""
state real maxMF ij misc 1 - h "maxMF" "Maximum mass-flux (neg: all dry, pos: moist)" "m/s * area"
state real maxwidth ij misc 1 - h "maxwidth" "Maximum plume width" "m"
state real ztop_plume ij misc 1 - h "ztop_plume" "Height of tallest plume" "m"
Expand Down Expand Up @@ -2476,7 +2475,7 @@ rconfig integer bl_mynn_mixlength namelist,physics 1 1
rconfig integer bl_mynn_edmf namelist,physics max_domains 1 irh "bl_mynn_edmf" "0:off,1:activate mass-flux in mynn" ""
rconfig integer bl_mynn_edmf_mom namelist,physics max_domains 1 irh "bl_mynn_edmf_mom" "0:off,1:activate mass-flux transport of momentum" ""
rconfig integer bl_mynn_edmf_tke namelist,physics max_domains 0 irh "bl_mynn_edmf_tke" "0:off,1:activate mass-flux transport of tke" ""
rconfig integer bl_mynn_mixscalars namelist,physics max_domains 0 irh "bl_mynn_mixscalars" "0:off,1:activate mixing of scalars (qnx, qnxfa) in MYNN" ""
rconfig integer bl_mynn_mixscalars namelist,physics max_domains 1 irh "bl_mynn_mixscalars" "0:off,1:activate mixing of scalars (qnx, qnxfa) in MYNN" ""
rconfig integer bl_mynn_output namelist,physics max_domains 0 irh "bl_mynn_output" "0:off,1:Allocate and output extra 3D arrays" ""
rconfig integer bl_mynn_cloudmix namelist,physics max_domains 1 irh "bl_mynn_cloudmix" "0:off,1:activate mixing of all cloud species" ""
rconfig integer bl_mynn_mixqt namelist,physics max_domains 0 irh "bl_mynn_mixqt" "0:mix moisture species separate,1: mix total water" ""
Expand Down Expand Up @@ -3033,6 +3032,7 @@ package wdm6scheme mp_physics==16 - moist:qv,qc
package nssl_2mom mp_physics==18 - moist:qv,qc,qr,qi,qs,qg
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 udmscheme mp_physics==27 - moist:qv,qc,qr,qi,qs,qg,qh;scalar:qnn,qnc,qnr;state:re_cloud,re_ice,re_snow
package thompsonaero mp_physics==28 - moist:qv,qc,qr,qi,qs,qg;scalar:qni,qnr,qnc,qnwfa,qnifa,qnbca;state:re_cloud,re_ice,re_snow,qnwfa2d,qnifa2d,taod5503d,taod5502d
package thompsongh mp_physics==38 - moist:qv,qc,qr,qi,qs,qg;scalar:qni,qnr,qnc,qng,qvolg,qnwfa,qnifa,qnbca;state:re_cloud,re_ice,re_snow,qnwfa2d,qnifa2d,taod5503d,taod5502d
package p3_1category mp_physics==50 - moist:qv,qc,qr,qi;scalar:qni,qnr,qir,qib;state:re_cloud,re_ice,vmi3d,rhopo3d,di3d,refl_10cm,th_old,qv_old
Expand All @@ -3045,7 +3045,8 @@ package ntu mp_physics==56 - moist:qv,qc
package etampnew mp_physics==95 - moist:qv,qc,qr,qs;scalar:qt;state:f_ice_phy,f_rain_phy,f_rimef_phy
package gsfcgcescheme mp_physics==97 - moist:qv,qc,qr,qi,qs,qg
package madwrf_mp mp_physics==96 - moist:qv,qc,qi,qs

package rcon_mp_scheme mp_physics==29 - moist:qv,qc,qr,qi,qs,qg;scalar:qni,qnr,qnc,qnwfa,qnifa,qnbca;state:re_cloud,re_ice,re_snow,qnwfa2d,qnifa2d,taod5503d,taod5502d,cloudnc

package nssl2mconc nssl_2moment_on==1 - scalar:qndrop,qnr,qni,qns,qng;state:re_cloud,re_ice,re_snow
package nssl3mg nssl_3moment==1 - scalar:qzr,qzg
package nssl3m nssl_3moment==2 - scalar:qzr,qzg,qzh
Expand Down Expand Up @@ -3087,6 +3088,7 @@ package nssl_2mom_dfi mp_physics_dfi==18 - dfi_moist:dfi
#package nssl_2momg_dfi mp_physics_dfi==22 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qndrop,dfi_qnr,dfi_qni,dfi_qns,dfi_qng,dfi_qvolg;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 udmscheme_dfi mp_physics_dfi==27 - 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 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,dfi_qnbca;state:dfi_re_cloud,dfi_re_ice,dfi_re_snow
package thompsongh_dfi mp_physics_dfi==38 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qni,dfi_qnr,dfi_qng,dfi_qvolg,dfi_qnc,dfi_qnwfa,dfi_qnifa,dfi_qnbca;state:dfi_re_cloud,dfi_re_ice,dfi_re_snow
package p3_1category_dfi mp_physics_dfi==50 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi;dfi_scalar:dfi_qni,dfi_qnr,dfi_qir,dfi_qib;state:dfi_re_cloud,dfi_re_ice
Expand All @@ -3097,6 +3099,7 @@ package jensen_ishmael_dfi mp_physics_dfi==55 - dfi_moist:dfi
package ntu_dfi mp_physics_dfi==56 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg,dfi_qh;dfi_scalar:dfi_qnc,dfi_qnr,dfi_qni,dfi_qns,dfi_qng,dfi_qnh,dfi_qdcn,dfi_qtcn,dfi_qccn,dfi_qrcn,dfi_qnin,dfi_fi,dfi_fs,dfi_vi,dfi_vs,dfi_vg,dfi_ai,dfi_as,dfi_ag,dfi_ah,dfi_i3m
package etampnew_dfi mp_physics_dfi==95 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qs;dfi_scalar:dfi_qt
package gsfcgcescheme_dfi mp_physics_dfi==97 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg
package rcon_dfi mp_physics_dfi==29 - 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,dfi_qnbca;state:dfi_re_cloud,dfi_re_ice,dfi_re_snow

package noprogn progn==0 - -
package progndrop progn==1 - scalar:qndrop;dfi_scalar:dfi_qndrop;state:qndropsource
Expand Down Expand Up @@ -3177,7 +3180,7 @@ package kepsscheme bl_pbl_physics==17 - scalar:tke_ad
package mrfscheme bl_pbl_physics==99 - -

package tkebudget tke_budget==1 - state:qSHEAR,qBUOY,qDISS,qWT,dqke
package mynn_dmp_edmf bl_mynn_edmf==1 - state:ktop_plume,ztop_plume,maxmf,maxwidth
package mynn_dmp_edmf bl_mynn_edmf==1 - state:ztop_plume,maxmf,maxwidth
package mynn_3Doutput bl_mynn_output==1 - state:edmf_a,edmf_w,edmf_thl,edmf_qt,edmf_ent,edmf_qc,sub_thl3D,sub_sqv3D,det_thl3D,det_sqv3D
package pbl_cloud icloud_bl==1 - state:cldfra_bl,qc_bl,qi_bl

Expand Down Expand Up @@ -3654,3 +3657,8 @@ rconfig integer windfarm_wake_model namelist,physics max_domai
# wake overlap method, M1, M2, M3, M4 [1, 2, 3, 4]
rconfig integer windfarm_overlap_method namelist,physics max_domains 4 rh "windfarm_overlap_method" "" ""
rconfig real windfarm_deg namelist,physics max_domains 0 - "windfarm_deg" "for windfarm ideal case" "degree"


# outputs for RCON model.
state real CLOUDNC ij misc 1 - rh "CLOUDNC" "ACCUMULATED TOTAL GRID SCALE CLOUD PRECIPITATION" "mm"

14 changes: 14 additions & 0 deletions Registry/Registry.EM_COMMON.var
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,20 @@ state real QFX ij misc 1 - irh "Q
state real REGIME ij misc 1 - irh "REGIME" "FLAGS: 1=Night/Stable, 2=Mechanical Turbulent, 3=Forced Conv, 4=Free Conv" ""
state integer KPBL ij misc 1 - irh "KPBL" "LEVEL OF PBL TOP" ""

# Increment Output
state real u_iau ijk dyn_em 1 X ih5 "U_IAU" "x-wind component inc" "m s-1"
state real v_iau ijk dyn_em 1 Y ih5 "V_IAU" "y-wind component inc" "m s-1"
state real t_iau ijk dyn_em 1 - ih5 "T_IAU" "potential temp inc" "K"
state real w_iau ijk dyn_em 1 - ih5 "W_IAU" "z-wind component inc" "m s-1"
state real qv_iau ijk dyn_em 1 - ih5 "QV_IAU" "water water mixing ratio inc" "kg kg-1"
state real qc_iau ijk dyn_em 1 - ih5 "QC_IAU" "cloud water mixing ratio inc" "kg kg-1"
state real qr_iau ijk dyn_em 1 - ih5 "QR_IAU" "rain water mixing ratio inc" "kg kg-1"
state real qi_iau ijk dyn_em 1 - ih5 "QI_IAU" "ice water mixing ratio inc" "kg kg-1"
state real qs_iau ijk dyn_em 1 - ih5 "QS_IAU" "snow water mixing ratio inc" "kg kg-1"
state real qg_iau ijk dyn_em 1 - ih5 "QG_IAU" "graupel mixing ratio inc" "kg kg-1"
state real ph_iau ijk dyn_em 1 - ih5 "PH_IAU" "perturbation geopotential inc" "m2 s-2"
state real mu_iau ij dyn_em 1 - ih5 "MU_IAU" "dry air mass inc" "pa"

#
#---------------------------------------------------------------------------------------------------------------------------------------
#
Expand Down
2 changes: 1 addition & 1 deletion Registry/Registry.wrfvar
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ state real - ijkft g_scalar 1 - - -

state real landmask ij misc 1 - i012rhd=(interp_fcnm)u=(copy_fcnm) "LANDMASK" "LAND MASK (1 FOR LAND, 0 FOR WATER)" ""

state real SST ij misc 1 - i01245rh05d=(interp_mask_water_field:lu_index,iswater) "SST" "SEA SURFACE TEMPERATURE" "K"
state real SST ij misc 1 - i01245rd=(interp_mask_water_field:lu_index,iswater) "SST" "SEA SURFACE TEMPERATURE" "K"

# Registry entries that are exclusive to Registry.EM

Expand Down
1 change: 1 addition & 0 deletions Registry/registry.em_shared_collection
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ include registry.new3d_wif
include registry.trad_fields
include registry.solar_fields
include registry.diags
include registry.iau
include registry.CMAQ
Loading