CCPP: Update consistency checks and effective radii calculation for T…

…hompson MP (#1000) This PR contains changes in ccpp-physics (Update consistency checks and effective radii calculation for Thompson MP) and adds two new regression tests for both Intel and GNU that use the new prognostic cloud scheme progcld_thompson with GFS v16 and with RAP. The new cloud scheme is activated by setting icloud == 3 in input.nml.
ufs-community · Jan 20, 2022 · a231869 · a231869
1 parent a79a7ca
commit a231869
Show file tree

Hide file tree

Showing 19 changed files with 4,749 additions and 4,122 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 # PR Checklist
 
-- [ ] Ths PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model [wiki](https://github.com/ufs-community/ufs-weather-model/wiki/Making-code-changes-in-the-UFS-weather-model-and-its-subcomponents) if you are unsure how to do this.
+- [ ] This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model [wiki](https://github.com/ufs-community/ufs-weather-model/wiki/Making-code-changes-in-the-UFS-weather-model-and-its-subcomponents) if you are unsure how to do this.
 
 - [ ] This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR
 

diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/parm/control_thompson.nml.IN b/tests/parm/control_thompson.nml.IN
@@ -127,6 +127,7 @@ deflate_level=1
   iaer         = @[IAER]
   icliq_sw     = @[ICLIQ_SW]
   iovr         = @[IOVR]
+  icloud       = @[ICLOUD]
   ico2         = 2
   isubc_sw     = 2
   isubc_lw     = 2

diff --git a/tests/parm/rap.nml.IN b/tests/parm/rap.nml.IN
@@ -128,6 +128,7 @@ deflate_level=1
   iaer         = @[IAER]
   icliq_sw     = @[ICLIQ_SW]
   iovr         = @[IOVR]
+  icloud       = @[ICLOUD]
   ico2         = 2
   isubc_sw     = 2
   isubc_lw     = 2

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -118,6 +118,7 @@ RUN     | control_debug_p8
 RUN     | control_thompson_debug                                                                                                  |                                         | fv3 |
 RUN     | control_thompson_no_aero_debug                                                                                          |                                         | fv3 |
 RUN     | control_thompson_extdiag_debug                                                                                          |                                         | fv3 |
+RUN     | control_thompson_progcld_thompson_debug                                                                                 |                                         | fv3 |
 
 RUN     | regional_debug                                                                                                          |                                         | fv3 |
 
@@ -134,6 +135,7 @@ RUN     | rap_lndp_debug
 RUN     | rap_sfcdiff_debug                                                                                                       |                                         | fv3 |
 RUN     | rap_flake_debug                                                                                                         |                                         | fv3 |
 RUN     | rap_noah_sfcdiff_cires_ugwp_debug                                                                                       |                                         | fv3 |
+RUN     | rap_progcld_thompson_debug                                                                                              |                                         | fv3 |
 RUN     | rrfs_v1beta_debug                                                                                                       |                                         | fv3 |
 
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON                                       |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -467,7 +467,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220113
+BL_DATE=20220120
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -31,10 +31,6 @@ RUN     | rrfs_v1beta
 RUN     | rrfs_conus13km_hrrr_warm                                                                                                |                | fv3         |
 RUN     | rrfs_conus13km_radar_tten_warm                                                                                          |                | fv3         |
 
-# This crashes with 'NaN in input field of mpp_reproducing_sum(_2d)' after 64 time steps
-#COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_2017_fv3wam -D32BIT=ON -DMULTI_GASES=ON                                                 |                | fv3         |
-#RUN     | fv3_multigases                                                                                                          |                | fv3         |
-
 ##################################################################################################################################################################
 # CCPP DEBUG tests                                                                                                                                               #
 ##################################################################################################################################################################
@@ -47,10 +43,12 @@ RUN     | regional_debug
 RUN     | rap_control_debug                                                                                                       |                | fv3         |
 RUN     | rap_diag_debug                                                                                                          |                | fv3         |
 RUN     | rap_noah_sfcdiff_cires_ugwp_debug                                                                                       |                | fv3         |
+RUN     | rap_progcld_thompson_debug                                                                                              |                | fv3         |
 RUN     | rrfs_v1beta_debug                                                                                                       |                | fv3         |
 RUN     | control_thompson_debug                                                                                                  |                | fv3         |
 RUN     | control_thompson_no_aero_debug                                                                                          |                | fv3         |
 RUN     | control_thompson_extdiag_debug                                                                                          |                | fv3         |
+RUN     | control_thompson_progcld_thompson_debug                                                                                 |                | fv3         |
 RUN     | control_rrtmgp_debug                                                                                                    |                | fv3         |
 RUN     | control_ras_debug                                                                                                       |                | fv3         |
 RUN     | control_stochy_debug                                                                                                    |                | fv3         |

diff --git a/tests/tests/control_thompson_progcld_thompson_debug b/tests/tests/control_thompson_progcld_thompson_debug
@@ -0,0 +1,49 @@
+###############################################################################
+#
+#  Global control with Thompson debug with Thompson's prognostic cloud scheme test
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control Thompson debug with Thompson's prognostic cloud scheme results with previous trunk version"
+
+export CNTL_DIR=control_thompson_progcld_thompson_debug
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf001.nc \
+                   atmf000.nc \
+                   atmf001.nc"
+
+export_fv3
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=600
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export OUTPUT_GRID='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export FHMAX=1
+export OUTPUT_FH="0 1"
+
+export IMP_PHYSICS=8
+export FIELD_TABLE=field_table_thompson_aero_tke
+export DNATS=0
+export DO_SAT_ADJ=.false.
+export LRADAR=.true.
+export LTAEROSOL=.true.
+export HYBEDMF=.false.
+export SATMEDMF=.true.
+export DO_MYNNEDMF=.false.
+export IMFSHALCNV=2
+export IMFDEEPCNV=2
+export IAER=5111
+export ICLIQ_SW=2
+export IOVR=3
+export ICLOUD=3
+export LHEATSTRG=.true.
+export DO_TOFD=.true.
+
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v16_thompson
+export INPUT_NML=control_thompson.nml.IN
diff --git a/tests/tests/fv3_multigases_debug b/tests/tests/fv3_multigases_debug
diff --git a/tests/tests/rap_progcld_thompson_debug b/tests/tests/rap_progcld_thompson_debug
@@ -0,0 +1,62 @@
+###############################################################################
+#
+#  RAP with Thompson's prognostic cloud scheme debug test: atmosphere only at C96L127 in debug mode
+#
+###############################################################################
+
+export TEST_DESCR="Compare RAP debug with Thompson's prognostic cloud scheme results with previous trunk version"
+
+export CNTL_DIR=rap_progcld_thompson_debug
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf001.nc \
+                   atmf000.nc \
+                   atmf001.nc"
+
+export_fv3
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=300
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export OUTPUT_GRID='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export IAER=5111
+export FHMAX=1
+export OUTPUT_FH="0 1"
+#export WRITE_DOPOST=.true.
+
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_RAP
+export INPUT_NML=rap.nml.IN
+export FIELD_TABLE=field_table_thompson_aero_tke
+export NEW_DIAGTABLE=diag_table_rap
+
+export IMP_PHYSICS=8
+export DNATS=0
+export DO_SAT_ADJ=.false.
+export LRADAR=.true.
+export LTAEROSOL=.true.
+export IALB=2
+export IEMS=2
+export ICLOUD=3
+export HYBEDMF=.false.
+export DO_MYNNEDMF=.true.
+export DO_MYNNSFCLAY=.true.
+export IMFSHALCNV=3
+export IMFDEEPCNV=3
+export LSM=3
+export LSOIL_LSM=9
+export KICE=9
+
+export GWD_OPT=3
+export DO_UGWP_V0=.false.
+export DO_UGWP_V0_OROG_ONLY=.false.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.true.
+export DO_UGWP_V1=.false.
+export DO_UGWP_V1_OROG_ONLY=.false.
+