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.

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

Implementation of MYNN-EDMF submodule #2148

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+56 −8,689
Open

Implementation of MYNN-EDMF submodule #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a66da2
Switching MYNN to MYNN-EDMF submodule
joeolson42 Dec 31, 2024
54b6fa7
switching spaces to tabs
joeolson42 Dec 31, 2024
55c1fa4
remove ktop_plume--no longer a MYNN-EDMF variable
joeolson42 Dec 31, 2024
9a0db6f
Updating MYNN-EDMF submodule to correct an index problem in a chem ar…
joeolson42 Jan 1, 2025
75f1031
Updating MYNN-EDMF submodule to impose bounds on qnwfa and qnifa
joeolson42 Jan 4, 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
View file
Open in desktop
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
14 changes: 14 additions & 0 deletions Makefile
View file
Open in desktop
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
5 changes: 2 additions & 3 deletions Registry/Registry.EM_COMMON
View file
Open in desktop
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 @@ -3177,7 +3176,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
2 changes: 2 additions & 0 deletions clean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ if ( "$arg" == '-a' || "$arg" == '-aa' ) then
/bin/rm -f phys/module_sf_noahmpdrv.F phys/module_sf_noahmp_glacier.F \
phys/module_sf_noahmp_groundwater.F phys/module_sf_noahmplsm.F \
run/MPTABLE.TBL
/bin/rm -f phys/module_bl_mynnedmf.F phys/module_bl_mynnedmf_common.F \
phys/module_bl_mynnedmf_driver.F
endif
endif

Expand Down
2 changes: 1 addition & 1 deletion dyn_em/module_first_rk_step_part1.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,7 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
& ,qcg=grid%qcg, grav_settling=config_flags%grav_settling &
! & ,K_m=grid%K_m, K_h=grid%K_h, K_q=grid%K_q &
& ,vdfg=grid%vdfg,maxwidth=grid%maxwidth,maxMF=grid%maxmf &
& ,ztop_plume=grid%ztop_plume,ktop_plume=grid%ktop_plume &
& ,ztop_plume=grid%ztop_plume &
& ,spp_pbl=config_flags%spp_pbl &
& ,pattern_spp_pbl=grid%pattern_spp_pbl &
& ,restart=config_flags%restart,cycling=config_flags%cycling &
Expand Down
22 changes: 10 additions & 12 deletions main/depend.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,13 +663,13 @@ module_bl_gfsedmf.o: \
module_gfs_physcons.o


module_bl_mynn.o: \
module_bl_mynn_common.o
module_bl_mynnedmf.o: \
module_bl_mynnedmf_common.o


module_bl_mynn_wrapper.o: \
module_bl_mynn.o \
module_bl_mynn_common.o
module_bl_mynnedmf_driver.o: \
module_bl_mynnedmf.o \
module_bl_mynnedmf_common.o


module_bl_gwdo.o: \
Expand Down Expand Up @@ -735,7 +735,6 @@ module_bl_camuwpbl_driver.o: \


module_sf_mynn.o: \
module_bl_mynn.o \
../share/module_model_constants.o \
../frame/module_wrf_error.o

Expand Down Expand Up @@ -1300,8 +1299,8 @@ module_physics_init.o: \
module_bl_acm.o \
module_bl_myjpbl.o \
module_bl_qnsepbl.o \
module_bl_mynn.o \
module_bl_mynn_wrapper.o \
module_bl_mynnedmf.o \
module_bl_mynnedmf_driver.o \
module_bl_myjurb.o \
module_bl_boulac.o \
module_bl_camuwpbl_driver.o \
Expand Down Expand Up @@ -1476,8 +1475,8 @@ module_pbl_driver.o: \
module_bl_camuwpbl_driver.o \
module_bl_gfs.o \
module_bl_gfsedmf.o \
module_bl_mynn.o \
module_bl_mynn_wrapper.o \
module_bl_mynnedmf.o \
module_bl_mynnedmf_driver.o \
module_bl_fogdes.o \
module_bl_gwdo.o \
module_bl_gwdo_gsl.o \
Expand Down Expand Up @@ -2780,8 +2779,7 @@ module_bl_mfshconvpbl.o: \
../share/module_model_constants.o


module_bl_mynn_common.o: \
module_gfs_machine.o \
module_bl_mynnedmf_common.o: \
../share/module_model_constants.o \
ccpp_kind_types.o

Expand Down
1 change: 1 addition & 0 deletions phys/MYNN-EDMF
Open in desktop
Submodule MYNN-EDMF added at 90f36c
18 changes: 14 additions & 4 deletions phys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ MODULES = \
module_bl_myjpbl.o \
module_bl_qnsepbl.o \
module_bl_acm.o \
module_bl_mynn_common.o \
module_bl_mynn.o \
module_bl_mynn_wrapper.o \
module_bl_mynnedmf_common.o \
module_bl_mynnedmf.o \
module_bl_mynnedmf_driver.o \
module_bl_fogdes.o \
module_bl_gwdo.o \
module_bl_gwdo_gsl.o \
Expand Down Expand Up @@ -270,7 +270,17 @@ submodules :
else \
echo No action required for NoahMP submodule ; \
fi

@if [ \( ! -f module_bl_mynnedmf.F \) -o \( ! -f module_bl_mynedmf_common.F \) -o \
\( ! -f module_bl_mynnedmf_driver.F \) ] ; then \
echo Pulling in MYNN-EDMF submodule ; \
( cd .. ; git submodule update --init --recursive ) ; \
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does this always get the latest modules/files from the MYNN repository?

ln -sf MYNN-EDMF/module_bl_mynnedmf.F90 module_bl_mynnedmf.F ; \
ln -sf MYNN-EDMF/WRF/module_bl_mynnedmf_common.F90 module_bl_mynnedmf_common.F ; \
ln -sf MYNN-EDMF/WRF/module_bl_mynnedmf_driver.F90 module_bl_mynnedmf_driver.F ; \
else \
echo No action required for MYNN-EDMF submodule ; \
fi

clean:
@ echo 'use the clean script'

Expand Down
Loading