Skip to content

updating unified MYNN-EDMF driver with packaged variables #280

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.

Sign up for GitHub

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

Open
joeolson42 wants to merge 2 commits into
base: noaa/develop
Choose a base branch
from
Open

updating unified MYNN-EDMF driver with packaged variables #280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7026365
updating unified MYNN-EDMF driver with packaged variables
joeolson42 Aug 28, 2026
6b54b29
addressing copilots comments/suggestions
joeolson42 Aug 30, 2026
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
6 changes: 3 additions & 3 deletions src/core_atmosphere/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,9 @@ else()
endif()

set(ATMOSPHERE_CORE_PHYSICS_MYNN-EDMF_SOURCES
module_bl_mynnedmf.F90
MPAS/module_bl_mynnedmf_common.F90
MPAS/module_bl_mynnedmf_driver.F90
src/module_bl_mynnedmf.F90
src/MPAS/module_bl_mynnedmf_common.F90
src/module_bl_mynnedmf_driver.F90
)
list(TRANSFORM ATMOSPHERE_CORE_PHYSICS_MYNN-EDMF_SOURCES PREPEND physics/physics_noaa/MYNN-EDMF/)

Expand Down
69 changes: 33 additions & 36 deletions src/core_atmosphere/Registry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,8 @@
<package name="bl_ysu_in" description="parameterization of YSU Planetary Boundary Layer."/>
<package name="bl_mynn_in" description="parameterization of MYNN Planetary Boundary Layer."/>
<package name="bl_mynnedmf_in" description="parameterization of MYNN-EDMF Planetary Boundary Layer."/>
<package name="bl_mynnedmf_tkebudget_in" description="TKE budget variables for output in MYNN-EDMF."/>
<package name="bl_mynnedmf_output_in" description="additional diagnostic variables output in MYNN-EDMF."/>
<package name="sf_noahmp_in" description="parameterization of NOAH-MP land surface scheme."/>
<package name="bl_myj_in" description="parameterization of MYJ Planetary Boundary Layer."/>
<package name="lsm_ruc_in" description="parameterization of the RUC land surface."/>
Expand Down Expand Up @@ -2975,7 +2977,7 @@
units="-"
description="=configuration option for the calculation of z0, zt and zq over water"
possible_values="0:COARE3.0, 1:COARE3.5, 2:Davis/COARE3.5 ,3:Davis/Garratt, 4:Taylor-Yelland"/>

<nml_option name="config_radt_cld_overlap" type="character" default_value="maximum_random" in_defaults="false"
description="cloud overlapping option in the RRTMG lw and sw radiation schemes"
possible_values="`none',`random',`maximum_random',`maximum',`exponential',`'exponential_random'"/>
Expand Down Expand Up @@ -3006,8 +3008,8 @@

<nml_option name="config_mynn_closure" type="real" default_value="2.6" in_defaults="false"
units="-"
description="closure level for the MYNN TKE turbulence closure"
possible_values="2.5,2.6,3.0"/>
description="closure level for the MYNN-EDMF scheme"
possible_values="2.5,2.6,2.7,3.0"/>

<nml_option name="config_mynn_cloudpdf" type="integer" default_value="2" in_defaults="false"
units="-"
Expand All @@ -3016,7 +3018,7 @@

<nml_option name="config_mynn_mixlength" type="integer" default_value="1" in_defaults="false"
units="-"
description="mixing length in the MYNN PBL scheme"
description="mixing length option in the MYNN-EDMF scheme"
possible_values="`0: orig',`1: operational',`2: research'"/>

<nml_option name="config_mynn_stfunc" type="integer" default_value="1" in_defaults="false"
Expand Down Expand Up @@ -3060,8 +3062,8 @@

<nml_option name="config_mynn_edmf_output" type="integer" default_value="0" in_defaults="false"
units="-"
description="=0:suppress the allocation of variables needed in the EDMF option of the MYNN PBL scheme"
possible_values="0,1:updrafts,2:downdrafts"/>
description="=control the allocation/output of variables used in the MF component of the MYNN-EDMF scheme"
possible_values="0:do not allocate/output,1:updrafts,2:downdrafts"/>

<nml_option name="config_mynn_mixscalars" type="integer" default_value="0" in_defaults="false"
units="-"
Expand All @@ -3073,11 +3075,11 @@
description="=1:activate mixing of aerosols in the MYNN PBL scheme (=0 otherwise)"
possible_values="0,1"/>

<nml_option name="config_mynn_mixnumcon" type="integer" default_value="1" in_defaults="false"
<nml_option name="config_mynn_mixnumcon" type="integer" default_value="1" in_defaults="false"
units="-"
description="=1:activate mixing of number concentrations in the MYNN PBL scheme (=0 otherwise)"
possible_values="0,1"/>

<nml_option name="config_mynn_mixclouds" type="integer" default_value="1" in_defaults="false"
units="-"
description="1:activate mixing of cloud condensates in the MYNN PBL scheme"
Expand All @@ -3086,18 +3088,13 @@
<nml_option name="config_mynn_mixqt" type="integer" default_value="0" in_defaults="false"
units="-"
description="=0:activatevmixing of moisture species separately;= 1:activate mixing of total water in the mynn PBL scheme"
possible_values="0,1"/>
possible_values="0(keep=0),1"/>

<nml_option name="config_mynn_ess" type="integer" default_value="1" in_defaults="false"
<nml_option name="config_mynn_ess" type="integer" default_value="0" in_defaults="false"
units="-"
description="=0:use buoyancy-flux functions;= 1:use O-Gorman (2011)"
possible_values="0,1"/>

<nml_option name="config_icloud_bl" type="integer" default_value="1" in_defaults="false"
units="-"
description="configuration for MYNN subgrid cloud coupling to radiation"
possible_values="`0: uncoupled',`1: coupled'"/>

<nml_option name="config_spp_pbl" type="integer" default_value="0" in_defaults="false"
units="-"
description="configuration for spp boundary layer"
Expand Down Expand Up @@ -3481,63 +3478,63 @@

<var name="dqke" type="real" dimensions="nVertLevels nCells Time" units="m^{2} s^{-2}"
description="TKE change"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_tkebudget_in"/>

<var name="qbuoy" type="real" dimensions="nVertLevels nCells Time" units="m^{2} s^{-2}"
description="TKE production - buoyancy"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_tkebudget_in"/>

<var name="qdiss" type="real" dimensions="nVertLevels nCells Time" units="m^{2} s^{-2}"
description="TKE dissipation"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_tkebudget_in"/>

<var name="qshear" type="real" dimensions="nVertLevels nCells Time" units="m^{2} s^{-2}"
description="TKE production - shear"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_tkebudget_in"/>

<var name="qwt" type="real" dimensions="nVertLevels nCells Time" units="m^{2} s^{-2}"
description="TKE vertical distribution"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_tkebudget_in"/>

<var name="edmf_a" type="real" dimensions="nVertLevels nCells Time" units="unitless"
description="EDMF relative updraft area of moist updrafts in the MYNN PBL scheme"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_output_in"/>

<var name="edmf_w" type="real" dimensions="nVertLevels nCells Time" units="m s^{-1}"
description="EDMF vertical velocity of moist updrafts in the MYNN PBL scheme"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_output_in"/>

<var name="edmf_qt" type="real" dimensions="nVertLevels nCells Time" units="kg kg^{-1}"
description="EDMF total water mixing ratio in moist updrafts in the MYNN PBL scheme"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_output_in"/>

<var name="edmf_qc" type="real" dimensions="nVertLevels nCells Time" units="kg kg^{-1}"
description="EDMF liquid water mixing ratio in moist updrafts in the MYNN PBL scheme"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_output_in"/>

<var name="edmf_thl" type="real" dimensions="nVertLevels nCells Time" units="K"
description="EDMF liquid-ice water potential temperature in moist updrafts in the MYNN PBL scheme"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_output_in"/>

<var name="edmf_ent" type="real" dimensions="nVertLevels nCells Time" units="m^{-1}"
description="EDMF entrainment rate in moist updrafts in the MYNN PBL scheme"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_output_in"/>

<var name="sub_thl" type="real" dimensions="nVertLevels nCells Time" units="K s^{-1}"
description="EDMF subsidence of liquid-ice potential temperature in the MYNN PBL scheme"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_output_in"/>

<var name="sub_qv" type="real" dimensions="nVertLevels nCells Time" units="kg kg^{-1} s^{-1}"
description="EDMF subsidence of water vapor mixing ratio in the MYNN PBL scheme"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_output_in"/>

<var name="det_thl" type="real" dimensions="nVertLevels nCells Time" units="K s^{-1}"
description="EDMF detrainment of liquid-ice potential temperature in the MYNN PBL scheme"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_output_in"/>

<var name="det_qv" type="real" dimensions="nVertLevels nCells Time" units="kg kg^{-1} s^{-1}"
description="EDMF detrainment of water vapor mixing ratio in the MYNN PBL scheme"
packages="bl_mynn_in;bl_mynnedmf_in"/>
packages="bl_mynn_in;bl_mynnedmf_output_in"/>

<var name="maxmf" type="real" dimensions="nCells Time" units="m s^{-1}"
description="Maximum mass flux in the each column"
Expand Down Expand Up @@ -3640,6 +3637,10 @@
description="surface exchange coefficient for heat and moisture"
packages="sfclayer"/>

<var name="cqs" type="real" dimensions="nCells Time" units="m s^{-1}"
description="surface exchange coefficient for moisture (mynn/ruc)"
packages="sfclayer"/>

<var name="chs2" type="real" dimensions="nCells Time" units="m s^{-1}"
description="surface exchange coefficient for heat at 2-meter"
packages="sfclayer"/>
Expand All @@ -3648,10 +3649,6 @@
description="surface exchange coefficient for moisture at 2-meter"
packages="sfclayer"/>

<var name="cqs" type="real" dimensions="nCells Time" units="m s^{-1}"
description="surface exchange coefficient for moisture"
packages="sfclayer"/>

<var name="ck" type="real" dimensions="nCells Time" units="unitless"
description="enthalpy exchange coeff at 10-meter"
packages="sfclayer"/>
Expand Down Expand Up @@ -3722,12 +3719,12 @@

<var name="qcg" type="real" dimensions="nCells Time" units="kg kg^{-1}"
description="cloud water mixing ratio at the ground surface"
packages="bl_mynn_in;bl_mynnedmf_in;lsm_ruc_in"/>
packages="sfclayer"/>

<var name="sh3d" type="real" dimensions="nVertLevels nCells Time" units="unitless"
description="stability function for heat"
packages="bl_mynn_in;bl_mynnedmf_in"/>

<var name="sm3d" type="real" dimensions="nVertLevels nCells Time" units="unitless"
description="stability function for moisture"
packages="bl_mynn_in;bl_mynnedmf_in"/>
Expand Down
18 changes: 9 additions & 9 deletions src/core_atmosphere/physics/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ core_microphysics: core_physics_init core_physics_mmm
core_SMOKE: core_physics_init
(cd physics_noaa/SMOKE; cp ./MPAS/Makefile .; cp ./MPAS/mpas_smoke_wrapper.F90 .; $(MAKE) all)

core_mynnedmf: core_physics_init core_physics_mmm
(cd physics_noaa/MYNN-EDMF; cp ./MPAS/Makefile .; cp ./MPAS/module_bl_mynnedmf_driver.F90 .; cp ./MPAS/module_bl_mynnedmf_common.F90 .; $(MAKE) all)
core_mynnedmf: core_physics_init
(cd physics_noaa/MYNN-EDMF/src; ln -s ./MPAS/Makefile; ln -s ./MPAS/module_bl_mynnedmf_common.F90; $(MAKE) all COREDEF="$(COREDEF)")

@clark-evans clark-evans Aug 28, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joeolson42 what is your thinking for changing from cp to ln here, particularly when all of the other physics (granted, those we've added) are set up to use cp?

@joeolson42 joeolson42 Aug 30, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will take copilot's suggestion and use "ln -sf". I switched to linking from copying because I was sick of modifying the copied file for testing, then cleaning & recompiling (wiping out modified version), and then testing the old version. Commit fix in minutes.


core_mynnsfc: core_physics_init
(cd physics_noaa/MYNN-SFC; cp ./MPAS/Makefile .; cp ./MPAS/module_sf_mynnsfc_driver.F90 .; cp ./MPAS/module_sf_mynnsfc_common.F90 .; $(MAKE) all)
(cd physics_noaa/MYNN-SFC; cp ./MPAS/Makefile .; cp ./MPAS/module_sf_mynnsfc_driver.F90 .; cp ./MPAS/module_sf_mynnsfc_common.F90 .; $(MAKE) all COREDEF="$(COREDEF)")

core_RUCLSM: core_physics_init core_physics_mmm
(cd physics_noaa/RUCLSM; cp ./MPAS/Makefile .; cp ./MPAS/module_ruc_land.F90 .; cp ./MPAS/module_ruc_ice.F90 .; cp ./MPAS/module_sf_sfcdiags_ruclsm.F .; $(MAKE) all COREDEF="$(COREDEF)")
Expand Down Expand Up @@ -292,8 +292,8 @@ clean:
( if [ -d physics_noaa/TEMPO ]; then cd physics_noaa/TEMPO; $(MAKE) -f Makefile.mpas clean; fi )
( if [ -d physics_noaa/UGWP ]; then cd physics_noaa/UGWP; $(MAKE) clean; fi )
( if [ -d physics_noaa/RUCLSM ]; then cd physics_noaa/RUCLSM; $(MAKE) -f MPAS/Makefile clean; fi )
( if [ -d physics_noaa/MYNN-EDMF ]; then cd physics_noaa/MYNN-EDMF; cp ./MPAS/Makefile .; $(MAKE) clean; fi )
( if [ -d physics_noaa/MYNN-SFC ]; then cd physics_noaa/MYNN-SFC; cp ./MPAS/Makefile .; $(MAKE) clean; fi )
( if [ -d physics_noaa/MYNN-EDMF ]; then cd physics_noaa/MYNN-EDMF/src; $(MAKE) -f ./MPAS/Makefile clean; fi )
( if [ -d physics_noaa/MYNN-SFC ]; then cd physics_noaa/MYNN-SFC; $(MAKE) -f ./MPAS/Makefile clean; fi )
( if [ -d physics_noaa/GFL ]; then cd physics_noaa/GFL; cp ./MPAS/Makefile .; $(MAKE) clean; fi )
( if [ -d physics_noaa/SMOKE ]; then cd physics_noaa/SMOKE; cp ./MPAS/Makefile .; $(MAKE) clean; fi )
@# Certain systems with intel compilers generate *.i files
Expand All @@ -304,16 +304,16 @@ clean:
$(RM) $@ $*.mod
ifeq "$(GEN_F90)" "true"
$(CPP) $(CPPFLAGS) $(COREDEF) $(HYDROSTATIC) $(CPPINCLUDES) -I../../framework $< > $*.f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noahmp -I./physics_noahmp/utility -I./physics_noahmp/drivers/mpas -I./physics_noahmp/src -I./physics_noaa/TEMPO -I./physics_noaa/UGWP -I./physics_noaa/MYNN-EDMF -I./physics_noaa/MYNN-SFC -I./physics_noaa/RUCLSM -I./physics_noaa/GFL -I./physics_noaa/SMOKE -I.. -I../../framework $(MPAS_ESMF_INC)
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noahmp -I./physics_noahmp/utility -I./physics_noahmp/drivers/mpas -I./physics_noahmp/src -I./physics_noaa/TEMPO -I./physics_noaa/UGWP -I./physics_noaa/MYNN-EDMF/src -I./physics_noaa/MYNN-SFC -I./physics_noaa/RUCLSM -I./physics_noaa/GFL -I./physics_noaa/SMOKE -I.. -I../../framework $(MPAS_ESMF_INC)
else
$(FC) $(CPPFLAGS) $(COREDEF) $(HYDROSATIC) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noahmp -I./physics_noahmp/utility -I./physics_noahmp/drivers/mpas -I./physics_noahmp/src -I./physics_noaa/TEMPO -I./physics_noaa/UGWP -I./physics_noaa/MYNN-EDMF -I./physics_noaa/MYNN-SFC -I./physics_noaa/RUCLSM -I./physics_noaa/GFL -I./physics_noaa/SMOKE -I.. -I../../framework $(MPAS_ESMF_INC)
$(FC) $(CPPFLAGS) $(COREDEF) $(HYDROSATIC) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noahmp -I./physics_noahmp/utility -I./physics_noahmp/drivers/mpas -I./physics_noahmp/src -I./physics_noaa/TEMPO -I./physics_noaa/UGWP -I./physics_noaa/MYNN-EDMF/src -I./physics_noaa/MYNN-SFC -I./physics_noaa/RUCLSM -I./physics_noaa/GFL -I./physics_noaa/SMOKE -I.. -I../../framework $(MPAS_ESMF_INC)
endif

.F90.o:
$(RM) $@ $*.mod
ifeq "$(GEN_F90)" "true"
$(CPP) $(CPPFLAGS) $(COREDEF) $(HYDROSTATIC) $(CPPINCLUDES) $< > $*.f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noaa/TEMPO -I./physics_noaa/UGWP -I./physics_noaa/MYNN-EDMF -I./physics_noaa/MYNN-SFC -I./physics_noaa/RUCLSM -I./physics_noaa/GFL -I./physics_noaa/SMOKE -I.. -I../../framework $(MPAS_ESMF_INC)
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noaa/TEMPO -I./physics_noaa/UGWP -I./physics_noaa/MYNN-EDMF/src -I./physics_noaa/MYNN-SFC -I./physics_noaa/RUCLSM -I./physics_noaa/GFL -I./physics_noaa/SMOKE -I.. -I../../framework $(MPAS_ESMF_INC)
else
$(FC) $(CPPFLAGS) $(COREDEF) $(HYDROSATIC) $(FFLAGS) -c $*.F90 $(CPPINCLUDES) $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noaa/TEMPO -I./physics_noaa/UGWP -I./physics_noaa/MYNN-EDMF -I./physics_noaa/MYNN-SFC -I./physics_noaa/RUCLSM -I./physics_noaa/GFL -I./physics_noaa/SMOKE -I.. -I../../framework $(MPAS_ESMF_INC)
$(FC) $(CPPFLAGS) $(COREDEF) $(HYDROSATIC) $(FFLAGS) -c $*.F90 $(CPPINCLUDES) $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noaa/TEMPO -I./physics_noaa/UGWP -I./physics_noaa/MYNN-EDMF/src -I./physics_noaa/MYNN-SFC -I./physics_noaa/RUCLSM -I./physics_noaa/GFL -I./physics_noaa/SMOKE -I.. -I../../framework $(MPAS_ESMF_INC)
endif
Loading
Loading