CCPP: Update consistency checks and effective radii calculation for Thompson MP

.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
 

.gitmodules

@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
+  url = https://github.com/climbfuji/fv3atm
+  branch = thompson_mp_effr_updates
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

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

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

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 |

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         |

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

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.
+