ufs-community · DeniseWorthen · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021
diff --git a/.gitmodules b/.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/dustinswales/fv3atm
+  branch = add_GPorts
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS

diff --git a/FV3 b/FV3
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -36,7 +36,7 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
 
   TASKS_cpl_dflt=196; TPN_cpl_dflt=28; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
-  OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 177"; WPB_cpl_dflt="178 195"  
+  OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 177"; WPB_cpl_dflt="178 195"
   NPROC_ICE_cpl_dflt=8
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=14; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
@@ -170,7 +170,7 @@ elif [[ $MACHINE_ID = orion.* ]]; then
 
   TASKS_cpl_dflt=200; TPN_cpl_dflt=40; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
-  OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 179"; WPB_cpl_dflt="180 199"  
+  OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 179"; WPB_cpl_dflt="180 199"
   NPROC_ICE_cpl_dflt=10
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=20; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
@@ -1036,7 +1036,7 @@ export eps_imesh=1.0e-1
 
 # FV3 defaults
 export FRAC_GRID=.true.
-export CCPP_SUITE=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1
+export CCPP_SUITE=FV3_GFS_v16_coupled_p8
 export INPUT_NML=cpld_control.nml.IN
 export FIELD_TABLE=field_table_gfsv16
 export DIAG_TABLE=diag_table_template
@@ -1120,6 +1120,9 @@ export USE_CICE_ALB=.false.
 export KTHERM=2
 export TFREEZE_OPTION=mushy
 
+# P8 RRTMGP
+export DO_RRTMGP=.true.
+
 export CPLFLX=.true.
 export CPLICE=.true.
 export CPL=.true.

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -18,6 +18,11 @@ else
   ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}
 fi
 
+# RRTMGP
+if [ $DO_RRTMGP = .true. ]; then
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
+fi
+
 # FV3 fixed input
 cp    @[INPUTDATA_ROOT_BMIC]/FV3_fix/INPUT/co2historicaldata_201*.txt .
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/aerosol.dat .

diff --git a/tests/parm/cpld_control.nml.IN b/tests/parm/cpld_control.nml.IN
@@ -212,6 +212,20 @@ deflate_level=1
   do_gsl_drag_tofd     = @[DO_GSL_DRAG_TOFD]
   do_ugwp_v1_orog_only = @[DO_UGWP_V1_OROG_ONLY]
   do_ugwp_v0_nst_only  = @[DO_UGWP_V0_NST_ONLY]
+  do_RRTMGP          = @[DO_RRTMGP]
+  active_gases       = 'h2o_co2_o3_n2o_ch4_o2'
+  ngases             = 6
+  lw_file_gas        = 'rrtmgp-data-lw-g128-210809.nc'
+  lw_file_clouds     = 'rrtmgp-cloud-optics-coeffs-lw.nc'
+  sw_file_gas        = 'rrtmgp-data-sw-g112-210809.nc'
+  sw_file_clouds     = 'rrtmgp-cloud-optics-coeffs-sw.nc'
+  rrtmgp_nGptsSW     = 112
+  rrtmgp_nGptsLW     = 128
+  rrtmgp_nBandsLW    = 16
+  rrtmgp_nBandsSW    = 14
+  doGP_cldoptics_LUT = .true.
+  doGP_lwscat        = .true.
+  use_LW_jacobian    = .false.
 /
 
 &gfdl_cloud_microphysics_nml

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -2,34 +2,34 @@
 # S2S tests                                                                                                                                                                    #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1                                                           | - wcoss_cray                            | fv3 |
-RUN     | cpld_control_p7                                                                                                         | - wcoss_cray                            | fv3 |
-RUN     | cpld_2threads_p7                                                                                                        | - wcoss_cray                            |     |
-RUN     | cpld_decomp_p7                                                                                                          | - wcoss_cray jet.intel                  |     |
-RUN     | cpld_mpi_p7                                                                                                             | - wcoss_cray                            |     |
+COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p8                                    | - wcoss_cray                            | fv3 |
+RUN     | cpld_control_p8                                                                                                         | - wcoss_cray                            | fv3 |
+RUN     | cpld_2threads_p8                                                                                                        | - wcoss_cray                            |     |
+RUN     | cpld_decomp_p8                                                                                                          | - wcoss_cray jet.intel                  |     |
+RUN     | cpld_mpi_p8                                                                                                             | - wcoss_cray                            |     |
 
 RUN     | cpld_bmark_p7                                                                                                           | - wcoss_cray                            | fv3 |
-RUN     | cpld_bmark_mpi_p7                                                                                                       | - wcoss_cray                            |     |
+RUN     | cpld_bmark_p8                                                                                                           | - wcoss_cray                            | fv3 |
+RUN     | cpld_bmark_mpi_p8                                                                                                       | - wcoss_cray                            |     |
 
-# Waves off for restart and debug tests 
-RUN     | cpld_control_c96_p7                                                                                                     | - wcoss_cray                            | fv3 |
-RUN     | cpld_restart_c96_p7                                                                                                     | - wcoss_cray                            |     | cpld_control_c96_p7
+# Waves off for restart and debug tests
+RUN     | cpld_control_c96_p8                                                                                                     | - wcoss_cray                            | fv3 |
+RUN     | cpld_restart_c96_p8                                                                                                     | - wcoss_cray                            |     | cpld_control_c96_p8
 
+RUN     | cpld_control_c192_p8                                                                                                    | - wcoss_cray                            | fv3 |
+RUN     | cpld_restart_c192_p8                                                                                                    | - wcoss_cray                            |     | cpld_control_c192_p8
 
-RUN     | cpld_control_c192_p7                                                                                                    | - wcoss_cray                            | fv3 |
-RUN     | cpld_restart_c192_p7                                                                                                    | - wcoss_cray                            |     | cpld_control_c192_p7
+RUN     | cpld_control_c384_p8                                                                                                    | - wcoss_cray                            | fv3 |
+RUN     | cpld_restart_c384_p8                                                                                                    | - wcoss_cray                            |     | cpld_control_c384_p8
 
-RUN     | cpld_control_c384_p7                                                                                                    | - wcoss_cray                            | fv3 |
-RUN     | cpld_restart_c384_p7                                                                                                    | - wcoss_cray                            |     | cpld_control_c384_p7
-
-COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1                                                 | - wcoss_cray                            | fv3 |
-RUN     | cpld_debug_p7                                                                                                           | - wcoss_cray                            | fv3 |
+COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_p8                                                               | - wcoss_cray                            | fv3 |
+RUN     | cpld_debug_p8                                                                                                           | - wcoss_cray                            | fv3 |
 
 ###################################################################################################################################################################################
 # PROD tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_thompson_mynn_RRTMGP,FV3_GSD_v0,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1alpha,FV3_GFS_v16_nsstNoahmpUGWPv1 -D32BIT=ON |  | fv3 |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_thompson_mynn_RRTMGP,FV3_GSD_v0,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1alpha,FV3_GFS_v16_p8 -D32BIT=ON |  | fv3 |
 
 RUN     | control                                                                                                                 |                                         | fv3 |
 RUN     | control_decomp                                                                                                          |                                         |     |
@@ -46,10 +46,10 @@ RUN     | control_stochy
 RUN     | control_stochy_restart                                                                                                  |                                         |     | control_stochy
 RUN     | control_lndp                                                                                                            |                                         | fv3 |
 
-RUN     | control_p7                                                                                                              |                                         | fv3 |
-RUN     | control_restart_p7                                                                                                      |                                         |     | control_p7
-RUN     | control_decomp_p7                                                                                                       |                                         |     |
-RUN     | control_2threads_p7                                                                                                     | - wcoss_cray                            |     |
+RUN     | control_p8                                                                                                              |                                         | fv3 |
+RUN     | control_restart_p8                                                                                                      |                                         |     | control_p8
+RUN     | control_decomp_p8                                                                                                       |                                         |     |
+RUN     | control_2threads_p8                                                                                                     | - wcoss_cray                            |     |
 
 RUN     | regional_control                                                                                                        |                                         | fv3 |
 RUN     | regional_restart                                                                                                        |                                         | fv3 | regional_control
@@ -96,7 +96,7 @@ RUN     | control_wam
 # DEBUG tests                                                                                                                                                                     #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GSD_v0,FV3_RRFS_v1beta,FV3_RRFS_v1alpha,FV3_GFS_v16_nsstNoahmpUGWPv1 -D32BIT=ON | | fv3 |
+COMPILE | -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GSD_v0,FV3_RRFS_v1beta,FV3_RRFS_v1alpha,FV3_GFS_v16_p8 -D32BIT=ON | | fv3 |
 RUN     | control_debug                                                                                                           |                                         | fv3 |
 RUN     | control_2threads_debug                                                                                                  | - wcoss_cray                            |     |
 RUN     | control_CubedSphereGrid_debug                                                                                           |                                         | fv3 |
@@ -108,7 +108,7 @@ RUN     | control_csawmg_debug
 RUN     | control_csawmgt_debug                                                                                                   |                                         | fv3 |
 RUN     | control_ras_debug                                                                                                       |                                         | fv3 |
 RUN     | control_diag_debug                                                                                                      |                                         | fv3 |
-RUN     | control_debug_p7                                                                                                        |                                         | fv3 |
+RUN     | control_debug_p8                                                                                                        |                                         | fv3 |
 
 RUN     | control_thompson_debug                                                                                                  |                                         | fv3 |
 RUN     | control_thompson_no_aero_debug                                                                                          |                                         | fv3 |

diff --git a/tests/rt_35d.conf b/tests/rt_35d.conf
@@ -2,7 +2,7 @@
 # CPLD Benchmark 35d tests                                                                                                                                                    #
 ###############################################################################################################################################################################
 
-COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1                                                   | + hera.intel                         | fv3 |  |
+COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p8                            | + hera.intel                         | fv3 |  |
 RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2012010100
 RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2012040100
 RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2012070100
@@ -11,3 +11,12 @@ RUN     | cpld_bmark_p7_35d
 RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2013040100
 RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2013070100
 RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2013100100
+
+RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2012010100
+RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2012040100
+RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2012070100
+RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2012100100
+RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2013010100
+RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2013040100
+RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2013070100
+RUN     | cpld_bmark_p8_35d                                                                                               |                             | fv3 |  | 2013100100
+2 −2		.gitmodules
+1 −1		atmos_cubed_sphere
+52 −33		ccpp/data/GFS_typedefs.F90
+76 −68		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/physics
+105 −0		ccpp/suites/suite_FV3_GFS_v16_coupled_p8.xml
+104 −0		ccpp/suites/suite_FV3_GFS_v16_p8.xml