New Thompson cloud fraction (updated subroutine cal_cldfra3) (#929)

Includes code changes described in NCAR/ccpp-physics#795 and NOAA-EMC/fv3atm#432: the addition of a new cloud fraction scheme for Thompson MP.
ufs-community · Dec 10, 2021 · ad95b73 · ad95b73
1 parent f20ac76
commit ad95b73
Show file tree

Hide file tree

Showing 12 changed files with 2,794 additions and 2,661 deletions.
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/rt.conf b/tests/rt.conf
@@ -4,7 +4,7 @@
 
 COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp                             | - wcoss_cray                            | fv3 |
 RUN     | cpld_control_p7                                                                                                         | - wcoss_cray                            | fv3 |
-RUN     | cpld_control_p7_rrtmgp                                                                                                  | - wcoss_cray cheyenne.intel             | fv3 |
+RUN     | cpld_control_p7_rrtmgp                                                                                                  | - wcoss_cray                            | fv3 |
 RUN     | cpld_2threads_p7                                                                                                        | - wcoss_cray                            |     |
 RUN     | cpld_decomp_p7                                                                                                          | - wcoss_cray jet.intel                  |     |
 RUN     | cpld_mpi_p7                                                                                                             | - wcoss_cray                            |     |
@@ -50,7 +50,7 @@ RUN     | control_stochy_restart
 RUN     | control_lndp                                                                                                            |                                         | fv3 |
 
 RUN     | control_p7                                                                                                              |                                         | fv3 |
-RUN     | control_p7_rrtmgp                                                                                                       |-  cheyenne.intel                        | fv3 |
+RUN     | control_p7_rrtmgp                                                                                                       |                                         | fv3 |
 RUN     | control_restart_p7                                                                                                      |                                         |     | control_p7
 RUN     | control_decomp_p7                                                                                                       |                                         |     |
 RUN     | control_2threads_p7                                                                                                     | - wcoss_cray                            |     |
@@ -61,7 +61,7 @@ RUN     | regional_noquilt
 RUN     | regional_2threads                                                                                                       | - wcoss_cray jet.intel                  |     |
 RUN     | regional_hafs                                                                                                           |                                         | fv3 |
 RUN     | regional_netcdf_parallel                                                                                                | - wcoss2                                | fv3 |
-RUN     | regional_RRTMGP                                                                                                         | - cheyenne.intel                        | fv3 |
+RUN     | regional_RRTMGP                                                                                                         |                                         | fv3 |
 
 RUN     | fv3_gsd                                                                                                                 |                                         | fv3 |
 RUN     | fv3_rrfs_v1alpha                                                                                                        |                                         | fv3 |
@@ -71,9 +71,9 @@ RUN     | fv3_rrfs_v1beta
 
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp,FV3_HAFS_v0_hwrf_thompson | | fv3 |
 # fv3_gfs_v15p2 and fv3_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0
-RUN     | control_rrtmgp                                                                                                          | -  cheyenne.intel                       | fv3 |
-#RUN     | control_rrtmgp_2threads                                                                                                 | -  cheyenne.intel                       |     |
-RUN     | control_rrtmgp_c192                                                                                                     | -  cheyenne.intel                       | fv3 |
+RUN     | control_rrtmgp                                                                                                          |                                         | fv3 |
+#RUN     | control_rrtmgp_2threads                                                                                                 |                                         |     |
+RUN     | control_rrtmgp_c192                                                                                                     |                                         | fv3 |
 RUN     | control_csawmg                                                                                                          | - gaea.intel                            | fv3 |
 RUN     | control_csawmgt                                                                                                         |                                         | fv3 |
 RUN     | control_flake                                                                                                           |                                         | fv3 |
@@ -100,7 +100,7 @@ RUN     | control_wrtGauss_netcdf_parallel_debug
 RUN     | control_stochy_debug                                                                                                    |                                         | fv3 |
 RUN     | control_lndp_debug                                                                                                      |                                         | fv3 |
 RUN     | control_rrtmgp_debug                                                                                                    |                                         | fv3 |
-RUN     | control_csawmg_debug                                                                                                    | - jet.intel                             | fv3 |
+RUN     | control_csawmg_debug                                                                                                    |                                         | fv3 |
 RUN     | control_csawmgt_debug                                                                                                   |                                         | fv3 |
 RUN     | control_ras_debug                                                                                                       |                                         | fv3 |
 RUN     | control_diag_debug                                                                                                      |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -460,7 +460,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20211206
+BL_DATE=20211209
 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
+20 −2		ccpp/data/GFS_typedefs.F90
+42 −0		ccpp/data/GFS_typedefs.meta
+111 −1		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/physics