Bring in some HAFSv2 related UFSATM developments

.gitmodules

@@ -1,15 +1,15 @@
 [submodule "fv3/atmos_cubed_sphere"]
   path = fv3/atmos_cubed_sphere
-  url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
-  branch = dev/emc
+  url = https://github.com/hafs-community/GFDL_atmos_cubed_sphere
+  branch = feature/hafsv2_sync
 [submodule "ccpp/framework"]
   path = ccpp/framework
   url = https://github.com/NCAR/ccpp-framework
   branch = develop
 [submodule "ccpp/physics"]
   path = ccpp/physics
-  url = https://github.com/ufs-community/ccpp-physics
-  branch = ufs/dev
+  url = https://github.com/hafs-community/ccpp-physics
+  branch = feature/hafsv2_sync
 [submodule "upp"]
   path = upp
   url = https://github.com/NOAA-EMC/UPP

ccpp/data/GFS_typedefs.F90

@@ -1073,6 +1073,8 @@ module GFS_typedefs
     real(kind=kind_phys) :: ssati_min       !< minimum supersaturation over ice threshold for deposition nucleation
     real(kind=kind_phys) :: Nt_i_max        !< maximum threshold number concentration of cloud ice water crystals in air
     real(kind=kind_phys) :: rr_min          !< multiplicative tuning parameter for microphysical sedimentation minimum threshold
+    real(kind=kind_phys) :: tc_rain         !< TC adjustment for rain fall speed
+    real(kind=kind_phys) :: tc_snow         !< TC adjustment for snow fall speed
 
 
     !--- GFDL microphysical paramters
@@ -1686,6 +1688,8 @@ module GFS_typedefs
     real(kind=kind_phys) :: iau_delthrs     ! iau time interval (to scale increments) in hours
     character(len=240)   :: iau_inc_files(7)! list of increment files
     real(kind=kind_phys) :: iaufhrs(7)      ! forecast hours associated with increment files
+    logical :: iau_regional                 !< doing IAU for the nested domain for regional model
+    real    :: iau_inc_scale                !< increase IAU weight for 3DIAU
     logical :: iau_filter_increments, iau_drymassfixer
 
     ! From physcons.F90, updated/set in control_initialize
@@ -3688,6 +3692,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me,         &
     real(kind=kind_phys) :: ssati_min      = 0.15               !< minimum supersaturation over ice threshold for deposition nucleation
     real(kind=kind_phys) :: Nt_i_max       = 4999.e3            !< maximum threshold number concentration of cloud ice water crystals in air
     real(kind=kind_phys) :: rr_min         = 1000.0             !< multiplicative tuning parameter for microphysical sedimentation minimum threshold
+    real(kind=kind_phys) :: tc_rain        = 1.0                !< TC adjustment for rain fall speed
+    real(kind=kind_phys) :: tc_snow        = 1.0                !< TC adjustment for snow fall speed
 
     !--- GFDL microphysical parameters
     logical              :: lgfdlmprad     = .false.            !< flag for GFDLMP radiation interaction
@@ -4045,6 +4051,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me,         &
     real(kind=kind_phys)  :: iau_delthrs      = 0           !< iau time interval (to scale increments)
     character(len=240)    :: iau_inc_files(7) = ''          !< list of increment files
     real(kind=kind_phys)  :: iaufhrs(7)       = -1          !< forecast hours associated with increment files
+    logical  :: iau_regional                  = .false.     !< doing IAU for the nested domain for regional model
+    real     :: iau_inc_scale                 = 1.          !< increase IAU weight for 3DIAU
     logical  :: iau_filter_increments         = .false.     !< filter IAU increments
     logical  :: iau_drymassfixer              = .false.     !< IAU dry mass fixer
 
@@ -4198,7 +4206,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me,         &
                                mg_alf,   mg_qcmin, mg_do_ice_gmao, mg_do_liq_liu,           &
                                ltaerosol, lthailaware, lradar, nsfullradar_diag, lrefres,   &
                                ttendlim, ext_diag_thompson, nt_c_l, nt_c_o, av_i, xnc_max,  &
-                               ssati_min, Nt_i_max, rr_min, dt_inner, lgfdlmprad,           &
+                               ssati_min, Nt_i_max, rr_min, tc_rain, tc_snow,               &
+                               dt_inner, lgfdlmprad,                                        &
                                sedi_semi, decfl,                                            &
                                nssl_cccn, nssl_alphah, nssl_alphahl,                        &
                                nssl_alphar, nssl_ehw0, nssl_ehlw0,                          &
@@ -4291,7 +4300,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me,         &
                                increment_file_on_native_grid,                               &
                           !--- IAU
                                iau_delthrs,iaufhrs,iau_inc_files,iau_filter_increments,     &
-                               iau_drymassfixer,                                            &
+                               iau_drymassfixer,iau_regional,iau_inc_scale,                 &
                           !--- debug options
                                debug, pre_rad, print_diff_pgr,                              &
                           !--- parameter range for critical relative humidity
@@ -4939,6 +4948,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me,         &
     Model%ssati_min        = ssati_min
     Model%Nt_i_max         = Nt_i_max
     Model%rr_min           = rr_min
+    Model%tc_rain          = tc_rain
+    Model%tc_snow          = tc_snow
 
 !--- TEMPO MP parameters
     ! DJS to Anders: Maybe we put more of these nml options into the TEMPO configuration type?
@@ -5410,6 +5421,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me,         &
     Model%iaufhrs         = iaufhrs
     Model%iau_inc_files   = iau_inc_files
     Model%iau_delthrs     = iau_delthrs
+    Model%iau_regional    = iau_regional
+    Model%iau_inc_scale   = iau_inc_scale
     Model%iau_filter_increments = iau_filter_increments
     Model%iau_drymassfixer = iau_drymassfixer
     if(Model%me==0) print *,' model init,iaufhrs=',Model%iaufhrs
@@ -6405,6 +6418,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me,         &
                                           ' ssati_min',ssati_min, &
                                           ' Nt_i_max',Nt_i_max, &
                                           ' rr_min',rr_min, &
+                                          ' tc_rain',tc_rain, &
+                                          ' tc_snow',tc_snow, &
                                           ' effr_in =',Model%effr_in, &
                                           ' lradar =',Model%lradar, &
                                           ' nsfullradar_diag =',Model%nsfullradar_diag, &
@@ -7002,6 +7017,8 @@ subroutine control_print(Model)
         print *, ' ssati_min         : ', Model%ssati_min
         print *, ' Nt_i_max          : ', Model%Nt_i_max
         print *, ' rr_min            : ', Model%rr_min
+        print *, ' tc_rain           : ', Model%tc_rain
+        print *, ' tc_snow           : ', Model%tc_snow
         print *, ' '
       endif
       if (Model%imp_physics == Model%imp_physics_nssl) then

ccpp/data/GFS_typedefs.meta

@@ -5141,6 +5141,22 @@
   dimensions = ()
   type = real
   kind = kind_phys
+[tc_rain]
+  standard_name = tc_adjustment_rain_fall_speed
+  long_name = tc adjustment rain fall speed
+  units = none
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
+[tc_snow]
+  standard_name = tc_adjustment_snow_fall_speed
+  long_name = tc adjustment snow fall speed
+  units = none
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
 [gfs_phys_time_vary_is_init]
   standard_name = flag_for_gfs_phys_time_vary_interstitial_initialization
   long_name = flag carrying interstitial initialization status

ccpp/suites_not_used/suite_FV3_HAFS_v1_thompson_noahmp.xml → ccpp/suites/suite_FV3_HAFS_v2.xml

@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="FV3_HAFS_v1_thompson_noahmp" version="1">
+<suite name="FV3_HAFS_v2" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
+      <scheme>GFS_rrtmgp_setup</scheme>
       <scheme>GFS_rad_time_vary</scheme>
       <scheme>GFS_phys_time_vary</scheme>
     </subcycle>
   </group>
   <group name="radiation">
     <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
+      <scheme>GFS_rrtmgp_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rad_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
+      <scheme>GFS_rrtmgp_cloud_mp</scheme>
+      <scheme>GFS_rrtmgp_cloud_overlap</scheme>
+      <scheme>GFS_cloud_diagnostics</scheme>
+      <scheme>rrtmgp_aerosol_optics</scheme>
+      <scheme>rrtmgp_sw_main</scheme>
+      <scheme>rrtmgp_lw_main</scheme>
+      <scheme>GFS_radiation_post</scheme>
     </subcycle>
   </group>
-  <group name="physics">
+  <group name="phys_ps">
     <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
       <scheme>GFS_suite_stateout_reset</scheme>
       <scheme>get_prs_fv3</scheme>
       <scheme>GFS_suite_interstitial_1</scheme>
@@ -60,7 +59,11 @@
       <scheme>unified_ugwp_post</scheme>
       <scheme>GFS_GWD_generic_post</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>h2ophys</scheme>
+    </subcycle>
+  </group>
+  <group name="phys_ts">
+    <subcycle loop="1">
+      <scheme>GFS_photochemistry</scheme>
       <scheme>get_phi_fv3</scheme>
       <scheme>GFS_suite_interstitial_3</scheme>
       <scheme>GFS_DCNV_generic_pre</scheme>

ccpp/suites_not_used/suite_FV3_HAFS_v1_thompson_noahmp_nonsst.xml → ccpp/suites/suite_FV3_HAFS_v2_coupled.xml

@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="FV3_HAFS_v1_thompson_noahmp_nonsst" version="1">
+<suite name="FV3_HAFS_v2_coupled" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>
-      <scheme>GFS_rrtmg_setup</scheme>
+      <scheme>GFS_rrtmgp_setup</scheme>
       <scheme>GFS_rad_time_vary</scheme>
       <scheme>GFS_phys_time_vary</scheme>
     </subcycle>
   </group>
   <group name="radiation">
     <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_rad_reset</scheme>
-      <scheme>GFS_rrtmg_pre</scheme>
+      <scheme>GFS_rrtmgp_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rad_sw_pre</scheme>
-      <scheme>rrtmg_sw</scheme>
-      <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw</scheme>
-      <scheme>rrtmg_lw_post</scheme>
-      <scheme>GFS_rrtmg_post</scheme>
+      <scheme>GFS_rrtmgp_cloud_mp</scheme>
+      <scheme>GFS_rrtmgp_cloud_overlap</scheme>
+      <scheme>GFS_cloud_diagnostics</scheme>
+      <scheme>rrtmgp_aerosol_optics</scheme>
+      <scheme>rrtmgp_sw_main</scheme>
+      <scheme>rrtmgp_lw_main</scheme>
+      <scheme>GFS_radiation_post</scheme>
     </subcycle>
   </group>
-  <group name="physics">
+  <group name="phys_ps">
     <subcycle loop="1">
-      <scheme>GFS_suite_interstitial_phys_reset</scheme>
       <scheme>GFS_suite_stateout_reset</scheme>
       <scheme>get_prs_fv3</scheme>
       <scheme>GFS_suite_interstitial_1</scheme>
@@ -58,7 +57,11 @@
       <scheme>unified_ugwp_post</scheme>
       <scheme>GFS_GWD_generic_post</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
-      <scheme>h2ophys</scheme>
+    </subcycle>
+  </group>
+  <group name="phys_ts">
+    <subcycle loop="1">
+      <scheme>GFS_photochemistry</scheme>
       <scheme>get_phi_fv3</scheme>
       <scheme>GFS_suite_interstitial_3</scheme>
       <scheme>GFS_DCNV_generic_pre</scheme>

fv3/atmos_model.F90

@@ -2031,13 +2031,17 @@ subroutine assign_importdata(jdat, rc)
                   nb = Atm_block%blkno(i,j)
                   ix = Atm_block%ixp(i,j)
                   im = GFS_control%chunk_begin(nb)+ix-1
-                  if (GFS_Sfcprop%oceanfrac(im) > zero .and.  datar8(i,j) > zorlmin) then
-                    tem = 100.0_GFS_kind_phys * min(0.1_GFS_kind_phys, datar8(i,j))
-!                   GFS_Coupling%zorlwav_cpl(im) = tem
-                    GFS_Sfcprop%zorlwav(im)      = tem
-                    GFS_Sfcprop%zorlw(im)        = tem
-                  else
-                    GFS_Sfcprop%zorlwav(im) = -999.0_GFS_kind_phys
+!                 if (GFS_Sfcprop%oceanfrac(im) > zero .and.  datar8(i,j) > zorlmin) then
+                  if (GFS_Sfcprop%oceanfrac(im) > zero) then
+                    if (mergeflg(i,j)) datar8(i,j)=GFS_Sfcprop%zorlw(im) ! use initial value
+                    if (datar8(i,j) > zorlmin) then
+                      tem = 100.0_GFS_kind_phys * min(0.1_GFS_kind_phys, datar8(i,j))
+!                     GFS_Coupling%zorlwav_cpl(im) = tem
+                      GFS_Sfcprop%zorlwav(im)      = tem
+                      GFS_Sfcprop%zorlw(im)        = tem
+                    else
+                      GFS_Sfcprop%zorlwav(im) = -999.0_GFS_kind_phys
+                    endif
                   endif
                 enddo
               enddo