Skip to content

dtc/hwrf-physics: combined version of HAFS/GFS moninedmf scheme (hybrid EDMF PBL) #35

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

Merged
climbfuji merged 9 commits into from
Apr 7, 2020
Merged

dtc/hwrf-physics: combined version of HAFS/GFS moninedmf scheme (hybrid EDMF PBL) #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cb6c3e2
add HWRF_PBL test to rt_ccpp_hafs.conf (no changes in SDF or other ru…
grantfirl Dec 12, 2019
9446593
add non-default value of moninq_fac for HWRF PBL
grantfirl Dec 12, 2019
a2095c5
change moninq_fac for HWRF_PBL namelist to have a value of -1.0 (afte…
grantfirl Dec 13, 2019
2b25606
add HURR_PBL and MONINQ_FAC to default_vars.sh, remove separate namel…
grantfirl Mar 27, 2020
caaecf9
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Apr 6, 2020
b112926
Update submodule pointer for fv3atm
climbfuji Apr 6, 2020
a478414
Correct regression test baseline (control) directories for tests fv3_…
climbfuji Apr 6, 2020
91be9ea
tests/fv3_conf/ccpp_regional_FA_run.IN: use correct input directory t…
climbfuji Apr 7, 2020
3e5fc5e
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Apr 7, 2020
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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 3 files
+1 −1 ccpp/physics
+23 −0 gfsphysics/GFS_layer/GFS_typedefs.F90
+28 −1 gfsphysics/GFS_layer/GFS_typedefs.meta
47 changes: 47 additions & 0 deletions README_HWRF_PHYSICS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
Introduction
============

The three branches dtc/hwrf-physics in ccpp-physics, fv3atm and ufs-weather-model
were created from the hafs-community repository on April 3, 2020:

git clone -b support/HAFS --recursive https://github.com/hafs-community/ufs-weather-model

The original hashes were:

ccpp-physics 31a294a610a538ade4670d9e32856c4a2b7e59ad
fv3atm 23c49d0df3dee47bd7d13f0cbefc5de23c7b2663
ufs-weather-model c2643caf49ff350b66f35fd72afbcdaa65f609bd


PRs pulled into the dtc/hwrf-physics branches
=============================================

The following PRs were pulled into these branches on the given dates
and with the given hashes (further down is later):


ccpp-physics
------------

04/06/2020 MONINEDMF https://github.com/NCAR/ccpp-physics/pull/395
git cherry-pick 942889ab0acace519254712cb4e14b6aaf3e0415
git cherry-pick 500d53a21027f362a9c12c10767f0b4f8cf3361c
git cherry-pick b0f04b210bd588673182023ea36b56ee94642c3e
git cherry-pick e895c62cf49b908927678d72c1ad21ad828e3587


fv3atm
------

04/06/2020 MONINEDMF https://github.com/NCAR/fv3atm/pull/18
git cherry-pick 80ce8591b6af615c9f85a2b3becf8aadc836d734


ufs-weather-model
-----------------

04/06/2020 MONINEDMF https://github.com/NCAR/ufs-weather-model/pull/15
git cherry-pick e6fe22ffde6425800b7ed2e1cf3748b606806d28
git cherry-pick a99d5e73f94f5ffb3bd9bbb1a3dc04171026b6d7
git cherry-pick 5570528f22a9815437e0ef5b413435a8b9fd5881
git cherry-pick 2bb15be8cc15c69c178b6e443c0ab8c0d75ef318
2 changes: 2 additions & 0 deletions parm/ccpp_regional_c768_FA.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@
hybedmf = @[HYBEDMF]
satmedmf = @[SATMEDMF]
lheatstrg = @[LHEATSTRG]
hurr_pbl = @[HURR_PBL]
moninq_fac = @[MONINQ_FAC]
random_clds = .false.
trans_trac = .true.
cnvcld = .false.
Expand Down
2 changes: 2 additions & 0 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ export SHINHONG=.F.
export DO_YSU=.F.
export DO_MYNNEDMF=.F.
export DO_MYJPBL=.F.
export HURR_PBL=.F.
export MONINQ_FAC=1.0

# Shallow/deep convection
export IMFSHALCNV=2
Expand Down
4 changes: 2 additions & 2 deletions tests/fv3_conf/ccpp_regional_FA_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
rsync -arv @[RTPWD]/FV3_regional_input_data/. .
rsync -arv @[RTPWD]/@[INPUT_DIR]/model_configure .
rsync -arv @[RTPWD]/fv3_regional_c768/model_configure .

rm -rf INPUT RESTART
mkdir INPUT RESTART

rsync -arv @[RTPWD]/@[INPUT_DIR]/INPUT/. INPUT/.
rsync -arv @[RTPWD]/fv3_regional_c768/INPUT/. INPUT/.

if [ $WARM_START = .T. ]; then
cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.coupler.res INPUT/coupler.res
Expand Down
10 changes: 10 additions & 0 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,11 @@ RUN | fv3_ccpp_gfdlmprad_32bit_post
RUN | fv3_ccpp_cpt | standard | | |
RUN | fv3_ccpp_gsd | standard | | fv3 |

COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist | standard | hera.intel | fv3 |

RUN | fv3_ccpp_regional_c768_FA_update_moist | standard | hera.intel | fv3 |
RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | hera.intel | fv3 |

#######################################################################################################################################################################################
# CCPP PROD tests #
#######################################################################################################################################################################################
Expand Down Expand Up @@ -369,6 +374,11 @@ RUN | fv3_ccpp_gsd
RUN | fv3_ccpp_thompson | standard | | fv3 |
RUN | fv3_ccpp_thompson_no_aero | standard | | fv3 |

COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist | standard | hera.intel | fv3 |

RUN | fv3_ccpp_regional_c768_FA_update_moist | standard | hera.intel | fv3 |
RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | hera.intel | fv3 |

#######################################################################################################################################################################################
# CCPP PROD tests #
#######################################################################################################################################################################################
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/fv3_ccpp_regional_c768_FA_update_moist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

export TEST_DESCR="Compare FV3 CCPP regional c768 with Ferrier-Aligo MP scheme results with previous trunk version"

export CNTL_DIR=fv3_regional_c768
export CNTL_DIR=fv3_regional_c768_FA_update_moist

export LIST_FILES=" atmos_4xdaily.nc \
fv3_history2d.nc \
Expand Down
30 changes: 30 additions & 0 deletions tests/tests/fv3_ccpp_regional_c768_HWRF_PBL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
###############################################################################
#
# FV3 CCPP regional c768 test with HWRF PBL scheme
#
###############################################################################

export TEST_DESCR="Compare FV3 CCPP regional c768 with Ferrier-Aligo MP scheme and HWRF PBL results with previous trunk version"

export CNTL_DIR=fv3_regional_c768_HWRF_PBL

export LIST_FILES=" atmos_4xdaily.nc \
fv3_history2d.nc \
fv3_history.nc "

export_fv3

export TASKS=480
export WLCLK=30

export RUN_SCRIPT=rt_fv3.sh
export FV3_RUN=ccpp_regional_FA_run.IN

export CCPP_SUITE=FV3_HAFS_ferhires_update_moist
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_regional_c768_FA.nml.IN
export LRADAR=.T.
export WRITE_DOPOST=.true.

export HURR_PBL=.T.
export MONINQ_FAC=-1.0