RRTMGP refactoring (#1571)

* RRTMGP refactoring * Added RRTMGP p8 coupled RT. Update other GP RTs. * Adding GP physics blocking to UFS GP RT configurations * Trim old RRTMGP RTs * Interface changes for SP build in GP Co-authored-by: JONG KIM <jong.kim@noaa.gov> Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
ufs-community · Feb 7, 2023 · 30b847d · 30b847d
1 parent 130f857
commit 30b847d
Show file tree

Hide file tree

Showing 22 changed files with 6,369 additions and 7,320 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
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_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -343,6 +343,7 @@ export DOGP_CLDOPTICS_LUT=.false.
 export DOGP_LWSCAT=.false.
 export USE_LW_JACOBIAN=.false.
 export DAMP_LW_FLUXADJ=.false.
+export RRTMGP_LW_PHYS_BLKSZ=2
 export ICLOUD=0
 export IAER=111
 export ICLIQ_SW=1

diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN
@@ -197,6 +197,7 @@ deflate_level=1
   rrtmgp_nGptsLW     = 128
   rrtmgp_nBandsLW    = 16
   rrtmgp_nBandsSW    = 14
+  rrtmgp_lw_phys_blksz = 16
   doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT]
   doGP_lwscat        = @[DOGP_LWSCAT]
   progsigma    = @[PROGSIGMA]

diff --git a/tests/parm/cpld_control.nml.IN b/tests/parm/cpld_control.nml.IN
@@ -222,6 +222,7 @@ deflate_level=1
   rrtmgp_nBandsSW    = 14
   doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT]
   doGP_lwscat        = @[DOGP_LWSCAT]
+  doGP_sgs_cnv       = @[DOGP_SGS_CNV]
   use_med_flux = @[USE_MED_FLUX]
   frac_grid    = @[FRAC_GRID]
   cplchm       = @[CPLCHM]

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -78,10 +78,9 @@ RUN     | regional_netcdf_parallel
 RUN     | regional_2dwrtdecomp                                                                                                    |                                         |     |
 RUN     | regional_wofs                                                                                                           |                                         | fv3 |
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON |                               | fv3 |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON      |                                         | fv3 |
 
 RUN     | rap_control                                                                                                             |                                         | fv3 |
-RUN     | rap_rrtmgp                                                                                                              |                                         | fv3 |
 RUN     | regional_spp_sppt_shum_skeb                                                                                             |                                         | fv3 |
 RUN     | rap_decomp                                                                                                              |                                         |     |
 RUN     | rap_2threads                                                                                                            |                                         |     |
@@ -125,7 +124,7 @@ RUN     | control_wam
 # DEBUG ATM tests                                                                                                                                                                 #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_HRRR,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta                                                                        |                                         | fv3 |
+COMPILE | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_HRRR,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta                                                                        |                                         | fv3 |
 
 RUN     | rrfs_conus13km_hrrr_warm_debug                                                                                          |                                         | fv3 |
 RUN     | rrfs_conus13km_radar_tten_warm_debug                                                                                    |                                         | fv3 |
@@ -152,7 +151,6 @@ RUN     | rap_lndp_debug
 RUN     | rap_flake_debug                                                                                                         |                                         | fv3 |
 RUN     | rap_progcld_thompson_debug                                                                                              |                                         | fv3 |
 RUN     | rap_noah_debug                                                                                                          |                                         | fv3 |
-RUN     | rap_rrtmgp_debug                                                                                                        |                                         | fv3 |
 RUN     | rap_sfcdiff_debug                                                                                                       |                                         | fv3 |
 RUN     | rap_noah_sfcdiff_cires_ugwp_debug                                                                                       |                                         | fv3 |
 RUN     | rrfs_v1beta_debug                                                                                                       |                                         | fv3 |
@@ -249,7 +247,7 @@ RUN     | datm_cdeps_lnd_gswp3_rst
 # ATM-LND tests, -D32BIT=ON has issue and NoahMP reuires r8 libraries                                                                                                             #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km |                            | fv3 |
+COMPILE | -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km          |                                         | fv3 |
 RUN     | control_p8_atmlnd_sbs                                                                                                   |                                         | fv3 |
 
 ###################################################################################################################################################################################

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -445,7 +445,8 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20230126
+
+BL_DATE=20230201
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/tests/control_rrtmgp b/tests/tests/control_rrtmgp
diff --git a/tests/tests/control_rrtmgp_2threads b/tests/tests/control_rrtmgp_2threads
diff --git a/tests/tests/control_rrtmgp_c192 b/tests/tests/control_rrtmgp_c192
diff --git a/tests/tests/control_rrtmgp_debug b/tests/tests/control_rrtmgp_debug
diff --git a/tests/tests/rap_progcld_thompson_rrtmgp_debug b/tests/tests/rap_progcld_thompson_rrtmgp_debug
+3 −37		ccpp/config/ccpp_prebuild_config.py
+28 −163		ccpp/data/CCPP_typedefs.F90
+42 −134		ccpp/data/CCPP_typedefs.meta
+12 −3		ccpp/data/GFS_typedefs.F90
+12 −0		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/physics
+3 −12		ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+0 −97		ccpp/suites/suite_FV3_RAP_RRTMGP.xml