Merge remote-tracking branch 'upstream/ufs/dev' into conv_hr5update

ufs-community · Nov 20, 2024 · a1aaf1a · a1aaf1a
2 parents f6f1892 + cfa1861
commit a1aaf1a
Show file tree

Hide file tree

Showing 14 changed files with 1,387 additions and 10 deletions.
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90
@@ -208,7 +208,7 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp, lextop,&
       real(kind=kind_phys), dimension(:,:,:), intent(out) :: faerlw1,&
                                                              faerlw2,&
                                                              faerlw3
-      real(kind=kind_phys), dimension(:,:),   intent(out) :: alpha
+      real(kind=kind_phys), dimension(:,:),   intent(out), optional :: alpha
       character(len=*), intent(out) :: errmsg
       integer,          intent(out) :: errflg
 

diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
@@ -1474,6 +1474,7 @@
   type = real
   kind = kind_phys
   intent = out
+  optional = True
 [top_at_1]
   standard_name = flag_for_vertical_ordering_in_radiation
   long_name = flag for vertical ordering in radiation

diff --git a/physics/Radiation/RRTMG/radlw_main.F90 b/physics/Radiation/RRTMG/radlw_main.F90
@@ -630,7 +630,8 @@ subroutine rrtmg_lw_run                                           &
 
       real (kind=kind_phys), dimension(:), intent(in) :: sfemis,        &
      &       sfgtmp, de_lgth
-      real (kind=kind_phys), dimension(npts,nlay), intent(in) :: alpha
+      real (kind=kind_phys), dimension(npts,nlay),intent(in),optional:: &
+             alpha
 
       real (kind=kind_phys), dimension(:,:,:),intent(in)::              &
      &       aeraod, aerssa

diff --git a/physics/Radiation/RRTMG/radlw_main.meta b/physics/Radiation/RRTMG/radlw_main.meta
@@ -199,6 +199,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = True
 [npts]
   standard_name = horizontal_loop_extent
   long_name = horizontal dimension

diff --git a/physics/Radiation/RRTMG/radsw_main.F90 b/physics/Radiation/RRTMG/radsw_main.F90
@@ -726,7 +726,8 @@ subroutine rrtmg_sw_run                                           &
 
       real (kind=kind_phys), intent(in) :: cosz(npts), solcon,          &
      &       de_lgth(npts)
-      real (kind=kind_phys), dimension(npts,nlay), intent(in) :: alpha
+      real (kind=kind_phys), dimension(npts,nlay),intent(in),optional:: &
+             alpha
 
 !  ---  outputs:
       real (kind=kind_phys), dimension(:,:), intent(inout) :: hswc

diff --git a/physics/Radiation/RRTMG/radsw_main.meta b/physics/Radiation/RRTMG/radsw_main.meta
@@ -223,6 +223,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = True
 [cosz]
   standard_name = cosine_of_solar_zenith_angle_for_daytime_points_on_radiation_timestep
   long_name = cosine of the solar zenit angle