Merge pull request ufs-community#35 from climbfuji/dtc-hwrf-physics-a…

…dd-moninedmf dtc/hwrf-physics: combined version of HAFS/GFS moninedmf scheme (hybrid EDMF PBL)
climbfuji · Apr 7, 2020 · 228dda8 · 228dda8
2 parents e4ebb21 + 3e5fc5e
commit 228dda8
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 4 deletions.
diff --git a/FV3 b/FV3
diff --git a/README_HWRF_PHYSICS.txt b/README_HWRF_PHYSICS.txt
@@ -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
diff --git a/parm/ccpp_regional_c768_FA.nml.IN b/parm/ccpp_regional_c768_FA.nml.IN
@@ -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.

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -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

diff --git a/tests/fv3_conf/ccpp_regional_FA_run.IN b/tests/fv3_conf/ccpp_regional_FA_run.IN
@@ -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

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -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                                                                                                                                                                     #
 #######################################################################################################################################################################################
@@ -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                                                                                                                                                                     #
 #######################################################################################################################################################################################

diff --git a/tests/tests/fv3_ccpp_regional_c768_FA_update_moist b/tests/tests/fv3_ccpp_regional_c768_FA_update_moist
@@ -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 \

diff --git a/tests/tests/fv3_ccpp_regional_c768_HWRF_PBL b/tests/tests/fv3_ccpp_regional_c768_HWRF_PBL
@@ -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